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.
master
Ludovic Courtès 2018-11-23 17:47:31 +01:00
parent d57ec906ba
commit c491f7f8de
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 16 deletions

View File

@ -2600,15 +2600,16 @@ YACC = bison -pscotchyy -y -b y
(replace (replace
'build 'build
(lambda _ (lambda _
(and (invoke "make" (format #f "-j~a" (parallel-job-count))
(zero? (system* "make" "ptscotch" "ptesmumps")
(format #f "-j~a" (parallel-job-count))
"ptscotch" "ptesmumps")) ;; Install the serial metis compatibility library
;; Install the serial metis compatibility library (invoke "make" "-C" "libscotchmetis" "install")))
(zero? (system* "make" "-C" "libscotchmetis" "install"))))) (add-before 'check 'mpi-setup
(replace ,%openmpi-setup)
'check (replace 'check
(lambda _ (zero? (system* "make" "ptcheck")))))))) (lambda _
(invoke "make" "ptcheck")))))))
(synopsis "Programs and libraries for graph algorithms (with MPI)"))) (synopsis "Programs and libraries for graph algorithms (with MPI)")))
(define-public pt-scotch32 (define-public pt-scotch32
@ -2622,15 +2623,15 @@ YACC = bison -pscotchyy -y -b y
`(modify-phases ,scotch32-phases `(modify-phases ,scotch32-phases
(replace 'build (replace 'build
(lambda _ (lambda _
(and (invoke "make" (format #f "-j~a" (parallel-job-count))
(zero? (system* "make" "ptscotch" "ptesmumps")
(format #f "-j~a" (parallel-job-count)) ;; Install the serial metis compatibility library
"ptscotch" "ptesmumps")) (invoke "make" "-C" "libscotchmetis" "install")))
;; Install the serial metis compatibility library (add-before 'check 'mpi-setup
(zero? (system* "make" "-C" "libscotchmetis" "install"))))) ,%openmpi-setup)
(replace 'check (replace 'check
(lambda _ (lambda _
(zero? (system* "make" "ptcheck")))))))) (invoke "make" "ptcheck")))))))
(synopsis (synopsis
"Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) "Programs and libraries for graph algorithms (with MPI and 32-bit integers)")))