From patchwork Tue Mar 10 19:29:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20629 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 94DD027BBEA; Tue, 10 Mar 2020 19:31:33 +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 186DF27BBE4 for ; Tue, 10 Mar 2020 19:31:33 +0000 (GMT) Received: from localhost ([::1]:39264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkbE-0004yv-L6 for patchwork@mira.cbaines.net; Tue, 10 Mar 2020 15:31:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53512) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkan-0004a8-C0 for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBkam-0000PI-19 for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47398) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBkal-0000MX-T5 for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jBkak-0002Ap-Pp for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH v2 1/6] gnu: dune-*: set up MPI for tests Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Mar 2020 19:31: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 , zimoun Received: via spool by 39862-submit@debbugs.gnu.org id=B39862.15838686198259 (code B ref 39862); Tue, 10 Mar 2020 19:31:02 +0000 Received: (at 39862) by debbugs.gnu.org; 10 Mar 2020 19:30:19 +0000 Received: from localhost ([127.0.0.1]:53360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBka2-000298-HA for submit@debbugs.gnu.org; Tue, 10 Mar 2020 15:30:19 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60855) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBka1-00028x-7H for 39862@debbugs.gnu.org; Tue, 10 Mar 2020 15:30:17 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9928B2400FD for <39862@debbugs.gnu.org>; Tue, 10 Mar 2020 20:30:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1583868611; bh=lEZVJzoMGbHB6OPD2F5s8Zng9RpXmdjwtzygz/X3FDU=; h=From:To:Cc:Subject:Date:From; b=PNyjPAB54Vv/x98EKBVWia1S7/EWk9lm149nf2HT+BBmz4KcGGWubY94GOs0KQSwe /oMKseY1LTCV/j2eckio3Z6qs6ehNXmRLh7VU+9iKbU0lSPtJxL+D9RBVzejP6X4Rf YFN5M1owPMSMkmbaSrP79nfyPtNjbYwZi8kwjcGj/HXeZ+Ut1M1OkC3Q7yZjJy9ihK SnqtpNDCJFojIMc7FcJm4kU7fMzxfxutdyEZt4z2r12e8vEdQLbrZwg0hv6tBd24qb D+odueW+lE5ZcNzmprI278cxjGDytPRTRPkzJHixxwVvXiGGN9YAwMKvTSiChT0GAs qKrQfKXjsX1dg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48cQCk6TMsz9ryr; Tue, 10 Mar 2020 20:30:10 +0100 (CET) From: Felix Gruber Date: Tue, 10 Mar 2020 20:29:05 +0100 Message-Id: <20200310192910.6251-2-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-common, dune-grid, dune-istl, dune-alugrid): [arguments]: correctly set up MPI instead of disabling tests that require MPI. --- gnu/packages/maths.scm | 110 ++++------------------------------------- 1 file changed, 10 insertions(+), 100 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a990ffc45e..bec490ebc3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4583,36 +4583,8 @@ linear algebra primitives specifically targeting graph analytics.") (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags))) - ;; These tests fail because they require a fully functional MPI - ;; environment. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (setenv "ARGS" - (string-append "--exclude-regex '(" - (string-join - (list - "remoteindicestest" - "remoteindicestest-mpi-2" - "syncertest" - "syncertest-mpi-2" - "variablesizecommunicatortest" - "variablesizecommunicatortest-mpi-2" - "arithmetictestsuitetest" - "assertandreturntest" - "assertandreturntest_ndebug" - "concept" - "debugaligntest" - "mpicollectivecommunication" - "mpicollectivecommunication-mpi-2" - "mpiguardtest" - "mpiguardtest-mpi-2" - "mpihelpertest" - "mpihelpertest-mpi-2" - "mpihelpertest2" - "mpihelpertest2-mpi-2") - "|") - ")'")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("gmp" ,gmp) ("metis" ,metis) @@ -4693,54 +4665,8 @@ This package contains the basic DUNE geometry classes.") (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags))) - ;; These tests fail because they require a fully functional MPI - ;; environment. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (setenv "ARGS" - (string-append "--exclude-regex '(" - (string-join - (list - "scsgmappertest" - "conformvolumevtktest" - "gnuplottest" - "nonconformboundaryvtktest" - "subsamplingvtktest" - "vtktest" - "vtktest-mpi-2" - "vtksequencetest" - "gmshtest-onedgrid" - "test-dgf-yasp" - "test-dgf-yasp-offset" - "test-dgf-oned" - "test-geogrid-yaspgrid" - "test-gridinfo" - "test-identitygrid" - "testiteratorranges" - "test-hierarchicsearch" - "test-parallel-ug-mpi-2" - "test-yaspgrid-backuprestore-equidistant" - "test-yaspgrid-backuprestore-equidistant-mpi-2" - "test-yaspgrid-backuprestore-equidistantoffset" - "test-yaspgrid-backuprestore-equidistantoffset-mpi-2" - "test-yaspgrid-backuprestore-tensor" - "test-yaspgrid-backuprestore-tensor-mpi-2" - "test-yaspgrid-tensorgridfactory" - "test-yaspgrid-tensorgridfactory-mpi-2" - "test-yaspgrid-yaspfactory-1d" - "test-yaspgrid-yaspfactory-1d-mpi-2" - "test-yaspgrid-yaspfactory-2d" - "test-yaspgrid-yaspfactory-2d-mpi-2" - "test-yaspgrid-yaspfactory-3d" - "test-yaspgrid-yaspfactory-3d-mpi-2" - "globalindexsettest" - "persistentcontainertest" - "structuredgridfactorytest" - "tensorgridfactorytest" - "vertexordertest") - "|") - ")'")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) @@ -4783,24 +4709,8 @@ This package contains the basic DUNE grid classes.") (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags))) - ;; These tests fail because they require a fully functional MPI - ;; environment. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (setenv "ARGS" - (string-append "--exclude-regex '(" - (string-join - (list - "galerkintest" - "hierarchytest" - "pamgtest" - "pamg_comm_repart_test" - "matrixredisttest" - "vectorcommtest" - "matrixmarkettest") - "|") - ")'")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("dune-common" ,dune-common) ("openmpi" ,openmpi) @@ -4886,9 +4796,7 @@ assemble global function spaces on finite-element grids.") "1l9adgyjpra8mvwm445s0lpjshnb63jag85fb2hisbjn6bm320yj")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; 7 of 8 tests fail because they need a full MPI - ; environment - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-include (lambda _ @@ -4900,7 +4808,9 @@ 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)))))) + (apply invoke "make" "build_tests" make-flags))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) From patchwork Tue Mar 10 19:29:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20628 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 B8D1027BBEA; Tue, 10 Mar 2020 19:31:31 +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 78F0227BBE4 for ; Tue, 10 Mar 2020 19:31:31 +0000 (GMT) Received: from localhost ([::1]:39262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkbD-0004xl-1k for patchwork@mira.cbaines.net; Tue, 10 Mar 2020 15:31:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53490) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkam-0004YX-P3 for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBkal-0000N3-FE for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47399) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBkal-0000Mt-BW for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jBkal-0002B1-8u for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH v2 2/6] gnu: add dune-uggrid 2.6.0 Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Mar 2020 19:31:03 +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.15838686308283 (code B ref 39862); Tue, 10 Mar 2020 19:31:03 +0000 Received: (at 39862) by debbugs.gnu.org; 10 Mar 2020 19:30:30 +0000 Received: from localhost ([127.0.0.1]:53363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBkaE-00029X-5f for submit@debbugs.gnu.org; Tue, 10 Mar 2020 15:30:30 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBkaC-00029K-HD for 39862@debbugs.gnu.org; Tue, 10 Mar 2020 15:30:29 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 8D9732400E6 for <39862@debbugs.gnu.org>; Tue, 10 Mar 2020 20:30:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1583868622; bh=KGuWjYlZMiEPh5TYgwoMeKutnWGkSYo2m50DyTPtKpo=; h=From:To:Cc:Subject:Date:From; b=mElMm3jKzoGOoj1i9AQwxEqCmOfkCD1Qw+S8xYqkrTKqCGcr2qLL4QxKB5fE05VAe c16D4Daiuu4z340AyRuxgcPXhrwXYbqFgg142piD0KRLUbHjXyL2T79bosF+YGFAXT 2BtP3xnykl4vbw08UTjQUW+ASTFLZkYZB+B9JwDXcQ8Qn1Mtn2+GTh19jw2JkFVSYB Vafc11D78IKVVLQhR7f64mHgAtLD/vIkV8lJphDKq1xLzTO6Cx2n2G21ZFuAsnGkKu 1wLQIbQpb4GWWr8yr9uk+NgiRhBsm7h3VSYd4CRIEYkFzzkNjNnX1sW47glA34chVs vAkUrjbw3v81g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48cQCy0ZS6z9ryl; Tue, 10 Mar 2020 20:30:22 +0100 (CET) From: Felix Gruber Date: Tue, 10 Mar 2020 20:29:06 +0100 Message-Id: <20200310192910.6251-3-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-uggrid): New variable. * gnu/packages/maths.scm (dune-grid): [propagated-inputs]: Add dune-uggrid dependency, so that the UGGrid class in dune-grid can be used by packages that have dune-grid as input. * gnu/packages/maths.scm (dune-functions): [arguments]: enable tests that previously weren't built as they require dune-uggrid. --- gnu/packages/maths.scm | 53 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index bec490ebc3..3f89efeff4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4646,6 +4646,42 @@ This package contains the basic DUNE geometry classes.") ;; GPL version 2 with "runtime exception" (license license:gpl2))) +(define-public dune-uggrid + (package + (name "dune-uggrid") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://dune-project.org/download/" + version "/dune-uggrid-" version ".tar.gz")) + (sha256 + (base32 + "05l7a1gb78mny49anyxk6rjvn66rhgm30y72v5cjg0m5kfgr1a1f")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build_tests" make-flags)))))) + (inputs + `(("dune-common" ,dune-common) + ("openmpi" ,openmpi))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "DUNE, the Distributed and Unified Numerics Environment is a +modular toolbox for solving @dfn{partial differential equations} (PDEs) with +grid-based methods. It supports the easy implementation of methods like +@dfn{Finite Elements} (FE), @dfn{Finite Volumes} (FV), and also @dfn{Finite +Differences} (FD). + +This package contains the DUNE UG grid classes.") + (license license:lgpl2.1))) + (define-public dune-grid (package (name "dune-grid") @@ -4675,6 +4711,8 @@ This package contains the basic DUNE geometry classes.") ("openblas" ,openblas) ("openmpi" ,openmpi) ("python" ,python))) + (propagated-inputs + `(("dune-uggrid" ,dune-uggrid))) (native-inputs `(("gfortran" ,gfortran) ("pkg-config" ,pkg-config))) @@ -4888,7 +4926,20 @@ operating on statically typed trees of objects.") (base32 "1an8gb477n8j0kzpbrv7nr1snh8pxip0gsxq6w63jc83gg3dj200")))) (build-system cmake-build-system) - (arguments `(#:tests? #f)) ; FIXME: tests require dune-uugrid + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (setenv "ARGS" + ;; unable to load GMSH file in this test + "--exclude-regex gridviewfunctionspacebasistest") + #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)))) (inputs `(("dune-common" ,dune-common) ("dune-istl" ,dune-istl) From patchwork Tue Mar 10 19:29:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20627 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 A0F2F27BBEA; Tue, 10 Mar 2020 19:31:24 +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 5E66727BBE4 for ; Tue, 10 Mar 2020 19:31:24 +0000 (GMT) Received: from localhost ([::1]:39258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkb5-0004et-ST for patchwork@mira.cbaines.net; Tue, 10 Mar 2020 15:31:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53505) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkan-0004Zm-8S for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBkal-0000Np-Th for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47400) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBkal-0000NT-PK for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jBkal-0002B8-M5 for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH v2 3/6] gnu: Add dune-subgrid Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Mar 2020 19:31:03 +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.15838686448310 (code B ref 39862); Tue, 10 Mar 2020 19:31:03 +0000 Received: (at 39862) by debbugs.gnu.org; 10 Mar 2020 19:30:44 +0000 Received: from localhost ([127.0.0.1]:53366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBkaS-00029x-IR for submit@debbugs.gnu.org; Tue, 10 Mar 2020 15:30:44 -0400 Received: from mout01.posteo.de ([185.67.36.65]:43563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBkaR-00029l-03 for 39862@debbugs.gnu.org; Tue, 10 Mar 2020 15:30:43 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7DE02160060 for <39862@debbugs.gnu.org>; Tue, 10 Mar 2020 20:30:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1583868636; bh=UpD2twPOjpTQkhPrcq4UMu7pjhU7pWUnn54qWM7J8OM=; h=From:To:Cc:Subject:Date:From; b=m8X72WLz+a1Ui5DISq4gyXABGgsF0O8fs36w6Y2z+XE+3Qxrx/ZFz8B2DoB+2FfIx 38YZrtvb8dd3o25t4syX+DNmwypFYA1YXhBkFTgB8jaBKJMHlkpIfpWNf6MMeui60p 0K2Mt1lOAnPzi+ozEyN8Bcs3W8tGYxeAhYhoiFkZmcKE71b0lx43JkSFfSQegVwzas /s5OYMvGXrc8EdA/n4ZS0BMmfJbp4MBZMms/4NIxN3V/d4Fy9yXXARDnmpHd7dYC0+ soIjI/pFwfADzPllPdIAa5/QWO8TjVSbFZMcHPCNphohpb1dEpNBv2cxv1uD68BO0J l9HimBUsc11pw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48cQDC3gX3z6tmf; Tue, 10 Mar 2020 20:30:35 +0100 (CET) From: Felix Gruber Date: Tue, 10 Mar 2020 20:29:07 +0100 Message-Id: <20200310192910.6251-4-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-subgrid): New variable. --- gnu/packages/maths.scm | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 3f89efeff4..9da38aad68 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4871,6 +4871,49 @@ implementation of the DUNE grid interface supporting either simplices or cubes.") (license license:gpl2+))) +(define-public dune-subgrid + (package + (name "dune-subgrid") + (version "2.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.imp.fu-berlin.de/agnumpde/dune-subgrid") + (commit "releases/2.6-1"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gcv35rx3knqd54r4pp9rzd639db4j8w2r2ibq43w1mgwdcqhs64")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (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)))) + (inputs + `(("dune-common" ,dune-common) + ("dune-geometry" ,dune-geometry) + ("dune-grid" ,dune-grid) + ("openmpi" ,openmpi) + ;; Optional + ("metis" ,metis) + ("openblas" ,openblas) + ("gmp" ,gmp))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "http://numerik.mi.fu-berlin.de/dune-subgrid/index.php") + (synopsis "Distributed and Unified Numerics Environment") + (description "The dune-subgrid module allows to mark elements of +another hierarchical dune grid. The set of marked elements can then be +accessed as a hierarchical dune grid in its own right. Dune-Subgrid +provides the full grid interface including adaptive mesh refinement.") + (license license:gpl2+))) + (define-public dune-typetree (package (name "dune-typetree") From patchwork Tue Mar 10 19:29:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20630 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 4600D27BBEA; Tue, 10 Mar 2020 19:31:43 +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 1246C27BBE4 for ; Tue, 10 Mar 2020 19:31:43 +0000 (GMT) Received: from localhost ([::1]:39266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkbO-0005CD-Kd for patchwork@mira.cbaines.net; Tue, 10 Mar 2020 15:31:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53508) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkan-0004Zu-92 for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBkam-0000Q2-CF for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47403) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBkam-0000Ps-8g for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jBkam-0002BH-4d for guix-patches@gnu.org; Tue, 10 Mar 2020 15:31:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH v2 4/6] gnu: dune-istl: Build with suitesparse Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Mar 2020 19:31:04 +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.15838686538331 (code B ref 39862); Tue, 10 Mar 2020 19:31:04 +0000 Received: (at 39862) by debbugs.gnu.org; 10 Mar 2020 19:30:53 +0000 Received: from localhost ([127.0.0.1]:53369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBkaa-0002AJ-SN for submit@debbugs.gnu.org; Tue, 10 Mar 2020 15:30:53 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBkaZ-0002A7-9T for 39862@debbugs.gnu.org; Tue, 10 Mar 2020 15:30:51 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9A1B12400FE for <39862@debbugs.gnu.org>; Tue, 10 Mar 2020 20:30:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1583868645; bh=+wuCeJn+SsWOpm3vuSoEUvjz8Z+C1ypQOQDyDZ6kgb4=; h=From:To:Cc:Subject:Date:From; b=HtyBMtVZPn0P0d8R4ZQOv68hTuOT4vqAxHc3uFg0HqtaGgojvpWcE8pvSi8kj76Ez pvIZmEL6EiQYwGZ0XvkLLLFBRpTW+WaspCniz8iBwIjy9LaDhHWt65GNgONeOtTB3+ JDdfCuJnoKpPMaKWVIsWErlimLlUwQ4OlaHCG7L71fjTxCy6pV8FFt1r3iRe4jEAfK vlIvPhnCRsNCtEgY4OmaSNwQhFRk748oFg2ekVTYGiWj02nhbqVsJ6j6KY11wwXlkf X0Rwua8V83lDVmWFRDEt5LXDzrJ7xWF7HiBFLwADMnMg+QUuNRRcJ6gXmeHh6yFq6c AQVkQo1lmmRvw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48cQDP04c5z9ryd; Tue, 10 Mar 2020 20:30:44 +0100 (CET) From: Felix Gruber Date: Tue, 10 Mar 2020 20:29:08 +0100 Message-Id: <20200310192910.6251-5-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-istl)[inputs]: Add suitesparse to build additional solvers in dune-istl. --- gnu/packages/maths.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9da38aad68..2c03c00366 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4754,6 +4754,7 @@ This package contains the basic DUNE grid classes.") ("openmpi" ,openmpi) ;; Optional ("metis" ,metis) + ("suitesparse" ,suitesparse) ("superlu" ,superlu) ("openblas" ,openblas) ("gmp" ,gmp) 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) From patchwork Tue Mar 10 19:29:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20632 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 1BA6927BBEA; Tue, 10 Mar 2020 19:32:28 +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 9E66727BBE4 for ; Tue, 10 Mar 2020 19:32:27 +0000 (GMT) Received: from localhost ([::1]:39278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkc6-0005R2-1H for patchwork@mira.cbaines.net; Tue, 10 Mar 2020 15:32:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54395) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBkbk-0005Po-RN for guix-patches@gnu.org; Tue, 10 Mar 2020 15:32:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBkbj-0003cz-Cm for guix-patches@gnu.org; Tue, 10 Mar 2020 15:32:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47408) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBkbi-0003bD-CJ for guix-patches@gnu.org; Tue, 10 Mar 2020 15:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jBkbi-0002D0-7Y for guix-patches@gnu.org; Tue, 10 Mar 2020 15:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH v2 6/6] gnu: define dune-*-openmpi packages Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Mar 2020 19: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 , zimoun Received: via spool by 39862-submit@debbugs.gnu.org id=B39862.15838686808435 (code B ref 39862); Tue, 10 Mar 2020 19:32:02 +0000 Received: (at 39862) by debbugs.gnu.org; 10 Mar 2020 19:31:20 +0000 Received: from localhost ([127.0.0.1]:53380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBkb1-0002Bz-Iv for submit@debbugs.gnu.org; Tue, 10 Mar 2020 15:31:19 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51609) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBkaz-0002Bm-6I for 39862@debbugs.gnu.org; Tue, 10 Mar 2020 15:31:17 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 8DDB62400FE for <39862@debbugs.gnu.org>; Tue, 10 Mar 2020 20:31:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1583868671; bh=Ed+qNDa3Qvub2ohKgPuQYcgVumLet4qM95oAhr4yKuc=; h=From:To:Cc:Subject:Date:From; b=a+3zuGMshQSdgU7kPzA23VE2vWnc2uj+hhMS292TS1Uwk8F2Pst93ZLz1Oag055NK z00QMm9wc4yZ9tbvdoXBQ4fV0k5NFSJ07AYNVnWjAyA7M3Z3VCp5t8bWywWntbY+JN J9+4XVZ6L3Rgu5eaZ1xnFDX/LgtIYCBIKStv8mMZd1tV9lb5VpMg6/ea0r0WidogkQ z7oICM9+gGko0xgGjNeLlQu+07+VptkA3iL3iLDhurwy0NRiWUacbJXfpNaZ8pFSem HmGFME087rM2SjhsFK2CaISQXRC1S5XWr4LFvsa6WYQmI9pIQcBJHQyg7l1uw8Z7se /ZyEGWZGnPEmQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48cQDt0mYgz9ryd; Tue, 10 Mar 2020 20:31:10 +0100 (CET) From: Felix Gruber Date: Tue, 10 Mar 2020 20:29:10 +0100 Message-Id: <20200310192910.6251-7-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-*-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 | 79 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 33a5efd2f0..e904ca1bd8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -126,7 +126,9 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35)) (define-public aris (package @@ -5027,6 +5029,81 @@ 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 ((transformed-packages '())) + (lambda (p) + (let* ((p-name (package-name p)) + (replace-package + (lambda (mapping) + (let* ((name (car mapping)) + (p (cadr mapping)) + (new-p + (match (assoc-ref transformed-packages name) + (#f + (if (string-prefix? "dune-" name) + (raise (condition + (&message + (message + (format #f "Need to call \ +add-openmpi-to-dune-package on '~a' before '~a'." + name p-name))))) + p)) + (transformed-p transformed-p)))) + `(,name ,new-p)))) + (substitute-mpi-packages (lambda (inputs) + (map replace-package inputs))) + (mpi-p + (package (inherit p) + (name (string-append p-name "-openmpi")) + (inputs `(,@(substitute-mpi-packages (package-inputs p)) + ("openmpi" ,openmpi))) + (propagated-inputs + (substitute-mpi-packages (package-propagated-inputs p))) + (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)"))))) + (begin + (set! transformed-packages + (acons p-name mpi-p transformed-packages)) + mpi-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")