Merge branch 'devel' into 'main'

really disable openfabrics

See merge request glicid-public/guix-glicid!499
This commit is contained in:
Yann Dupont 2025-02-20 15:47:17 +00:00
commit 715d6392c2

View file

@ -9,6 +9,9 @@
#:use-module (glicid packages parallel)
#:use-module (gnu packages parallel)
#:use-module (guix gexp)
#:use-module (gnu packages linux)
#:use-module (gnu packages linux)
#:use-module (ice-9 pretty-print)
#:use-module (gnu packages))
@ -66,7 +69,7 @@
(define-public openmpi-unpatched-glicid
(package/inherit openmpi-upstream-unpatched-4.1.8
(name "openmpi-glicid-unpatched")
(name "openmpi-unpatched-glicid")
(inputs (modify-inputs (package-inputs openmpi-upstream-unpatched-4.1.8)
(replace "slurm" slurm-glicid)))
@ -115,15 +118,18 @@
(delete "--enable-openib-rdmacm-ibaddr"
(delete "--enable-openib-control-hdr-padding" #$flags))))))
(list ;original flags has --with-pmix=internal, we should remove it but last --with-pmix is the one taken into account.
"--without-openib"
(string-append "--with-pmix="
#$(this-package-input
"openpmix")))
))))
(inputs (modify-inputs (package-inputs openmpi-unpatched-glicid)
(delete "libfabric") ;; openib won't be here…
(append openpmix) ; because we use pmix4 now, openpmi-4 defaults to internal pmix3
(append prrte) ;idem
; (append prrte) ;idem
))
))
openmpi-unpatched-glicid-pmixv4
;(pretty-print (package-inputs openmpi-unpatched-glicid-pmixv4))