From: Felix Gruber <felgru@posteo.net>
To: 39862@debbugs.gnu.org
Cc: "Felix Gruber" <felgru@posteo.net>, "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#39862] [PATCH v3 1/2] gnu: dune-*: remove openmpi dependency
Date: Thu, 12 Mar 2020 22:05:12 +0100 [thread overview]
Message-ID: <20200312210513.107891-2-felgru@posteo.net> (raw)
In-Reply-To: <87k13pvj5u.fsf@gnu.org>
* 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)
--
2.25.1
next prev parent reply other threads:[~2020-03-12 21:06 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-01 19:49 [bug#39862] [PATCH 0/4] update Dune finite element packages Felix Gruber
2020-03-01 20:23 ` [bug#39862] [PATCH 1/4] gnu: dune-*: set up MPI for tests Felix Gruber
2020-03-01 20:24 ` [bug#39862] [PATCH 2/4] gnu: add dune-uggrid 2.6.0 Felix Gruber
2020-03-01 20:25 ` [bug#39862] [PATCH 3/4] gnu: Add dune-subgrid Felix Gruber
2020-03-01 20:25 ` [bug#39862] [PATCH 4/4] gnu: dune-istl: Build with suitesparse Felix Gruber
2020-03-02 14:53 ` [bug#39862] [PATCH 0/4] update Dune finite element packages zimoun
2020-03-02 21:56 ` Felix Gruber
2020-03-10 19:29 ` [bug#39862] [PATCH v2 0/6] Update " Felix Gruber
2020-03-12 10:46 ` Ludovic Courtès
2020-03-10 19:29 ` [bug#39862] [PATCH v2 1/6] gnu: dune-*: set up MPI for tests Felix Gruber
2020-03-10 19:29 ` [bug#39862] [PATCH v2 2/6] gnu: add dune-uggrid 2.6.0 Felix Gruber
2020-03-10 19:29 ` [bug#39862] [PATCH v2 3/6] gnu: Add dune-subgrid Felix Gruber
2020-03-10 19:29 ` [bug#39862] [PATCH v2 4/6] gnu: dune-istl: Build with suitesparse Felix Gruber
2020-03-10 19:29 ` [bug#39862] [PATCH v2 5/6] gnu: dune-*: remove openmpi dependency Felix Gruber
2020-03-10 19:29 ` [bug#39862] [PATCH v2 6/6] gnu: define dune-*-openmpi packages Felix Gruber
2020-03-12 12:42 ` Ludovic Courtès
2020-03-12 21:05 ` [bug#39862] [PATCH v3 0/2] Add " Felix Gruber
2020-03-12 21:05 ` Felix Gruber [this message]
2020-03-12 21:05 ` [bug#39862] [PATCH v3 2/2] gnu: define " Felix Gruber
2020-03-13 9:42 ` Ludovic Courtès
2020-03-13 17:26 ` Felix Gruber
2020-03-13 21:28 ` Ludovic Courtès
2020-03-13 17:30 ` [bug#39862] [PATCH v4 1/2] gnu: dune-*: remove openmpi dependency Felix Gruber
2020-03-14 16:55 ` bug#39862: " Ludovic Courtès
2020-03-13 17:30 ` [bug#39862] [PATCH v4 2/2] gnu: define dune-*-openmpi packages Felix Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200312210513.107891-2-felgru@posteo.net \
--to=felgru@posteo.net \
--cc=39862@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).