diff options
| author | Paul A. Patience <paul@apatience.com> | 2023-10-13 12:35:45 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-10-14 22:41:45 +0200 |
| commit | 08c55c03bf79b648d426d6cb9c9c8b9c8887e269 (patch) | |
| tree | 818cdcdf3ac28966d8169bf2fc7162a33a2c985b /gnu/packages/maths.scm | |
| parent | 50b82ea44e0cc19034058cfdac167284716d6471 (diff) | |
gnu: dealii: Update to 9.5.1.
* gnu/packages/maths.scm (dealii): Update to 9.5.1.
[propagated-inputs]: Add kokkos.
[arguments]<#:phases>: Add 'unset-cpath' phase.
(dealii-openmpi)[propagated-inputs]: Remove kokkos.
[arguments]<#:phases>: Delete 'unset-cpath' phase.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9d157ae921..5ca7a16a1d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -114,6 +114,7 @@ #:use-module (gnu packages coq) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages cpp) #:use-module (gnu packages datamash) #:use-module (gnu packages dbm) #:use-module (gnu packages documentation) @@ -6562,17 +6563,17 @@ A unique design feature of Trilinos is its focus on packages.") (define-public dealii (package (name "dealii") - (version "9.4.0") + (version "9.5.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/dealii/dealii/releases/" "download/v" version "/dealii-" version ".tar.gz")) (sha256 - (base32 "0v73q6f35f2yrjihaq6vh9lma07qc4cdv75nwmc3c5yrdh07g1i3")) + (base32 "0phgcfnil4rb41xipsdbm4lxrymlqxbiccakg3pkm3a8wqsva658")) (modules '((guix build utils))) (snippet - ;; Remove bundled boost, muparser, TBB and UMFPACK. + ;; Remove bundled boost, Kokkos, muparser, TBB and UMFPACK. #~(delete-file-recursively "bundled")))) (build-system cmake-build-system) (outputs '("out" "doc")) @@ -6596,6 +6597,7 @@ A unique design feature of Trilinos is its focus on packages.") ;; the requisite interpreter to its native inputs. (list boost hdf5 + kokkos suitesparse ; For UMFPACK. sundials tbb)) @@ -6620,6 +6622,18 @@ A unique design feature of Trilinos is its focus on packages.") "/examples"))) #:phases #~(modify-phases %standard-phases + ;; Without unsetting CPATH, the build fails with the following + ;; error (similar to <https://bugs.gnu.org/30756>): + ;; + ;; /gnu/store/…-gcc-11.3.0/include/c++/math.h:30:16: fatal error: math.h: No such file or directory + ;; 30 | # include_next <math.h> + ;; | ^~~~~~~~ + ;; + ;; Why does unsetting CPATH magically fix the error? + ;; TODO: Properly fix this issue. + (add-after 'set-paths 'unset-cpath + (lambda _ + (unsetenv "CPATH"))) (add-after 'install 'remove-build-logs ;; These build logs leak the name of the build directory by ;; storing the values of CMAKE_SOURCE_DIR and @@ -6651,7 +6665,7 @@ in finite element programs.") scalapack))) (propagated-inputs (modify-inputs (package-propagated-inputs dealii) - (delete "hdf5" "sundials") + (delete "hdf5" "kokkos" "sundials") (prepend hdf5-parallel-openmpi openmpi p4est-openmpi @@ -6662,7 +6676,12 @@ in finite element programs.") (arguments (substitute-keyword-arguments (package-arguments dealii) ((#:configure-flags flags) - #~(cons "-DDEAL_II_WITH_MPI=ON" #$flags)))) + #~(cons "-DDEAL_II_WITH_MPI=ON" #$flags)) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + ;; The build failure fixed by this phase does not manifest when + ;; Kokkos is included via Trilinos. + (delete 'unset-cpath))))) (synopsis "Finite element library (with MPI support)"))) (define-public flann |