From patchwork Thu Mar 12 21:05:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20660 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 3CC7D27BBEA; Thu, 12 Mar 2020 21:06:18 +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 706DF27BBE4 for ; Thu, 12 Mar 2020 21:06:17 +0000 (GMT) Received: from localhost ([::1]:50540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCV20-0005IT-UM for patchwork@mira.cbaines.net; Thu, 12 Mar 2020 17:06:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42281) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCV1o-0005DI-3H for guix-patches@gnu.org; Thu, 12 Mar 2020 17:06:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCV1m-0001w3-Kg for guix-patches@gnu.org; Thu, 12 Mar 2020 17:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51907) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jCV1m-0001vl-Gy for guix-patches@gnu.org; Thu, 12 Mar 2020 17:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jCV1m-0002aT-C7 for guix-patches@gnu.org; Thu, 12 Mar 2020 17:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH v3 1/2] gnu: dune-*: remove openmpi dependency Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Mar 2020 21:06:02 +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 , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 39862-submit@debbugs.gnu.org id=B39862.15840471549918 (code B ref 39862); Thu, 12 Mar 2020 21:06:02 +0000 Received: (at 39862) by debbugs.gnu.org; 12 Mar 2020 21:05:54 +0000 Received: from localhost ([127.0.0.1]:57878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCV1e-0002Zu-9L for submit@debbugs.gnu.org; Thu, 12 Mar 2020 17:05:54 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCV1c-0002ZV-Os for 39862@debbugs.gnu.org; Thu, 12 Mar 2020 17:05:53 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 33E4D240100 for <39862@debbugs.gnu.org>; Thu, 12 Mar 2020 22:05:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1584047147; bh=3GZPygSugnAL59H8UxmBcWmKxIHJ2dwJSg2tt+w2i9g=; h=From:To:Cc:Subject:Date:From; b=k5AYZsGaVvrVg4rRmTLmS1g3HUeJVDJKoS/GQufaPf9AG87Jchah/AQNCLJyzIwar RYfAkEZxx95YwpwKZw8sPnuUJnw+lCnYamEc12l1ksdTeCzzKHcx4fqqn5C2g2McnP FJoItioxnWq9moXE0T27zk9tkebQWgqP6I2YMqkk0LR83qRQkwS3liRGNreqss9goT xpoD1Ouph4bRLrzIABHSwGuLvvWKyKR+ex1dzlnU5uWN5RrAYwemuSgMB4vTmo+p/9 sYluVCd75+E/17SHVcXAq4Hg2dbRT4wwvOOUDry9H6VcRuqlA7oVkUa/FscqUVVbE/ cvTl1Gxvro8NQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48dhF64zgNz9rxM; Thu, 12 Mar 2020 22:05:46 +0100 (CET) From: Felix Gruber Date: Thu, 12 Mar 2020 22:05:12 +0100 Message-Id: <20200312210513.107891-2-felgru@posteo.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <87k13pvj5u.fsf@gnu.org> References: <87k13pvj5u.fsf@gnu.org> 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) From patchwork Thu Mar 12 21:05:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20661 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 7385D27BBEA; Thu, 12 Mar 2020 21:07:09 +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 3C2FE27BBE4 for ; Thu, 12 Mar 2020 21:07:09 +0000 (GMT) Received: from localhost ([::1]:50548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCV2q-00076w-Qk for patchwork@mira.cbaines.net; Thu, 12 Mar 2020 17:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42775) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCV2l-00072Z-2P for guix-patches@gnu.org; Thu, 12 Mar 2020 17:07:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCV2j-0002Y8-W0 for guix-patches@gnu.org; Thu, 12 Mar 2020 17:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51910) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jCV2j-0002Y0-Sz for guix-patches@gnu.org; Thu, 12 Mar 2020 17:07:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jCV2j-0002cG-Nz for guix-patches@gnu.org; Thu, 12 Mar 2020 17:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH v3 2/2] gnu: define dune-*-openmpi packages Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Mar 2020 21:07: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 , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 39862-submit@debbugs.gnu.org id=B39862.15840471639971 (code B ref 39862); Thu, 12 Mar 2020 21:07:01 +0000 Received: (at 39862) by debbugs.gnu.org; 12 Mar 2020 21:06:03 +0000 Received: from localhost ([127.0.0.1]:57883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCV1m-0002ab-MU for submit@debbugs.gnu.org; Thu, 12 Mar 2020 17:06:02 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCV1k-0002a2-V4 for 39862@debbugs.gnu.org; Thu, 12 Mar 2020 17:06:01 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 01D3C160063 for <39862@debbugs.gnu.org>; Thu, 12 Mar 2020 22:05:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1584047155; bh=QKawdtAdkg9XbD9QjHX7Pm+NyHVKdg1hYeufDuxDm+o=; h=From:To:Cc:Subject:Date:From; b=EMpJ8IBmppjFSPv5G/SjYV7yvEIgOpBEUf22aXmVY4nU2M23lsVkzPtOmZOdX5Sv/ +OvqZWnEmU6gyloD3OEQze4U6kaFCr/ig2gfGuegCrXHkg5/HJ1V5XEZeKBBiBX4KP BN2ohq7sfMbYkLp93Q0br/czw5HohrDi6a/OxnHj/v3i7ylRLGecTXTku5MOWXfpmO oMAEPeRouVSm4I/MBJ+gb7OFnSm20cUyx2LSpGzu5ez8mg0bnFm0Gn6WP5k49J+3Eo bMcykUaGSKW+gC4QNz8pe1PWST5kgb1Jl0YduSJn04YmwTUFXb0XXv6VTVuK6a5FZc Gzwm+7HrWewOQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48dhFD6n4Nz6tmQ; Thu, 12 Mar 2020 22:05:52 +0100 (CET) From: Felix Gruber Date: Thu, 12 Mar 2020 22:05:13 +0100 Message-Id: <20200312210513.107891-3-felgru@posteo.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <87k13pvj5u.fsf@gnu.org> References: <87k13pvj5u.fsf@gnu.org> 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-*-openmpi): New variables. * gnu/packages/maths.scm (add-openmpi-to-dune-package): New function to add openmpi to the inputs of a dune-* package and replace all dune-* packages in its input with the corresponding dune-*-openmpi package. --- gnu/packages/maths.scm | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 33a5efd2f0..ac89064a7f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5027,6 +5027,59 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.") ;; Either GPL version 2 with "runtime exception" or LGPLv3+. (license (list license:lgpl3+ license:gpl2)))) +(define add-openmpi-to-dune-package + (let ((dune-package? + (lambda (p) (string-prefix? "dune-" (package-name p))))) + (package-mapping + (lambda (p) + (if (dune-package? p) + (package (inherit p) + (name (string-append (package-name p) "-openmpi")) + (inputs `(,@(package-inputs p) + ("openmpi" ,openmpi))) + (arguments + (substitute-keyword-arguments (package-arguments p) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) + (synopsis (string-append (package-synopsis p) " (with MPI support)"))) + p)) + (lambda (p) (not (dune-package? p)))))) + +(define-public dune-common-openmpi + (add-openmpi-to-dune-package dune-common)) + +(define-public dune-geometry-openmpi + (add-openmpi-to-dune-package dune-geometry)) + +(define-public dune-istl-openmpi + (add-openmpi-to-dune-package dune-istl)) + +(define-public dune-typetree-openmpi + (add-openmpi-to-dune-package dune-typetree)) + +(define-public dune-uggrid-openmpi + (add-openmpi-to-dune-package dune-uggrid)) + +(define-public dune-grid-openmpi + (add-openmpi-to-dune-package dune-grid)) + +(define-public dune-alugrid-openmpi + (add-openmpi-to-dune-package dune-alugrid)) + +(define-public dune-subgrid-openmpi + (add-openmpi-to-dune-package dune-subgrid)) + +(define-public dune-localfunctions-openmpi + (add-openmpi-to-dune-package dune-localfunctions)) + +(define-public dune-functions-openmpi + (add-openmpi-to-dune-package dune-functions)) + +(define-public dune-pdelab-openmpi + (add-openmpi-to-dune-package dune-pdelab)) + (define-public mlucas (package (name "mlucas")