GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-29 21:58:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add 2 variants

Browse source
This commit is contained in:
Yann Dupont 2025-02-18 16:02:45 +01:00
parent 4ac3cb815d
commit 03594cf18f
1 changed files with 44 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
glicid/packages/mpi.scm
View file

@ -10,7 +10,6 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (gnu packages)) #:use-module (gnu packages))
;(define-public openmpi-glicid-internal-pmix ;(define-public openmpi-glicid-internal-pmix
; (package/inherit gnu:openmpi-4 ; (package/inherit gnu:openmpi-4
; (name "openmpi-glicid") ; (name "openmpi-glicid")
@ -21,23 +20,53 @@
; ) ; )
;) ;)
(define-public openmpi-upstream-4.1.8
(package
(inherit gnu:openmpi-4)
(name "openmpi-4-upstream")
(version "4.1.8")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.open-mpi.org/software/ompi/v"
(version-major+minor version) "/downloads/openmpi-"
version ".tar.bz2"))
(sha256
(base32 "1a8jkxqxbkyx9np2vyjrhgckd0zdzkx1286c20kw079a2ginhvs6"))
(patches (search-patches "openmpi-mtl-priorities.patch"))))))
(define openmpi-4-latest
(latest-version openmpi-upstream-4.1.8 gnu:openmpi-4))
(define-public openmpi-glicid (define-public openmpi-glicid
(package/inherit gnu:openmpi-4 (package/inherit openmpi-4-latest
(name "openmpi-glicid") (name "openmpi-glicid")
(arguments (inputs (modify-inputs (package-inputs openmpi-4-latest)
(substitute-keyword-arguments (package-arguments gnu:openmpi-4)
((#:configure-flags flags)
#~(append #$flags (list ;; original flags has --with-pmix=internal, we should remove it but last --with-pmix is the one taken into account.
(string-append "--with-pmix=" #$(this-package-input "openpmix"))
(string-append "--with-prrte=" #$(this-package-input "prrte"))
) ;#$flags
))))
(inputs (modify-inputs (package-inputs gnu:openmpi-4)
(append openpmix) ;; because we use pmix4 now, openpmi-4 defaults to internal pmix3
(append prrte) ;; idem
(replace "slurm" slurm-glicid))) (replace "slurm" slurm-glicid)))
) ))
)
(define-public openmpi-glicid-pmxv4
(package/inherit openmpi-4-latest
(name "openmpi-glicid-pmxv4")
(arguments (substitute-keyword-arguments (package-arguments
openmpi-4-latest)
((#:configure-flags flags)
#~(append #$flags
(list ;original flags has --with-pmix=internal, we should remove it but last --with-pmix is the one taken into account.
(string-append "--with-pmix="
#$(this-package-input
"openpmix"))
(string-append "--with-prrte="
#$(this-package-input "prrte"))) ;#$flags
))))
(inputs (modify-inputs (package-inputs openmpi-4-latest)
(append openpmix) ; because we use pmix4 now, openpmi-4 defaults to internal pmix3
(append prrte) ;idem
(replace "slurm" slurm-glicid)))
))