diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm index 46e5267..39f5170 100644 --- a/glicid/packages/parallel.scm +++ b/glicid/packages/parallel.scm @@ -6,7 +6,8 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #: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 libevent) #:use-module (gnu packages perl) @@ -21,16 +22,18 @@ #:use-module (glicid packages containers) ;for latest podman #:use-module (gnu packages compression) ;lz4 #:use-module (gnu packages lua) ;lua - #: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 ((guix utils) #:select (target-64bit?)) + #: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 ((guix utils) + #:select (target-64bit?)) ) -(define-public openpmix-3.1.5 + +(define-public openpmix-3.2.5 (package (name "openpmix-3") - (version "3.1.5") + (version "3.2.5") (source (origin (method url-fetch) (uri (string-append @@ -38,7 +41,7 @@ version "/pmix-" version ".tar.bz2")) (sha256 (base32 - "1xswdkfcrw123ghcr9gmrb852nzjbl4i6qwrid3xyma42yal34w8")))) + "13cc11wxf00w485h6pxjcpwziihaix1pj9rrd20cis1i4bi2hrfv")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--with-hwloc=" @@ -50,89 +53,27 @@ (inputs (list libevent `(,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 openpmix-3.2.5) -(define-public openpmix-4 - openpmix-4.2.4) -(define-public openpmix - openpmix-3) ; compat with nautilus… +;(define-public openpmix +; openpmix-3) + ; compat with nautilus… (define-public slurm-upstream-22.05 (package (inherit gnu:slurm) (name "slurm-upstream") (version "22.05.11") - (source (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" - version ".tar.bz2")) - (sha256 - (base32 - "19kqj06f39kad21wp9b9j82x3zm2w2h8mcjr2zvs1q1rzjmhr1nb")))))) + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version + ".tar.bz2")) + (sha256 + (base32 "19kqj06f39kad21wp9b9j82x3zm2w2h8mcjr2zvs1q1rzjmhr1nb")))))) (define slurm-22.05-latest (latest-version gnu:slurm-22.05 slurm-upstream-22.05)) @@ -142,67 +83,67 @@ (inherit gnu:slurm) (name "slurm-upstream") (version "23.02.8") - (source (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" - version ".tar.bz2")) - (sha256 - (base32 - "0vh0lbqp315cgcm2wpfg8j718d84lfqr474rfzk46ail5pk0d9vl")))))) - + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version + ".tar.bz2")) + (sha256 + (base32 "0vh0lbqp315cgcm2wpfg8j718d84lfqr474rfzk46ail5pk0d9vl")))))) (define-public slurm-upstream-23.11 (package (inherit gnu:slurm) (name "slurm-upstream") (version "23.11.10") - (source (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" - version ".tar.bz2")) - (sha256 - (base32 - "0gf7x85bzpkrx87mb16wyiyvkjxqq01sbajsjxwrspyi2v675hgr")))))) + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version + ".tar.bz2")) + (sha256 + (base32 "0gf7x85bzpkrx87mb16wyiyvkjxqq01sbajsjxwrspyi2v675hgr")))))) (define-public slurm-upstream-24.05 (package (inherit gnu:slurm) (name "slurm-upstream") (version "24.05.5") - (source (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" - version ".tar.bz2")) - (sha256 - (base32 - "0vxiymp40lgcb1z76cyqdpqpy7w14r483v54dk4aq84v0aw0mixl")))))) + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version + ".tar.bz2")) + (sha256 + (base32 "0vxiymp40lgcb1z76cyqdpqpy7w14r483v54dk4aq84v0aw0mixl")))))) (define-public slurm-upstream-24.11 (package (inherit gnu:slurm) (name "slurm-upstream") (version "24.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" - version ".tar.bz2")) - (sha256 - (base32 - "0mlhqsyn3sc59wjg47wk20aw9rxz379rnqpjny8f0x6qnppfxsrr")))))) - + (source + (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" version + ".tar.bz2")) + (sha256 + (base32 "0mlhqsyn3sc59wjg47wk20aw9rxz379rnqpjny8f0x6qnppfxsrr")))))) (define-public slurm-22.05-glicid-std (package (inherit slurm-22.05-latest) (name "slurm-glicid-noucx-nopmix") (inputs (modify-inputs (package-inputs slurm-22.05-latest) - (prepend gtk+-2 ; for sview - ucx openpmix-3 ; for pmix support - json-c libjwt libyaml http-parser ; for REST API - `(,mariadb "dev")))))) ; for mariadb/mysql client support - - - + (prepend gtk+-2 ;for sview + ucx + openpmix-3 ;for pmix support + json-c + libjwt + libyaml + http-parser ;for REST API + `(,mariadb "dev")))))) + ; for mariadb/mysql client support (define-public slurm-22.05-glicid (package @@ -210,43 +151,55 @@ (version "22.05.11") (name "slurm-glicid") (arguments - (list #:configure-flags - #~(list "--enable-pam" "--sysconfdir=/etc/slurm" - "--disable-static" - (string-append "--with-freeipmi=" #$(this-package-input "freeipmi")) - (string-append "--with-hwloc=" - (ungexp (this-package-input "hwloc") "lib")) - (string-append "--with-json=" #$(this-package-input "json-c")) - (string-append "--with-munge=" #$(this-package-input "munge")) -; (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-yaml=" #$(this-package-input "libyaml")) - (string-append "--with-jwt=" #$(this-package-input "libjwt")) - (string-append "--with-http-parser=" #$(this-package-input "http-parser")) - (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 - ;; explicitly enabled. - #$@(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. - (invoke "make" "install" "-C" "contribs/pmi2")))))) - ) -) + (list + #:configure-flags #~(list "--enable-pam" + "--sysconfdir=/etc/slurm" + "--disable-static" + (string-append "--with-freeipmi=" + #$(this-package-input + "freeipmi")) + (string-append "--with-hwloc=" + (ungexp (this-package-input + "hwloc") "lib")) + (string-append "--with-json=" + #$(this-package-input "json-c")) + (string-append "--with-munge=" + #$(this-package-input "munge")) + ;; (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-yaml=" + #$(this-package-input "libyaml")) + (string-append "--with-jwt=" + #$(this-package-input "libjwt")) + (string-append "--with-http-parser=" + #$(this-package-input + "http-parser")) + (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 + ;; explicitly enabled. + #$@(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. + (invoke "make" "install" "-C" "contribs/pmi2")))))))) (define slurm-23.02-latest (latest-version gnu:slurm slurm-upstream-23.02)) @@ -263,56 +216,80 @@ lua lz4))))) - (define (make-slurm-glicid base-package) - (package - (inherit base-package) - (name "slurm-glicid") + (package + (inherit base-package) + (name "slurm-glicid") (arguments - (list #:configure-flags - #~(list "--enable-pam" "--sysconfdir=/etc/slurm" - "--disable-static" - (string-append "--with-freeipmi=" #$(this-package-input "freeipmi")) - (string-append "--with-hwloc=" - (ungexp (this-package-input "hwloc") "lib")) - (string-append "--with-json=" #$(this-package-input "json-c")) - (string-append "--with-munge=" #$(this-package-input "munge")) -; (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-yaml=" #$(this-package-input "libyaml")) - (string-append "--with-jwt=" #$(this-package-input "libjwt")) - (string-append "--with-http-parser=" #$(this-package-input "http-parser")) - (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 - ;; explicitly enabled. - #$@(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") + (list + #:configure-flags #~(list "--enable-pam" + "--sysconfdir=/etc/slurm" + "--disable-static" + (string-append "--with-freeipmi=" + #$(this-package-input + "freeipmi")) + (string-append "--with-hwloc=" + (ungexp (this-package-input + "hwloc") "lib")) + (string-append "--with-json=" + #$(this-package-input "json-c")) + (string-append "--with-munge=" + #$(this-package-input "munge")) + ;; (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-yaml=" + #$(this-package-input "libyaml")) + (string-append "--with-jwt=" + #$(this-package-input "libjwt")) + (string-append "--with-http-parser=" + #$(this-package-input + "http-parser")) + (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 + ;; explicitly enabled. + #$@(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. - (invoke "make" "install" "-C" "contribs/pmi2")))))) - ) -) - + ;; Others expect 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-ccipl 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 + slurm-22.05-glicid) +(define-public slurm-ccipl + 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 (make-slurm-glicid slurm-upstream-23.11)) -(define-public slurm-glicid-24.11 (make-slurm-glicid slurm-upstream-24.11)) +(define-public slurm-glicid-23.11 + (make-slurm-glicid slurm-upstream-23.11)) +(define-public slurm-glicid-24.11 + (make-slurm-glicid slurm-upstream-24.11))