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

Merge branch 'devel' into 'main'

Browse source 
suppress openib from openmpi-glicid-unpatched-pmixv4

See merge request glicid-public/guix-glicid!498
This commit is contained in:
Yann Dupont 2025-02-20 15:06:44 +00:00
commit 145ae2cc01
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
glicid/packages/mpi.scm
View file

@ -1,4 +1,5 @@
(define-module (glicid packages mpi)
#:use-module (srfi srfi-1) ; lset-difference
#:use-module (guix packages)
#:use-module (guix download)
#:use-module ((gnu packages mpi)
@ -10,6 +11,7 @@
#:use-module (guix gexp)
#:use-module (gnu packages))
;(define-public openmpi-glicid-internal-pmix
; (package/inherit gnu:openmpi-4
; (name "openmpi-glicid")
@ -95,19 +97,27 @@
))
(define-public openmpi-glicid-unpatched-pmixv4
(define-public openmpi-unpatched-glicid-pmixv4
(package/inherit openmpi-unpatched-glicid
(name "openmpi-glicid-unpatched-pmixv4")
(name "openmpi-unpatched-glicid-pmixv4")
(arguments (substitute-keyword-arguments (package-arguments
openmpi-unpatched-glicid)
((#:configure-flags flags)
#~(append #$flags
#~(append
; (`lset-difference `eq? #$flags (list "--with-pmix=internal"))
; (delete "--with-pmix=internal" (delete "--enable-openib-control-hdr-padding" #$flags))
; (lset-difference eq? (list "-with-pmix=internal" "--enable-openib-control-hdr-padding") #$flags)
; #$flags
(delete "--with-pmix=internal"
(delete "--enable-openib-dynamic-sl"
(delete "--enable-openib-udcm"
(delete "--enable-openib-rdmacm"
(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.
(string-append "--with-pmix="
#$(this-package-input
"openpmix"))
(string-append "--with-prrte="
#$(this-package-input "prrte"))) ;#$flags
"openpmix")))
))))
(inputs (modify-inputs (package-inputs openmpi-unpatched-glicid)
(append openpmix) ; because we use pmix4 now, openpmi-4 defaults to internal pmix3
@ -116,3 +126,4 @@
))
openmpi-unpatched-glicid-pmixv4