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 
now uses pmix4

See merge request glicid-public/guix-glicid!492
This commit is contained in:
Yann Dupont 2025-02-18 13:53:11 +00:00
commit 13a0511231
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
glicid/packages/mpi.scm
View file

@ -10,29 +10,34 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (gnu packages)) #:use-module (gnu packages))
(define-public openmpi-glicid
;(define-public openmpi-glicid-internal-pmix
; (package/inherit gnu:openmpi-4
; (name "openmpi-glicid")
; (inputs (modify-inputs (package-inputs gnu:openmpi-4)
; (append openpmix) ;; because we use pmix4 now, openpmi-4 defaults to internal pmix3
; (replace "slurm" slurm-glicid)))
;
; )
;)
(define-public openmpi-glicid-pmix
(package/inherit gnu:openmpi-4 (package/inherit gnu:openmpi-4
(name "openmpi-glicid") (name "openmpi-glicid")
(inputs (modify-inputs (package-inputs gnu:openmpi-4)
(append openpmix) ;; because we use pmix4 now, openpmi-4 defaults to internal pmix3
(replace "slurm" slurm-glicid)))
)
)
(define-public openmpi-glicid-new
(package/inherit gnu:openmpi-4
(name "openmpi-glicid-new")
(arguments (arguments
(substitute-keyword-arguments (package-arguments gnu:openmpi-4) (substitute-keyword-arguments (package-arguments gnu:openmpi-4)
((#:configure-flags flags) ((#:configure-flags flags)
(append `(cons* "--with-pmix=external" ,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) (inputs (modify-inputs (package-inputs gnu:openmpi-4)
(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
(replace "slurm" slurm-glicid))) (replace "slurm" slurm-glicid)))
) )
) )