From: Paul Garlick <pgarlick@tourbillion-technology.com>
To: 32732@debbugs.gnu.org
Cc: Paul Garlick <pgarlick@tourbillion-technology.com>
Subject: [bug#32732] [PATCH] gnu: hdf5-parallel-openmpi: Really enable parallel build.
Date: Thu, 13 Sep 2018 21:03:25 +0100 [thread overview]
Message-ID: <1536869005-3781-1-git-send-email-pgarlick@tourbillion-technology.com> (raw)
This fix ensures that the H5_HAVE_PARALLEL identifier is correctly set
in the file H5pubconf.h.
* gnu/packages/maths.scm (hdf5-parallel-openmpi)[arguments]: Add
the "--enable-parallel" flag to the list of configure flags. Remove
the incompatible "--enable-cxx" flag. Add 'mpi-setup' phase. Replace
the 'split' phase, omitting the references to the h5fc script which is
not present.
---
gnu/packages/maths.scm | 38 +++++++++++++++++++++++++++++++++++---
1 file changed, 35 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index af41093..85d3884 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1034,10 +1034,13 @@ Swath).")
`(("mpi" ,openmpi)
,@(package-inputs hdf5)))
(arguments
- (substitute-keyword-arguments `(#:configure-flags '("--enable-parallel")
- ,@(package-arguments hdf5))
+ (substitute-keyword-arguments (package-arguments hdf5)
+ ((#:configure-flags flags)
+ ``("--enable-parallel" ,@(delete "--enable-cxx" ,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
@@ -1051,7 +1054,36 @@ Swath).")
(string-append front back "\n")))
(substitute* "tools/h5diff/testph5diff.sh"
(("/bin/sh") (which "sh")))
- #t))))))
+ #t))
+ (replace 'split
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Move all fortran-related files
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (lib (string-append out "/lib"))
+ (inc (string-append out "/include"))
+ (ex (string-append out "/share/hdf5_examples/fortran"))
+ (fort (assoc-ref outputs "fortran"))
+ (flib (string-append fort "/lib"))
+ (finc (string-append fort "/include"))
+ (fex (string-append fort "/share/hdf5_examples/fortran")))
+ (mkdir-p flib)
+ (mkdir-p finc)
+ (mkdir-p fex)
+ (for-each (lambda (file)
+ (rename-file file
+ (string-append flib "/" (basename file))))
+ (find-files lib ".*fortran.*"))
+ (for-each (lambda (file)
+ (rename-file file
+ (string-append finc "/" (basename file))))
+ (find-files inc ".*mod"))
+ (for-each (lambda (file)
+ (rename-file file
+ (string-append fex "/" (basename file))))
+ (find-files ex ".*"))
+ (delete-file-recursively ex))
+ #t))))))
(synopsis "Management suite for data with parallel IO support")))
(define-public h5check
--
1.8.3.1
next reply other threads:[~2018-09-13 20:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-13 20:03 Paul Garlick [this message]
2018-09-16 21:00 ` [bug#32732] [PATCH] gnu: hdf5-parallel-openmpi: Really enable parallel build Ludovic Courtès
2018-09-20 17:59 ` [bug#32732] [PATCH 1/2] gnu: hdf5: Allow for absence of utility script Paul Garlick
2018-09-20 17:59 ` [bug#32732] [PATCH 2/2] gnu: hdf5-parallel-openmpi: Really enable parallel build Paul Garlick
2018-09-21 1:07 ` Eric Bavier
2018-09-24 12:20 ` bug#32732: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1536869005-3781-1-git-send-email-pgarlick@tourbillion-technology.com \
--to=pgarlick@tourbillion-technology.com \
--cc=32732@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.