From patchwork Fri Mar 13 17:30:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20667 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 0E8F927BBEA; Fri, 13 Mar 2020 17:32: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 81C9327BBE4 for ; Fri, 13 Mar 2020 17:32:17 +0000 (GMT) Received: from localhost ([::1]:34390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCoAT-0007m8-2r for patchwork@mira.cbaines.net; Fri, 13 Mar 2020 13:32:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35615) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCoAK-0007kV-LJ for guix-patches@gnu.org; Fri, 13 Mar 2020 13:32:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCoAF-0006ye-K7 for guix-patches@gnu.org; Fri, 13 Mar 2020 13:32:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54231) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jCoAF-0006xG-GY for guix-patches@gnu.org; Fri, 13 Mar 2020 13:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jCoAE-0001Qs-Dv for guix-patches@gnu.org; Fri, 13 Mar 2020 13:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH v4 1/2] gnu: dune-*: remove openmpi dependency Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Mar 2020 17:32: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.15841206705427 (code B ref 39862); Fri, 13 Mar 2020 17:32:02 +0000 Received: (at 39862) by debbugs.gnu.org; 13 Mar 2020 17:31:10 +0000 Received: from localhost ([127.0.0.1]:60199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCo9N-0001PS-Jm for submit@debbugs.gnu.org; Fri, 13 Mar 2020 13:31:09 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCo9L-0001PC-Uv for 39862@debbugs.gnu.org; Fri, 13 Mar 2020 13:31:08 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E359A2400FD for <39862@debbugs.gnu.org>; Fri, 13 Mar 2020 18:31:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1584120661; bh=3GZPygSugnAL59H8UxmBcWmKxIHJ2dwJSg2tt+w2i9g=; h=From:To:Cc:Subject:Date:From; b=DjHsbAWxRlaO73pgO35t9+DL63Qy5bZ9ecSvDY5KAZlflpVxH+uFzqmmQr0e76Vlz QCgwhOrXfMIwtsk1Vh09hjRSubeaKwDuhvCiIuS1kTX4Ob2ZrgUzayaGbOuTrPyHJM Sk9bglQYuWBQC6X/1/jiD86mVp9X+ZzsWILjWyx9UjZIx1RfiicKaPbSsdHuY3oSBv tRkaQlrv1Hl4WtjrdXqC6HmuKC1JVqxm2PhDGEDtHsMyxKnCJlQROknPJk/HDW2GqG Nxg5fJx5obDuahMpbE9tN9UGLsn/IUV0TI5ZhfpbJI3g27doQJ+cO0DZCGf4ZlH8to mEr/4Q7ycAzfg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48fCQs18nlz9rxD; Fri, 13 Mar 2020 18:31:01 +0100 (CET) From: Felix Gruber Date: Fri, 13 Mar 2020 18:30:37 +0100 Message-Id: <20200313173038.4175-1-felgru@posteo.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <87blp0pp4d.fsf@gnu.org> References: <87blp0pp4d.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 Fri Mar 13 17:30:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20666 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 055FD27BBEA; Fri, 13 Mar 2020 17:32:16 +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 B2AAB27BBE4 for ; Fri, 13 Mar 2020 17:32:15 +0000 (GMT) Received: from localhost ([::1]:34388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCoAR-0007ka-4a for patchwork@mira.cbaines.net; Fri, 13 Mar 2020 13:32:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35583) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCoAG-0007kR-6w for guix-patches@gnu.org; Fri, 13 Mar 2020 13:32:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCoAF-0006wk-4S for guix-patches@gnu.org; Fri, 13 Mar 2020 13:32:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54230) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jCoAF-0006wI-1I for guix-patches@gnu.org; Fri, 13 Mar 2020 13:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jCoAE-0001Qy-TN for guix-patches@gnu.org; Fri, 13 Mar 2020 13:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH v4 2/2] gnu: define dune-*-openmpi packages Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Mar 2020 17:32: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.15841206775451 (code B ref 39862); Fri, 13 Mar 2020 17:32:02 +0000 Received: (at 39862) by debbugs.gnu.org; 13 Mar 2020 17:31:17 +0000 Received: from localhost ([127.0.0.1]:60203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCo9V-0001Pr-0Z for submit@debbugs.gnu.org; Fri, 13 Mar 2020 13:31:17 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCo9T-0001Pa-Ae for 39862@debbugs.gnu.org; Fri, 13 Mar 2020 13:31:15 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AE8D02400FE for <39862@debbugs.gnu.org>; Fri, 13 Mar 2020 18:31:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1584120669; bh=0eLwr/8/2yOTO57WBJoBIy/1F/H74Xeig80JvBYk14Q=; h=From:To:Cc:Subject:Date:From; b=OuRhdcfuO9CCc8FzrVE1q/0FM4IQDZrIENNqMuUCG+SSeZexBu1nKpLMv8LfN9Dze gur2qT1W3ZfJyvuHRkWNmDTp0qAjJmFErK+WHsXhQkf0tEV6uwMYoTWcxbjWVs3xOq 9Qzppdw1KJglsH6jhVs5dwpaQixh9HZsxYmoJtuWEFjLDV2Enh74oM1ugXcm7whtU6 PsLlTDp3dowsh85RpWcoDfOhV2EJtl2nz3QoytsB9kN+RKUj+Q/ejZFgFobHmpTO8j x2ED0U15EIo0gvQjUHUk3wq4BNIDKA7wWuUavIqlbOw3quXzuQZJzXfpuuUx+StJOs FX0iw4TTlse0g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48fCR05MQXz9rxG; Fri, 13 Mar 2020 18:31:08 +0100 (CET) From: Felix Gruber Date: Fri, 13 Mar 2020 18:30:38 +0100 Message-Id: <20200313173038.4175-2-felgru@posteo.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <87blp0pp4d.fsf@gnu.org> References: <87blp0pp4d.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-common-openmpi, dune-geometry-openmpi, dune-istl-openmpi, dune-typetree-openmpi, dune-uggrid-openmpi, dune-grid-openmpi, dune-alugrid-openmpi, dune-subgrid-openmpi, dune-localfunctions-openmpi, dune-functions-openmpi, dune-pdelab-openmpi): New variables. (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..6c2813f100 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)) + (negate dune-package?)))) + +(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")