mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-24 03:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Fix openmpi related packages.

Browse source 
This makes these package definitions compatible with the openmpi package which
uses gexps as of f45fc72c28.

* gnu/packages/mpi.scm (openmpi-c++, java-openmpi,
openmpi-thread-multiple)[arguments]: Use gexps.
This commit is contained in:
Christopher Baines 2023-02-27 09:34:09 +00:00
parent 17bd024331
commit 9ae4846c50
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
gnu/packages/mpi.scm
View file

@ -311,7 +311,7 @@ (define-public openmpi-c++
(arguments (arguments
(substitute-keyword-arguments (package-arguments openmpi) (substitute-keyword-arguments (package-arguments openmpi)
((#:configure-flags flags) ((#:configure-flags flags)
`(cons "--enable-mpi-cxx" ,flags)))) #~(cons "--enable-mpi-cxx" #$flags))))
(synopsis "C++ bindings for MPI"))) (synopsis "C++ bindings for MPI")))
;; TODO: javadoc files contain timestamps. ;; TODO: javadoc files contain timestamps.
@ -327,34 +327,35 @@ (define-public java-openmpi
,@(package-native-inputs openmpi))) ,@(package-native-inputs openmpi)))
(outputs '("out")) (outputs '("out"))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) (cons*
#:modules '((guix build gnu-build-system)
((guix build ant-build-system) #:prefix ant:) ((guix build ant-build-system) #:prefix ant:)
(guix build utils)) (guix build utils))
#:imported-modules ((guix build ant-build-system) #:imported-modules `((guix build ant-build-system)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
,@(substitute-keyword-arguments (package-arguments openmpi) (substitute-keyword-arguments (package-arguments openmpi)
((#:configure-flags flags) ((#:configure-flags flags)
`(cons "--enable-mpi-java" ,flags)) #~(cons "--enable-mpi-java" #$flags))
((#:make-flags flags ''()) ((#:make-flags flags ''())
`(append '("-C" "ompi/mpi/java") #~(append '("-C" "ompi/mpi/java")
,flags)) #$flags))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
;; We could provide the location of the JDK in the configure ;; We could provide the location of the JDK in the configure
;; flags, but since the configure flags are embedded in the ;; flags, but since the configure flags are embedded in the
;; info binaries that would leave a reference to the JDK in ;; info binaries that would leave a reference to the JDK in
;; the "out" output. To avoid this we set JAVA_HOME. ;; the "out" output. To avoid this we set JAVA_HOME.
(add-after 'unpack 'set-JAVA_HOME (add-after 'unpack 'set-JAVA_HOME
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "JAVA_HOME" (assoc-ref inputs "jdk")) (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
#t)) #t))
(add-after 'unpack 'link-with-existing-mpi-libraries (add-after 'unpack 'link-with-existing-mpi-libraries
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "ompi/mpi/java/c/Makefile.in" (substitute* "ompi/mpi/java/c/Makefile.in"
(("\\$\\(top_builddir\\)/ompi/lib@OMPI_LIBMPI_NAME@.la") (("\\$\\(top_builddir\\)/ompi/lib@OMPI_LIBMPI_NAME@.la")
(search-input-file inputs "/lib/libmpi.la"))))) (search-input-file inputs "/lib/libmpi.la")))))
(add-after 'install 'strip-jar-timestamps (add-after 'install 'strip-jar-timestamps
(assoc-ref ant:%standard-phases 'strip-jar-timestamps))))))) (assoc-ref ant:%standard-phases 'strip-jar-timestamps)))))))
(synopsis "Java bindings for MPI"))) (synopsis "Java bindings for MPI")))
(define-public openmpi-thread-multiple (define-public openmpi-thread-multiple
@ -363,7 +364,7 @@ (define-public openmpi-thread-multiple
(arguments (arguments
(substitute-keyword-arguments (package-arguments openmpi) (substitute-keyword-arguments (package-arguments openmpi)
((#:configure-flags flags) ((#:configure-flags flags)
`(cons "--enable-mpi-thread-multiple" ,flags)))) #~(cons "--enable-mpi-thread-multiple" #$flags))))
(description "This version of Open@tie{}MPI has an implementation of (description "This version of Open@tie{}MPI has an implementation of
@code{MPI_Init_thread} that provides @code{MPI_THREAD_MULTIPLE}. This won't @code{MPI_Init_thread} that provides @code{MPI_THREAD_MULTIPLE}. This won't
work correctly with all transports (such as @code{openib}), and the work correctly with all transports (such as @code{openib}), and the