diff options
| author | Paul Garlick <pgarlick@tourbillion-technology.com> | 2018-09-03 11:57:38 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-09-04 15:22:48 +0200 |
| commit | 71ca16b58d20aa26157acc4c345c0af80ec8df5d (patch) | |
| tree | 8e37985e39de9fc692d2f3017417535e14668329 /gnu | |
| parent | b50658fe8ac898544a5c481f232a454c485524b9 (diff) | |
gnu: petsc-openmpi: Configure with support for hdf5 data format.
* gnu/packages/maths.scm (petsc-openmpi)[inputs]: Add
hdf5-parallel-openmpi.
[arguments]: Add '--with-hdf5-include' and '--with-hdf5-lib'
flags. Add 'set-test-environment' phase.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/maths.scm | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 50c0a320e0c..42136f65ea3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> | 15 | ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> |
| 16 | ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> | 16 | ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> |
| 17 | ;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be> | 17 | ;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be> |
| 18 | ;;; Copyright © 2017 Paul Garlick <pgarlick@tourbillion-technology.com> | 18 | ;;; Copyright © 2017, 2018 Paul Garlick <pgarlick@tourbillion-technology.com> |
| 19 | ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> | 19 | ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> |
| 20 | ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> | 20 | ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> |
| 21 | ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> | 21 | ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> |
| @@ -1685,6 +1685,7 @@ scientific applications modeled by partial differential equations.") | |||
| 1685 | (name "petsc-openmpi") | 1685 | (name "petsc-openmpi") |
| 1686 | (inputs | 1686 | (inputs |
| 1687 | `(("openmpi" ,openmpi) | 1687 | `(("openmpi" ,openmpi) |
| 1688 | ("hdf5" ,hdf5-parallel-openmpi) | ||
| 1688 | ,@(package-inputs petsc))) | 1689 | ,@(package-inputs petsc))) |
| 1689 | (arguments | 1690 | (arguments |
| 1690 | (substitute-keyword-arguments (package-arguments petsc) | 1691 | (substitute-keyword-arguments (package-arguments petsc) |
| @@ -1692,7 +1693,21 @@ scientific applications modeled by partial differential equations.") | |||
| 1692 | ``("--with-mpiexec=mpirun" | 1693 | ``("--with-mpiexec=mpirun" |
| 1693 | ,(string-append "--with-mpi-dir=" | 1694 | ,(string-append "--with-mpi-dir=" |
| 1694 | (assoc-ref %build-inputs "openmpi")) | 1695 | (assoc-ref %build-inputs "openmpi")) |
| 1695 | ,@(delete "--with-mpi=0" ,cf))))) | 1696 | ,(string-append "--with-hdf5-include=" |
| 1697 | (assoc-ref %build-inputs "hdf5") "/include") | ||
| 1698 | ,(string-append "--with-hdf5-lib=" | ||
| 1699 | (assoc-ref %build-inputs "hdf5") "/lib/libhdf5.a") | ||
| 1700 | ,@(delete "--with-mpi=0" ,cf))) | ||
| 1701 | ((#:phases phases) | ||
| 1702 | `(modify-phases ,phases | ||
| 1703 | (add-before 'check 'set-test-environment | ||
| 1704 | (lambda _ | ||
| 1705 | ;; By default, running the test suite would fail because 'ssh' | ||
| 1706 | ;; could not be found in $PATH. Define this variable to | ||
| 1707 | ;; placate Open MPI without adding a dependency on OpenSSH (the | ||
| 1708 | ;; agent isn't used anyway.) | ||
| 1709 | (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) | ||
| 1710 | #t)))))) | ||
| 1696 | (synopsis "Library to solve PDEs (with MPI support)"))) | 1711 | (synopsis "Library to solve PDEs (with MPI support)"))) |
| 1697 | 1712 | ||
| 1698 | (define-public petsc-complex-openmpi | 1713 | (define-public petsc-complex-openmpi |
