me/guix
Archived
1
0
Fork 0
Code Activity

gnu: sundials: Update to 6.1.1.

Browse source 
* gnu/packages/maths.scm (sundials): Update to 6.1.1.
[inputs]: Add PETSC.
(sundials-openmpi)[inputs]: Remove PETSC.
[arguments]: Remove now unnecessary flags.  Change "MPI_ENABLE" to "ENABLE_MPI".
This commit is contained in:
Ludovic Courtès 2022-04-14 11:57:16 +02:00 • committed by Ludovic Courtès
parent 5f74169e8e
commit 61bcd648ca
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/maths.scm
View file

@ -6076,21 +6076,22 @@ and comparisons are supported.")
(define-public sundials (define-public sundials
(package (package
(name "sundials") (name "sundials")
(version "3.1.1") (version "6.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://computation.llnl.gov/projects/sundials/download/" (uri (string-append "https://github.com/LLNL/sundials/releases/download/v6.1.1/"
"sundials-" version ".tar.gz")) "sundials-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"090s8ymhd0g1s1d44fa73r5yi32hb4biwahhbfi327zd64yn8kd2")))) "0327a1fy8rilwc4brsqqb71jd1ymb7mqgxsylab06crcg5xn7byg"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("python" ,python-2))) ;for tests; syntax incompatible with python 3 `(("python" ,python-2))) ;for tests; syntax incompatible with python 3
(inputs (inputs
`(("fortran" ,gfortran) ;for fcmix `(("fortran" ,gfortran) ;for fcmix
("blas" ,openblas) ("blas" ,openblas)
("petsc" ,petsc)
("suitesparse" ,suitesparse))) ;TODO: Add hypre ("suitesparse" ,suitesparse))) ;TODO: Add hypre
(arguments (arguments
`(#:configure-flags `("-DCMAKE_C_FLAGS=-O2 -g -fcommon" `(#:configure-flags `("-DCMAKE_C_FLAGS=-O2 -g -fcommon"
@ -6120,24 +6121,17 @@ easily be incorporated into existing simulation codes.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public sundials-openmpi (define-public sundials-openmpi
(package (inherit sundials) (package
(inherit sundials)
(name "sundials-openmpi") (name "sundials-openmpi")
(inputs (inputs
`(("mpi" ,openmpi) `(("mpi" ,openmpi)
("petsc" ,petsc-openmpi) ;support in SUNDIALS requires MPI ("petsc-openmpi" ,petsc-openmpi) ;support in SUNDIALS requires MPI
,@(package-inputs sundials))) ,@(alist-delete "petsc" (package-inputs sundials))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments sundials) (substitute-keyword-arguments (package-arguments sundials)
((#:configure-flags flags '()) ((#:configure-flags flags '())
`(cons* "-DMPI_ENABLE:BOOL=ON" `(cons* "-DENABLE_MPI:BOOL=ON" ,flags))
"-DPETSC_ENABLE:BOOL=ON"
(string-append "-DPETSC_INCLUDE_DIR="
(assoc-ref %build-inputs "petsc")
"/include")
(string-append "-DPETSC_LIBRARY_DIR="
(assoc-ref %build-inputs "petsc")
"/lib")
,flags))
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-before 'check 'mpi-setup (add-before 'check 'mpi-setup