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

slurm-glicid now use pmixv3 and ucx

Browse source
This commit is contained in:
Yann Dupont 2023-07-11 16:32:25 +02:00
parent 7dbb0238f6
commit 7f1aa5ad08
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
glicid/packages/parallel.scm
View file

@ -17,6 +17,7 @@
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (glicid utils) #:use-module (glicid utils)
#:use-module (glicid packages fabric-management) ;for latest ucx #:use-module (glicid packages fabric-management) ;for latest ucx
#:use-module (gnu packages fabric-management)
#:use-module (glicid packages containers) ;for latest podman #:use-module (glicid packages containers) ;for latest podman
#:use-module (gnu packages compression) ;lz4 #:use-module (gnu packages compression) ;lz4
#:use-module (gnu packages lua) ;lua #:use-module (gnu packages lua) ;lua
@ -26,7 +27,7 @@
(define-public openpmix-3.1.5 (define-public openpmix-3.1.5
(package (package
(name "openpmix") (name "openpmix-3")
(version "3.1.5") (version "3.1.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -67,6 +68,7 @@
(define-public openpmix-4.1.0 (define-public openpmix-4.1.0
(package (package
(inherit openpmix-3.1.5) (inherit openpmix-3.1.5)
(name "openpmix-4")
(version "4.1.0") (version "4.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -99,7 +101,7 @@
openpmix-4.2.4) openpmix-4.2.4)
(define-public openpmix (define-public openpmix
openpmix-4) openpmix-3) ; compat with nautilus…
(define-public slurm-20.02-upstream (define-public slurm-20.02-upstream
(package (package
@ -194,29 +196,22 @@
(define slurm-22.05-latest (define slurm-22.05-latest
(latest-version slurm slurm-22.05-upstream)) (latest-version slurm slurm-22.05-upstream))
(define-public slurm-22.05-glicid (define-public slurm-22.05-glicid-std
(package (package
(inherit slurm-22.05-latest) (inherit slurm-22.05-latest)
(name "slurm-glicid") (name "slurm-glicid-noucx-nopmix")
(inputs (modify-inputs (package-inputs slurm-22.05-latest) (inputs (modify-inputs (package-inputs slurm-22.05-latest)
(prepend gtk+-2 openpmix-4 openpmix-3 (prepend gtk+-2 ucx openpmix-3
`(,mariadb "dev")))))) `(,mariadb "dev"))))))
(define (package-with-configure-flags p flags)
"Return P with FLAGS as addition 'configure' flags."
(package/inherit p
(arguments
(substitute-keyword-arguments (package-arguments p)
((#:configure-flags original-flags #~(list))
#~(append #$original-flags #$flags))))))
(define-public slurm-22.05-glicid
(define-public slurm-22.05-glicid-b
(package (package
(inherit slurm-22.05-glicid) (inherit slurm-22.05-glicid-std)
(version "22.05.9.b") (version "22.05.9")
(name "slurm-glicid")
(arguments (arguments
(list #:configure-flags (list #:configure-flags
#~(list "--enable-pam" "--sysconfdir=/etc/slurm" #~(list "--enable-pam" "--sysconfdir=/etc/slurm"
@ -226,8 +221,10 @@
(ungexp (this-package-input "hwloc") "lib")) (ungexp (this-package-input "hwloc") "lib"))
(string-append "--with-json=" #$(this-package-input "json-c")) (string-append "--with-json=" #$(this-package-input "json-c"))
(string-append "--with-munge=" #$(this-package-input "munge")) (string-append "--with-munge=" #$(this-package-input "munge"))
(string-append "--with-pmix=" #$(this-package-input openpmix-3)) ; (string-append "--with-pmix=" #$(this-package-input "openpmix-3") ":" #$(this-package-input "openpmix-4") )
(string-append "--with-pmix=" #$(this-package-input "openpmix-3"))
(string-append "--with-ucx=" #$(this-package-input "ucx"))
; (string-append "--with-pmix=" #$(this-package-input "openpmix-4"))
;; 32-bit support is marked as deprecated and needs to be ;; 32-bit support is marked as deprecated and needs to be
;; explicitly enabled. ;; explicitly enabled.
#$@(if (target-64bit?) '() '("--enable-deprecated"))) #$@(if (target-64bit?) '() '("--enable-deprecated")))
@ -294,7 +291,7 @@
(define-public slurm-glicid (define-public slurm-glicid
slurm-22.05-glicid) slurm-22.05-glicid)
(define-public slurm-ccipl (define-public slurm-ccipl
slurm-21.08-glicid) slurm-22.05-glicid)
(define-public slurm-glicid-preprod (define-public slurm-glicid-preprod
slurm-22.05-glicid) slurm-22.05-glicid)
(define-public slurm-glicid-test (define-public slurm-glicid-test