Merge branch 'devel' into 'main'

openmpi-glicid-pmixv4 now inherits openmpi-glicid

See merge request glicid-public/guix-glicid!496
This commit is contained in:
Yann Dupont 2025-02-18 15:43:13 +00:00
commit decfcf0893

View file

@ -50,10 +50,10 @@
(define-public openmpi-glicid-pmixv4
(package/inherit openmpi-4-latest
(package/inherit openmpi-glicid
(name "openmpi-glicid-pmixv4")
(arguments (substitute-keyword-arguments (package-arguments
openmpi-4-latest)
openmpi-glicid)
((#: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.
@ -63,10 +63,10 @@
(string-append "--with-prrte="
#$(this-package-input "prrte"))) ;#$flags
))))
(inputs (modify-inputs (package-inputs openmpi-4-latest)
(inputs (modify-inputs (package-inputs openmpi-glicid)
(append openpmix) ; because we use pmix4 now, openpmi-4 defaults to internal pmix3
(append prrte) ;idem
(replace "slurm" slurm-glicid)))
))
))