me/guix
Archived
1
0
Fork 0
Code Activity

gnu: mumps: Remove input labels.

Browse source 
* gnu/packages/maths.scm (mumps)[inputs]: Remove labels.
[arguments]: Adjust 'configure' phase to not rely on the "mpi" and
"blas" labels.
(mumps-metis, mumps-openmpi, mumps-metis-openmpi): Use 'modify-inputs'.
This commit is contained in:
Ludovic Courtès 2022-02-15 16:52:32 +01:00
parent d4709d78c3
commit ee92b0fb7d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gnu/packages/maths.scm
View file

@ -3532,12 +3532,12 @@ language understood by many solvers.")
"mumps-shared-pord.patch")))) "mumps-shared-pord.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("fortran" ,gfortran) (list gfortran
;; These are required for linking against mumps, but we let the user ;; These are required for linking against mumps, but we let the user
;; declare the dependency. ;; declare the dependency.
("blas" ,openblas) openblas
("metis" ,metis) metis
("scotch" ,scotch))) scotch))
(arguments (arguments
`(#:modules ((ice-9 match) `(#:modules ((ice-9 match)
(ice-9 popen) (ice-9 popen)
@ -3594,8 +3594,9 @@ ORDERINGSC = $(ORDERINGSF)
LORDERINGS = $(LPORD) $(LMETIS) $(LSCOTCH) $(LIBSEQ) LORDERINGS = $(LPORD) $(LMETIS) $(LSCOTCH) $(LIBSEQ)
IORDERINGSF = $(ISCOTCH) IORDERINGSF = $(ISCOTCH)
IORDERINGSC = $(IPORD) $(IMETIS) $(ISCOTCH)" IORDERINGSC = $(IPORD) $(IMETIS) $(ISCOTCH)"
(assoc-ref inputs "mpi") (->bool (which "mpicc")) ;MPI support enabled?
(assoc-ref inputs "blas") (dirname
(dirname (search-input-file inputs "/include/cblas.h")))
(assoc-ref inputs "scalapack") (assoc-ref inputs "scalapack")
(assoc-ref inputs "metis") (assoc-ref inputs "metis")
(match (list (assoc-ref inputs "pt-scotch") (match (list (assoc-ref inputs "pt-scotch")
@ -3656,19 +3657,20 @@ sparse system of linear equations A x = b using Gaussian elimination.")
(license license:cecill-c))) (license license:cecill-c)))
(define-public mumps-metis (define-public mumps-metis
(package (inherit mumps) (package
(inherit mumps)
(name "mumps-metis") (name "mumps-metis")
(inputs (inputs (modify-inputs (package-inputs mumps)
(alist-delete "scotch" (package-inputs mumps))))) (delete "scotch")))))
(define-public mumps-openmpi (define-public mumps-openmpi
(package (inherit mumps) (package
(inherit mumps)
(name "mumps-openmpi") (name "mumps-openmpi")
(inputs (inputs
`(("mpi" ,openmpi) (modify-inputs (package-inputs mumps)
("scalapack" ,scalapack) (delete "scotch")
("pt-scotch" ,pt-scotch) (prepend openmpi scalapack pt-scotch)))
,@(alist-delete "scotch" (package-inputs mumps))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments mumps) (substitute-keyword-arguments (package-arguments mumps)
((#:phases phases) ((#:phases phases)
@ -3682,10 +3684,11 @@ sparse system of linear equations A x = b using Gaussian elimination.")
(synopsis "Multifrontal sparse direct solver (with MPI)"))) (synopsis "Multifrontal sparse direct solver (with MPI)")))
(define-public mumps-metis-openmpi (define-public mumps-metis-openmpi
(package (inherit mumps-openmpi) (package
(inherit mumps-openmpi)
(name "mumps-metis-openmpi") (name "mumps-metis-openmpi")
(inputs (inputs (modify-inputs (package-inputs mumps-openmpi)
(alist-delete "pt-scotch" (package-inputs mumps-openmpi))))) (delete "pt-scotch")))))
(define-public ruby-asciimath (define-public ruby-asciimath
(package (package