diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-11-23 17:47:31 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-11-23 18:44:47 +0100 |
| commit | c491f7f8de66d0f8386ba6fd7c2da5c3c0d1b24a (patch) | |
| tree | d585b6ed089ae64bae1b687470c3f4dcbd048271 /gnu/packages/maths.scm | |
| parent | d57ec906ba5b1e2581842c4dbcbfdfbc58cdad83 (diff) | |
| download | gnu-guix-c491f7f8de66d0f8386ba6fd7c2da5c3c0d1b24a.tar gnu-guix-c491f7f8de66d0f8386ba6fd7c2da5c3c0d1b24a.tar.gz | |
gnu: pt-scotch, pt-scotch32: Add Open MPI setup phase.
* gnu/packages/maths.scm (pt-scotch)[arguments]: Use 'invoke' instead of
'system*'. Add 'mpi-setup' phase.
(pt-scotch32)[arguments]: Likewise.
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7dc8b62a47..ab83c9bc9f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2600,15 +2600,16 @@ YACC = bison -pscotchyy -y -b y (replace 'build (lambda _ - (and - (zero? (system* "make" - (format #f "-j~a" (parallel-job-count)) - "ptscotch" "ptesmumps")) - ;; Install the serial metis compatibility library - (zero? (system* "make" "-C" "libscotchmetis" "install"))))) - (replace - 'check - (lambda _ (zero? (system* "make" "ptcheck")))))))) + (invoke "make" (format #f "-j~a" (parallel-job-count)) + "ptscotch" "ptesmumps") + + ;; Install the serial metis compatibility library + (invoke "make" "-C" "libscotchmetis" "install"))) + (add-before 'check 'mpi-setup + ,%openmpi-setup) + (replace 'check + (lambda _ + (invoke "make" "ptcheck"))))))) (synopsis "Programs and libraries for graph algorithms (with MPI)"))) (define-public pt-scotch32 @@ -2622,15 +2623,15 @@ YACC = bison -pscotchyy -y -b y `(modify-phases ,scotch32-phases (replace 'build (lambda _ - (and - (zero? (system* "make" - (format #f "-j~a" (parallel-job-count)) - "ptscotch" "ptesmumps")) - ;; Install the serial metis compatibility library - (zero? (system* "make" "-C" "libscotchmetis" "install"))))) + (invoke "make" (format #f "-j~a" (parallel-job-count)) + "ptscotch" "ptesmumps") + ;; Install the serial metis compatibility library + (invoke "make" "-C" "libscotchmetis" "install"))) + (add-before 'check 'mpi-setup + ,%openmpi-setup) (replace 'check (lambda _ - (zero? (system* "make" "ptcheck")))))))) + (invoke "make" "ptcheck"))))))) (synopsis "Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) |