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

really disable openfabrics

Browse source
This commit is contained in:
Yann Dupont 2025-02-20 16:46:26 +01:00
parent cab45a02cd
commit 49e45b2d68
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
glicid/packages/mpi.scm
View file

@ -9,6 +9,9 @@
#:use-module (glicid packages parallel) #:use-module (glicid packages parallel)
#:use-module (gnu packages parallel) #:use-module (gnu packages parallel)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (gnu packages linux)
#:use-module (gnu packages linux)
#:use-module (ice-9 pretty-print)
#:use-module (gnu packages)) #:use-module (gnu packages))
@ -66,7 +69,7 @@
(define-public openmpi-unpatched-glicid (define-public openmpi-unpatched-glicid
(package/inherit openmpi-upstream-unpatched-4.1.8 (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) (inputs (modify-inputs (package-inputs openmpi-upstream-unpatched-4.1.8)
(replace "slurm" slurm-glicid))) (replace "slurm" slurm-glicid)))
@ -115,15 +118,18 @@
(delete "--enable-openib-rdmacm-ibaddr" (delete "--enable-openib-rdmacm-ibaddr"
(delete "--enable-openib-control-hdr-padding" #$flags)))))) (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. (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=" (string-append "--with-pmix="
#$(this-package-input #$(this-package-input
"openpmix"))) "openpmix")))
)))) ))))
(inputs (modify-inputs (package-inputs openmpi-unpatched-glicid) (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 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))