diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-11-29 14:19:55 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-11-29 17:34:18 +0000 |
| commit | ff01206345e2306cc633db48e0b29eab9077091a (patch) | |
| tree | 25c7ee17005dadc9bf4fae3f0873e03a4704f782 /gnu/packages/simulation.scm | |
| parent | ed2545f0fa0e2ad99d5a0c45f532c539b299b9fb (diff) | |
| parent | 7c2e67400ffaef8eb6f30ef7126c976ee3d7e36c (diff) | |
| download | guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/simulation.scm')
| -rw-r--r-- | gnu/packages/simulation.scm | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index a95160c1c1..45efd5c472 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -684,17 +684,13 @@ user interface to the FEniCS core components and external libraries.") (with-directory-excursion "test" ;; Note: The test test_snes_set_from_options() in the file ;; unit/nls/test_PETScSNES_solver.py fails and is ignored. - (and (invoke "py.test" "unit" "--ignore" - "unit/nls/test_PETScSNES_solver.py") - (invoke "mpirun" "-np" "3" "python" "-B" "-m" - "pytest" "unit" "--ignore" - "unit/nls/test_PETScSNES_solver.py"))) - (with-directory-excursion "demo" - ;; Check demos. - (invoke "python" "generate-demo-files.py") - (and (invoke "python" "-m" "pytest" "-v" "test.py") - (invoke "python" "-m" "pytest" "-v" "test.py" - "--mpiexec=mpiexec" "--num-proc=3"))) + ;; Limit the number of jobs to 3 as 500 MiB of memory is used + ;; per process. + (invoke "mpirun" "-np" (number->string + (min 3 (parallel-job-count))) + "python" "-B" "-m" + "pytest" "unit" "--ignore" + "unit/nls/test_PETScSNES_solver.py")) #t)) (add-after 'install 'install-demo-files (lambda* (#:key outputs #:allow-other-keys) |