[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#39862] [PATCH 1/4] gnu: dune-*: set up MPI for tests
|
From: |
Felix Gruber |
|
Subject: |
[bug#39862] [PATCH 1/4] gnu: dune-*: set up MPI for tests |
|
Date: |
Sun, 1 Mar 2020 21:23:59 +0100 |
* 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 cee626f179..effba8956f 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)
--
2.25.1
- [bug#39862] [PATCH 0/4] update Dune finite element packages, Felix Gruber, 2020/03/01
- [bug#39862] [PATCH 1/4] gnu: dune-*: set up MPI for tests,
Felix Gruber <=
- [bug#39862] [PATCH 2/4] gnu: add dune-uggrid 2.6.0, Felix Gruber, 2020/03/01
- [bug#39862] [PATCH 3/4] gnu: Add dune-subgrid, Felix Gruber, 2020/03/01
- [bug#39862] [PATCH 4/4] gnu: dune-istl: Build with suitesparse, Felix Gruber, 2020/03/01
- [bug#39862] [PATCH 0/4] update Dune finite element packages, zimoun, 2020/03/02
- [bug#39862] [PATCH 0/4] update Dune finite element packages, Felix Gruber, 2020/03/02
- [bug#39862] [PATCH v2 3/6] gnu: Add dune-subgrid, Felix Gruber, 2020/03/10
- [bug#39862] [PATCH v2 1/6] gnu: dune-*: set up MPI for tests, Felix Gruber, 2020/03/10
- [bug#39862] [PATCH v2 2/6] gnu: add dune-uggrid 2.6.0, Felix Gruber, 2020/03/10
- [bug#39862] [PATCH v2 0/6] Update Dune finite element packages, Felix Gruber, 2020/03/10
- [bug#39862] [PATCH v2 0/6] Update Dune finite element packages, Ludovic Courtès, 2020/03/12