From patchwork Tue Mar 10 19:29:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20631 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D391127BBEA; Tue, 10 Mar 2020 19:32:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 59C7F27BBE4 for ; Tue, 10 Mar 2020 19:32:26 +0000 (GMT) Received: from localhost ([::1]:39276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkc5-0005QT-R0 for patchwork@mira.cbaines.net; Tue, 10 Mar 2020 15:32:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54359) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkbj-0005Pa-Aw for guix-patches@gnu.org; Tue, 10 Mar 2020 15:32:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBkbi-0003ar-0I for guix-patches@gnu.org; Tue, 10 Mar 2020 15:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47407) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBkbh-0003Zx-Rz for guix-patches@gnu.org; Tue, 10 Mar 2020 15:32:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jBkbh-0002Cs-OE for guix-patches@gnu.org; Tue, 10 Mar 2020 15:32:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH v2 5/6] gnu: dune-*: remove openmpi dependency Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Mar 2020 19:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39862 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39862@debbugs.gnu.org Cc: Felix Gruber , zimoun Received: via spool by 39862-submit@debbugs.gnu.org id=B39862.15838686648398 (code B ref 39862); Tue, 10 Mar 2020 19:32:01 +0000 Received: (at 39862) by debbugs.gnu.org; 10 Mar 2020 19:31:04 +0000 Received: from localhost ([127.0.0.1]:53376 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBkam-0002BG-2l for submit@debbugs.gnu.org; Tue, 10 Mar 2020 15:31:04 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBkak-0002AT-HO for 39862@debbugs.gnu.org; Tue, 10 Mar 2020 15:31:03 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E60892400FC for <39862@debbugs.gnu.org>; Tue, 10 Mar 2020 20:30:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1583868655; bh=3GZPygSugnAL59H8UxmBcWmKxIHJ2dwJSg2tt+w2i9g=; h=From:To:Cc:Subject:Date:From; b=JLtyJJqnbi6oS5nis0svLlqK8YUcJ4tu8zD+n8hEp3F1ORutNHHEPDcEbL2GeiLST tSwVlZyBEdL082AEony3wmvx2X8VTnY/7K4TVpzKF8dPPG3qFSFHi1UYIMe7fl++58 IK1pS3dEesJazz+9IJgBu3rCS0GHym+7FsBAhTOsjuTi1UhKaRA4N2PVdhunnKe65E f5UcQNqYL/InMnfv/mDHrEKrcz5ZdnXv2LV5csf7ATVYpqpOeALyCX99cX1aRJ/m8Y iHwea5uCbNwgkHQWaxASh5BcUx/4yYjShwEDCHCS22QxB+3ctNsg8niqwdMEP63GtY 9Swq2B79udf0w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48cQDb2ppmz9ryl; Tue, 10 Mar 2020 20:30:55 +0100 (CET) From: Felix Gruber Date: Tue, 10 Mar 2020 20:29:09 +0100 Message-Id: <20200310192910.6251-6-felgru@posteo.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <5e890189-d5f7-a646-fe37-1f93115d17f9@posteo.net> References: <5e890189-d5f7-a646-fe37-1f93115d17f9@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (dune-*)[inputs]: Remove openmpi dependency. [arguments]: remove code to setup openmpi for tests. --- gnu/packages/maths.scm | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2c03c00366..33a5efd2f0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4582,13 +4582,10 @@ linear algebra primitives specifically targeting graph analytics.") (modify-phases %standard-phases (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("gmp" ,gmp) ("metis" ,metis) - ("openmpi" ,openmpi) ("openblas" ,openblas) ("python" ,python) ("superlu" ,superlu))) @@ -4626,7 +4623,6 @@ Differences} (FD).") (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) - ("openmpi" ,openmpi) ;; Optional ("openblas" ,openblas) ("gmp" ,gmp) @@ -4666,8 +4662,7 @@ This package contains the basic DUNE geometry classes.") (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags)))))) (inputs - `(("dune-common" ,dune-common) - ("openmpi" ,openmpi))) + `(("dune-common" ,dune-common))) (native-inputs `(("gfortran" ,gfortran) ("pkg-config" ,pkg-config))) @@ -4700,16 +4695,13 @@ This package contains the DUNE UG grid classes.") (modify-phases %standard-phases (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) ("gmp" ,gmp) ("metis" ,metis) ("openblas" ,openblas) - ("openmpi" ,openmpi) ("python" ,python))) (propagated-inputs `(("dune-uggrid" ,dune-uggrid))) @@ -4746,12 +4738,9 @@ This package contains the basic DUNE grid classes.") (modify-phases %standard-phases (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) - ("openmpi" ,openmpi) ;; Optional ("metis" ,metis) ("suitesparse" ,suitesparse) @@ -4799,7 +4788,6 @@ aggregation-based algebraic multigrid.") (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) - ("openmpi" ,openmpi) ;; Optional ("metis" ,metis) ("superlu" ,superlu) @@ -4847,14 +4835,11 @@ assemble global function spaces on finite-element grids.") (lambda* (#:key inputs make-flags #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "dune-grid") "/share")) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) ("dune-grid" ,dune-grid) - ("openmpi" ,openmpi) ;; Optional ("metis" ,metis) ("openblas" ,openblas) @@ -4892,14 +4877,11 @@ cubes.") (modify-phases %standard-phases (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) ("dune-grid" ,dune-grid) - ("openmpi" ,openmpi) ;; Optional ("metis" ,metis) ("openblas" ,openblas) @@ -4938,7 +4920,6 @@ provides the full grid interface including adaptive mesh refinement.") (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) - ("openmpi" ,openmpi) ;; Optional ("openblas" ,openblas) ("python" ,python) @@ -4981,9 +4962,7 @@ operating on statically typed trees of objects.") #t)) (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) ("dune-istl" ,dune-istl) @@ -4991,7 +4970,6 @@ operating on statically typed trees of objects.") ("dune-grid" ,dune-grid) ("dune-geometry" ,dune-geometry) ("dune-typetree" ,dune-typetree) - ("openmpi" ,openmpi) ("openblas" ,openblas) ("metis" ,metis) ("python" ,python) @@ -5032,7 +5010,6 @@ implemented as callable objects, and bases of finite element spaces.") ("dune-grid" ,dune-grid) ("dune-typetree" ,dune-typetree) ("dune-functions" ,dune-functions) - ("openmpi" ,openmpi) ;; Optional ("openblas" ,openblas) ("eigen" ,eigen)