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 
typos and missing ()

See merge request glicid-public/guix-glicid!452
This commit is contained in:
Yann Dupont 2025-01-10 11:43:32 +00:00
commit a444bbac84
1 changed files with 176 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

375
glicid/packages/parallel.scm
View file

@ -6,7 +6,8 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:use-module ((guix licenses)
#:prefix license:) #:prefix license:)
#:use-module ((gnu packages parallel) #:prefix gnu:) #:use-module ((gnu packages parallel)
#:prefix gnu:)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
@ -21,16 +22,18 @@
#: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
#:use-module (gnu packages web) ; json-c, http-parser for slurm REST API #:use-module (gnu packages web) ;json-c, http-parser for slurm REST API
#:use-module (gnu packages serialization) ; libyaml for slurm REST API #:use-module (gnu packages serialization) ;libyaml for slurm REST API
#:use-module ((guix utils) #:select (target-64bit?)) #:use-module ((guix utils)
#:select (target-64bit?))
) )
(define-public openpmix-3.1.5
(define-public openpmix-3.2.5
(package (package
(name "openpmix-3") (name "openpmix-3")
(version "3.1.5") (version "3.2.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -38,7 +41,7 @@
version "/pmix-" version ".tar.bz2")) version "/pmix-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1xswdkfcrw123ghcr9gmrb852nzjbl4i6qwrid3xyma42yal34w8")))) "13cc11wxf00w485h6pxjcpwziihaix1pj9rrd20cis1i4bi2hrfv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list (string-append "--with-hwloc=" `(#:configure-flags (list (string-append "--with-hwloc="
@ -50,89 +53,27 @@
(inputs (list libevent (inputs (list libevent
`(,hwloc-2 "lib") perl)))) `(,hwloc-2 "lib") perl))))
(define-public openpmix-3.2.4
(package
(inherit openpmix-3.1.5)
(version "3.2.4")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/openpmix/openpmix/releases/download/v"
version "/pmix-" version "-2.tar.bz2")) ;; note -2 !!
(sha256
(base32
"0hnqx2f72g2n5fnib5dv1qwfp2vjp00lbj1k9zlylpq5bbb3ykp5"))))
))
(define-public openpmix-3.2.5
(package
(inherit openpmix-3.1.5)
(version "3.2.5")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/openpmix/openpmix/releases/download/v"
version "/pmix-" version ".tar.bz2")) ;;
(sha256
(base32
"13cc11wxf00w485h6pxjcpwziihaix1pj9rrd20cis1i4bi2hrfv"))))
))
(define-public openpmix-4.1.0
(package
(inherit openpmix-3.1.5)
(name "openpmix-4")
(version "4.1.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/openpmix/openpmix/releases/download/v"
version "/pmix-" version ".tar.bz2"))
(sha256
(base32
"0bl4gkh87csm3yh418wvrih35mg6swavcxj78gyb7gr1qsk0apql"))))
(inputs (modify-inputs (package-inputs openpmix-3.1.5)
(prepend python zlib pandoc)))))
(define-public openpmix-4.2.4
(package
(inherit openpmix-4.1.0)
(version "4.2.4")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/openpmix/openpmix/releases/download/v"
version "/pmix-" version ".tar.bz2"))
(sha256
(base32
"1j11n1j1g6dq49jxcy44s48jvncwvarb8wmcpmw3m397y91rasf4"))))))
(define-public openpmix-3 (define-public openpmix-3
openpmix-3.2.5) openpmix-3.2.5)
(define-public openpmix-4
openpmix-4.2.4)
(define-public openpmix ;(define-public openpmix
openpmix-3) ; compat with nautilus… ; openpmix-3)
; compat with nautilus…
(define-public slurm-upstream-22.05 (define-public slurm-upstream-22.05
(package (package
(inherit gnu:slurm) (inherit gnu:slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "22.05.11") (version "22.05.11")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://download.schedmd.com/slurm/slurm-" (method url-fetch)
version ".tar.bz2")) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version
(sha256 ".tar.bz2"))
(base32 (sha256
"19kqj06f39kad21wp9b9j82x3zm2w2h8mcjr2zvs1q1rzjmhr1nb")))))) (base32 "19kqj06f39kad21wp9b9j82x3zm2w2h8mcjr2zvs1q1rzjmhr1nb"))))))
(define slurm-22.05-latest (define slurm-22.05-latest
(latest-version gnu:slurm-22.05 slurm-upstream-22.05)) (latest-version gnu:slurm-22.05 slurm-upstream-22.05))
@ -142,67 +83,67 @@
(inherit gnu:slurm) (inherit gnu:slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "23.02.8") (version "23.02.8")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://download.schedmd.com/slurm/slurm-" (method url-fetch)
version ".tar.bz2")) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version
(sha256 ".tar.bz2"))
(base32 (sha256
"0vh0lbqp315cgcm2wpfg8j718d84lfqr474rfzk46ail5pk0d9vl")))))) (base32 "0vh0lbqp315cgcm2wpfg8j718d84lfqr474rfzk46ail5pk0d9vl"))))))
(define-public slurm-upstream-23.11 (define-public slurm-upstream-23.11
(package (package
(inherit gnu:slurm) (inherit gnu:slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "23.11.10") (version "23.11.10")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://download.schedmd.com/slurm/slurm-" (method url-fetch)
version ".tar.bz2")) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version
(sha256 ".tar.bz2"))
(base32 (sha256
"0gf7x85bzpkrx87mb16wyiyvkjxqq01sbajsjxwrspyi2v675hgr")))))) (base32 "0gf7x85bzpkrx87mb16wyiyvkjxqq01sbajsjxwrspyi2v675hgr"))))))
(define-public slurm-upstream-24.05 (define-public slurm-upstream-24.05
(package (package
(inherit gnu:slurm) (inherit gnu:slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "24.05.5") (version "24.05.5")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://download.schedmd.com/slurm/slurm-" (method url-fetch)
version ".tar.bz2")) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version
(sha256 ".tar.bz2"))
(base32 (sha256
"0vxiymp40lgcb1z76cyqdpqpy7w14r483v54dk4aq84v0aw0mixl")))))) (base32 "0vxiymp40lgcb1z76cyqdpqpy7w14r483v54dk4aq84v0aw0mixl"))))))
(define-public slurm-upstream-24.11 (define-public slurm-upstream-24.11
(package (package
(inherit gnu:slurm) (inherit gnu:slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "24.11.0") (version "24.11.0")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://download.schedmd.com/slurm/slurm-" (method url-fetch)
version ".tar.bz2")) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version
(sha256 ".tar.bz2"))
(base32 (sha256
"0mlhqsyn3sc59wjg47wk20aw9rxz379rnqpjny8f0x6qnppfxsrr")))))) (base32 "0mlhqsyn3sc59wjg47wk20aw9rxz379rnqpjny8f0x6qnppfxsrr"))))))
(define-public slurm-22.05-glicid-std (define-public slurm-22.05-glicid-std
(package (package
(inherit slurm-22.05-latest) (inherit slurm-22.05-latest)
(name "slurm-glicid-noucx-nopmix") (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 ; for sview (prepend gtk+-2 ;for sview
ucx openpmix-3 ; for pmix support ucx
json-c libjwt libyaml http-parser ; for REST API openpmix-3 ;for pmix support
`(,mariadb "dev")))))) ; for mariadb/mysql client support json-c
libjwt
libyaml
http-parser ;for REST API
`(,mariadb "dev"))))))
; for mariadb/mysql client support
(define-public slurm-22.05-glicid (define-public slurm-22.05-glicid
(package (package
@ -210,43 +151,55 @@
(version "22.05.11") (version "22.05.11")
(name "slurm-glicid") (name "slurm-glicid")
(arguments (arguments
(list #:configure-flags (list
#~(list "--enable-pam" "--sysconfdir=/etc/slurm" #:configure-flags #~(list "--enable-pam"
"--disable-static" "--sysconfdir=/etc/slurm"
(string-append "--with-freeipmi=" #$(this-package-input "freeipmi")) "--disable-static"
(string-append "--with-hwloc=" (string-append "--with-freeipmi="
(ungexp (this-package-input "hwloc") "lib")) #$(this-package-input
(string-append "--with-json=" #$(this-package-input "json-c")) "freeipmi"))
(string-append "--with-munge=" #$(this-package-input "munge")) (string-append "--with-hwloc="
; (string-append "--with-pmix=" #$(this-package-input "openpmix-3") ":" #$(this-package-input "openpmix-4") ) (ungexp (this-package-input
(string-append "--with-pmix=" #$(this-package-input "openpmix-3")) "hwloc") "lib"))
(string-append "--with-yaml=" #$(this-package-input "libyaml")) (string-append "--with-json="
(string-append "--with-jwt=" #$(this-package-input "libjwt")) #$(this-package-input "json-c"))
(string-append "--with-http-parser=" #$(this-package-input "http-parser")) (string-append "--with-munge="
(string-append "--with-ucx=" #$(this-package-input "ucx")) #$(this-package-input "munge"))
; (string-append "--with-pmix=" #$(this-package-input "openpmix-4")) ;; (string-append "--with-pmix=" #$(this-package-input "openpmix-3") ":" #$(this-package-input "openpmix-4") )
;; 32-bit support is marked as deprecated and needs to be (string-append "--with-pmix="
;; explicitly enabled. #$(this-package-input
#$@(if (target-64bit?) '() '("--enable-deprecated"))) "openpmix-3"))
#:phases (string-append "--with-yaml="
#~(modify-phases %standard-phases #$(this-package-input "libyaml"))
(add-after 'unpack 'patch-plugin-linker-flags (string-append "--with-jwt="
(lambda _ #$(this-package-input "libjwt"))
(substitute* (find-files "src/plugins/" "Makefile.in") (string-append "--with-http-parser="
(("_la_LDFLAGS = ") #$(this-package-input
"_la_LDFLAGS = ../../../api/libslurm.la ")))) "http-parser"))
(add-after 'patch-plugin-linker-flags 'autoconf (string-append "--with-ucx="
(lambda _ (invoke "autoconf"))) ;configure.ac was patched #$(this-package-input "ucx"))
(add-after 'install 'install-libpmi ;; (string-append "--with-pmix=" #$(this-package-input "openpmix-4"))
(lambda _ ;; 32-bit support is marked as deprecated and needs to be
;; Open MPI expects libpmi to be provided by Slurm so install it. ;; explicitly enabled.
(invoke "make" "install" "-C" "contribs/pmi") #$@(if (target-64bit?)
'()
;; Others expect pmi2. '("--enable-deprecated")))
(invoke "make" "install" "-C" "contribs/pmi2")))))) #:phases #~(modify-phases %standard-phases
) (add-after 'unpack 'patch-plugin-linker-flags
) (lambda _
(substitute* (find-files "src/plugins/" "Makefile.in")
(("_la_LDFLAGS = ")
"_la_LDFLAGS = ../../../api/libslurm.la "))))
(add-after 'patch-plugin-linker-flags 'autoconf
(lambda _
(invoke "autoconf"))) ;configure.ac was patched
(add-after 'install 'install-libpmi
(lambda _
;; Open MPI expects libpmi to be provided by Slurm so install it.
(invoke "make" "install" "-C" "contribs/pmi")
;; Others expect pmi2.
(invoke "make" "install" "-C" "contribs/pmi2"))))))))
(define slurm-23.02-latest (define slurm-23.02-latest
(latest-version gnu:slurm slurm-upstream-23.02)) (latest-version gnu:slurm slurm-upstream-23.02))
@ -263,56 +216,80 @@
lua lua
lz4))))) lz4)))))
(define (make-slurm-glicid base-package) (define (make-slurm-glicid base-package)
(package (package
(inherit base-package) (inherit base-package)
(name "slurm-glicid") (name "slurm-glicid")
(arguments (arguments
(list #:configure-flags (list
#~(list "--enable-pam" "--sysconfdir=/etc/slurm" #:configure-flags #~(list "--enable-pam"
"--disable-static" "--sysconfdir=/etc/slurm"
(string-append "--with-freeipmi=" #$(this-package-input "freeipmi")) "--disable-static"
(string-append "--with-hwloc=" (string-append "--with-freeipmi="
(ungexp (this-package-input "hwloc") "lib")) #$(this-package-input
(string-append "--with-json=" #$(this-package-input "json-c")) "freeipmi"))
(string-append "--with-munge=" #$(this-package-input "munge")) (string-append "--with-hwloc="
; (string-append "--with-pmix=" #$(this-package-input "openpmix-3") ":" #$(this-package-input "openpmix-4") ) (ungexp (this-package-input
; (string-append "--with-pmix=" #$(this-package-input "openpmix-3")) "hwloc") "lib"))
(string-append "--with-yaml=" #$(this-package-input "libyaml")) (string-append "--with-json="
(string-append "--with-jwt=" #$(this-package-input "libjwt")) #$(this-package-input "json-c"))
(string-append "--with-http-parser=" #$(this-package-input "http-parser")) (string-append "--with-munge="
(string-append "--with-ucx=" #$(this-package-input "ucx")) #$(this-package-input "munge"))
(string-append "--with-pmix=" #$(this-package-input "openpmix-4")) ;; (string-append "--with-pmix=" #$(this-package-input "openpmix-3") ":" #$(this-package-input "openpmix-4") )
;; 32-bit support is marked as deprecated and needs to be ;; (string-append "--with-pmix=" #$(this-package-input "openpmix-3"))
;; explicitly enabled. (string-append "--with-yaml="
#$@(if (target-64bit?) '() '("--enable-deprecated"))) #$(this-package-input "libyaml"))
#:phases (string-append "--with-jwt="
#~(modify-phases %standard-phases #$(this-package-input "libjwt"))
(add-after 'unpack 'patch-plugin-linker-flags (string-append "--with-http-parser="
(lambda _ #$(this-package-input
(substitute* (find-files "src/plugins/" "Makefile.in") "http-parser"))
(("_la_LDFLAGS = ") (string-append "--with-ucx="
"_la_LDFLAGS = ../../../api/libslurm.la ")))) #$(this-package-input "ucx"))
(add-after 'patch-plugin-linker-flags 'autoconf (string-append "--with-pmix="
(lambda _ (invoke "autoconf"))) ;configure.ac was patched #$(this-package-input
(add-after 'install 'install-libpmi "openpmix-4"))
(lambda _ ;; 32-bit support is marked as deprecated and needs to be
;; Open MPI expects libpmi to be provided by Slurm so install it. ;; explicitly enabled.
(invoke "make" "install" "-C" "contribs/pmi") #$@(if (target-64bit?)
'()
'("--enable-deprecated")))
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-plugin-linker-flags
(lambda _
(substitute* (find-files "src/plugins/" "Makefile.in")
(("_la_LDFLAGS = ")
"_la_LDFLAGS = ../../../api/libslurm.la "))))
(add-after 'patch-plugin-linker-flags 'autoconf
(lambda _
(invoke "autoconf"))) ;configure.ac was patched
(add-after 'install 'install-libpmi
(lambda _
;; Open MPI expects libpmi to be provided by Slurm so install it.
(invoke "make" "install" "-C" "contribs/pmi")
;; Others expect pmi2. ;; Others expect pmi2.
(invoke "make" "install" "-C" "contribs/pmi2")))))) (invoke "make" "install" "-C" "contribs/pmi2"))))))
) (inputs (modify-inputs (package-inputs base-package)
) (prepend gtk+-2 ;for sview
ucx ;for pmix support
json-c
libjwt
libyaml
http-parser ;for REST API
`(,mariadb "dev")))))) ; for mariadb/mysql client support
(define-public slurm-glicid slurm-22.05-glicid) (define-public slurm-glicid
(define-public slurm-ccipl slurm-22.05-glicid) slurm-22.05-glicid)
(define-public slurm-glicid-preprod slurm-22.05-glicid) (define-public slurm-ccipl
(define-public slurm-glicid-test slurm-23.02-glicid) slurm-22.05-glicid)
(define-public slurm-glicid-preprod
slurm-22.05-glicid)
(define-public slurm-glicid-test
slurm-23.02-glicid)
(define-public slurm-glicid-23.11
(define-public slurm-glicid-23.11 (make-slurm-glicid slurm-upstream-23.11)) (make-slurm-glicid slurm-upstream-23.11))
(define-public slurm-glicid-24.11 (make-slurm-glicid slurm-upstream-24.11)) (define-public slurm-glicid-24.11
(make-slurm-glicid slurm-upstream-24.11))