Skip to content

Commit

Permalink
gnu: hdf5-parallel-openmpi: Update to 1.14.x.
Browse files Browse the repository at this point in the history
Fixes <https://issues.guix.gnu.org/68313>.

HDF5 1.14.3 contains the fix for <HDFGroup/hdf5#3421>.

* gnu/packages/maths.scm (hdf5-parallel-openmpi): Inherit from HDF5-1.14.
[arguments]: Take arguments from HDF5-1.14.  Use gexps.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Change-Id: I99222a1085dcd75c3c9ac83a0e88495e86a8cf59
  • Loading branch information
lcirrottola authored and civodul committed Aug 19, 2024
1 parent 832f2bc commit 84c62cf
Showing 1 changed file with 21 additions and 22 deletions.
43 changes: 21 additions & 22 deletions gnu/packages/maths.scm
Original file line number Diff line number Diff line change
Expand Up @@ -2080,35 +2080,34 @@ Swath).")
(license (license:non-copyleft home-page))))

(define-public hdf5-parallel-openmpi
(package/inherit hdf5-1.10 ;use the latest
(package/inherit hdf5-1.14 ;use the latest
(name "hdf5-parallel-openmpi")
(inputs
`(("mpi" ,openmpi)
,@(package-inputs hdf5)))
(arguments
(substitute-keyword-arguments (package-arguments hdf5)
(substitute-keyword-arguments (package-arguments hdf5-1.14)
((#:configure-flags flags)
``("--enable-parallel"
,@(delete "--enable-cxx"
(delete "--enable-threadsafe" ,flags))))
#~(cons "--enable-parallel"
(delete "--enable-cxx"
(delete "--enable-threadsafe" #$flags))))
((#:phases phases)
`(modify-phases ,phases
(add-after 'build 'mpi-setup
,%openmpi-setup)
(add-before 'check 'patch-tests
(lambda _
;; OpenMPI's mpirun will exit with non-zero status if it
;; detects an "abnormal termination", i.e. any process not
;; calling MPI_Finalize(). Since the test is explicitly
;; avoiding MPI_Finalize so as not to have at_exit and thus
;; H5C_flush_cache from being called, mpirun will always
;; complain, so turn this test off.
(substitute* "testpar/Makefile"
(("(^TEST_PROG_PARA.*)t_pflush1(.*)" front back)
(string-append front back "\n")))
(substitute* "tools/test/h5diff/testph5diff.sh"
(("/bin/sh") (which "sh")))
#t))))))
#~(modify-phases #$phases
(add-after 'build 'mpi-setup
#$%openmpi-setup)
(add-before 'check 'patch-tests
(lambda _
;; OpenMPI's mpirun will exit with non-zero status if it
;; detects an "abnormal termination", i.e. any process not
;; calling MPI_Finalize(). Since the test is explicitly
;; avoiding MPI_Finalize so as not to have at_exit and thus
;; H5C_flush_cache from being called, mpirun will always
;; complain, so turn this test off.
(substitute* "testpar/Makefile"
(("(^TEST_PROG_PARA.*)t_pflush1(.*)" front back)
(string-append front back "\n")))
(substitute* "tools/test/h5diff/testph5diff.sh"
(("/bin/sh") (which "sh")))))))))
(synopsis "Management suite for data with parallel IO support")))

(define-public hdf5-blosc
Expand Down

0 comments on commit 84c62cf

Please sign in to comment.