ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: dune-*: set up MPI for tests

Browse source 
* gnu/packages/maths.scm (dune-common, dune-grid, dune-istl,
dune-alugrid): [arguments]: correctly set up MPI instead of disabling
tests that require MPI.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Felix Gruber 2020-03-10 20:29:05 +01:00 committed by Ludovic Courtès
parent f7537e30b8
commit a669f6e27b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
gnu/packages/maths.scm
View file

@ -4593,36 +4593,8 @@ (define-public dune-common
(add-after 'build 'build-tests (add-after 'build 'build-tests
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "build_tests" make-flags))) (apply invoke "make" "build_tests" make-flags)))
;; These tests fail because they require a fully functional MPI (add-before 'check 'mpi-setup
;; environment. ,%openmpi-setup))))
(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)))))
(inputs (inputs
`(("gmp" ,gmp) `(("gmp" ,gmp)
("metis" ,metis) ("metis" ,metis)
@ -4703,54 +4675,8 @@ (define-public dune-grid
(add-after 'build 'build-tests (add-after 'build 'build-tests
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "build_tests" make-flags))) (apply invoke "make" "build_tests" make-flags)))
;; These tests fail because they require a fully functional MPI (add-before 'check 'mpi-setup
;; environment. ,%openmpi-setup))))
(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)))))
(inputs (inputs
`(("dune-common" ,dune-common) `(("dune-common" ,dune-common)
("dune-geometry" ,dune-geometry) ("dune-geometry" ,dune-geometry)
@ -4793,24 +4719,8 @@ (define-public dune-istl
(add-after 'build 'build-tests (add-after 'build 'build-tests
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "build_tests" make-flags))) (apply invoke "make" "build_tests" make-flags)))
;; These tests fail because they require a fully functional MPI (add-before 'check 'mpi-setup
;; environment. ,%openmpi-setup))))
(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)))))
(inputs (inputs
`(("dune-common" ,dune-common) `(("dune-common" ,dune-common)
("openmpi" ,openmpi) ("openmpi" ,openmpi)
@ -4896,9 +4806,7 @@ (define-public dune-alugrid
"1l9adgyjpra8mvwm445s0lpjshnb63jag85fb2hisbjn6bm320yj")))) "1l9adgyjpra8mvwm445s0lpjshnb63jag85fb2hisbjn6bm320yj"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; 7 of 8 tests fail because they need a full MPI `(#:phases
; environment
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-include (add-after 'unpack 'patch-include
(lambda _ (lambda _
@ -4910,7 +4818,9 @@ (define-public dune-alugrid
(lambda* (#:key inputs make-flags #:allow-other-keys) (lambda* (#:key inputs make-flags #:allow-other-keys)
(setenv "CPLUS_INCLUDE_PATH" (setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "dune-grid") "/share")) (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 (inputs
`(("dune-common" ,dune-common) `(("dune-common" ,dune-common)
("dune-geometry" ,dune-geometry) ("dune-geometry" ,dune-geometry)