GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-30 06:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' into 'main'

Browse source 
Devel

See merge request glicid-public/guix-glicid!463
This commit is contained in:
Yann Dupont 2025-01-28 17:46:05 +00:00
commit 42dcadfec4
4 changed files with 93 additions and 509 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
glicid/packages/fabric-management.scm
View file

@ -8,114 +8,4 @@
) )
(define-public ucx-upstream-1.11.2 ;; obsolete packages deleted
(package
(inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.11.2")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/openucx/ucx/releases/download/v"
version "/ucx-" version ".tar.gz"))
(sha256
(base32
"1py62vjr0hgyqsdpr04jhn918i8ccn6ghjalwpcjpz24admgisyy"))))))
(define-public ucx-upstream-1.12.0
(package
(inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.12.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/openucx/ucx/releases/download/v"
version "/ucx-" version ".tar.gz"))
(sha256
(base32
"1djxsakwjwnw21hhzsr02w6h2jd2k16bm4pah4iz6k8s5pg99sck"))))))
(define-public ucx-upstream-1.12.1
(package
(inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.12.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/openucx/ucx/releases/download/v"
version "/ucx-" version ".tar.gz"))
(sha256
(base32
"13mf30gdcqix8dyi0iwnsd5fn8b0syr03042y99s556swz44gd20"))))))
(define-public ucx-upstream-1.13.0
(package
(inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.13.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/openucx/ucx/releases/download/v"
version "/ucx-" version ".tar.gz"))
(sha256
(base32
"0gay9qsyz5ia68sakq1dakvk3sblh4fawnwzg09q2y723zr82f4a"))))))
(define-public ucx-upstream-1.13.1
(package
(inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.13.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/openucx/ucx/releases/download/v"
version "/ucx-" version ".tar.gz"))
(sha256
(base32
"0j05k71vqiry9gyi3v4a1s06w6v922klca2w31g71qq0qyb2yjic"))))))
(define-public ucx-upstream-1.14.0
(package
(inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.14.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/openucx/ucx/releases/download/v"
version "/ucx-" version ".tar.gz"))
(sha256
(base32
"1pdg51p4ir0v1dm8lx15l3y1plm3zjn9l16xvplyqpfyb4h5xncv"))))))
(define-public ucx-upstream-1.15.0
(package
(inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.15.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/openucx/ucx/releases/download/v"
version "/ucx-" version ".tar.gz"))
(sha256
(base32
"0vfsxcxcpadsji7l0vyasj5ai3ks4w64y529ja7wkhbb0y3j082b"))))))
(define local-ucx ucx-upstream-1.15.0)
(define-public ucx-latest (latest-version local-ucx gnu:ucx))
(define-public ucx-latest-rdma
(transform-package ((instead-of "rdma-core" rdma-core-latest)
ucx-latest) "rdma"))
(define-public ucx-latest-glicid
(transform-package ((instead-of "libfabric" libfabric-latest)
ucx-latest-rdma) "glicid"))

218
glicid/packages/linux.scm
View file

@ -22,221 +22,5 @@
#:use-module (glicid utils)) #:use-module (glicid utils))
(define-public rdma-core-upstream-48.0 ;; lots of obsolete packages deleted
(package
(inherit gnu:rdma-core)
(name (string-append (package-name gnu:rdma-core) "-upstream"))
(version "48.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz"))
(sha256 (base32 "0h281dw2yph8pzfsr1wblqy6pb8nd9yj1pdf5c62zwc1l9b2fa3q"))))))
(define-public rdma-core-upstream-45.0
(package
(inherit gnu:rdma-core)
(name (string-append (package-name gnu:rdma-core) "-upstream"))
(version "45.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz"))
(sha256 (base32 "16k08qm08ssqnri3217y687j6v4sz7ag4frq4nj31dssyg65c4lq"))))))
(define local-rdma-core rdma-core-upstream-48.0)
(define-public rdma-core-latest (latest-version local-rdma-core gnu:rdma-core))
(define-public libfabric-upstream-1.19.0
(package
(inherit gnu:libfabric)
(version "1.19.0")
(name (string-append (package-name gnu:libfabric) "-upstream"))
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2"))
(sha256 (base32 "17pg0fb4fa77r1bmp0xk535m8n8fadpfdg93cb280ghhx55pck7i"))))
(inputs (modify-inputs (package-inputs gnu:libfabric)
(prepend `(,util-linux "lib") gnu:numactl)))))
(define-public libfabric-upstream-1.18.0
(package
(inherit gnu:libfabric)
(version "1.18.0")
(name (string-append (package-name gnu:libfabric) "-upstream"))
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2"))
(sha256 (base32 "0hzxi8bv06armscbvnsa30wjyp8w9802p5i00la92angng3vfbwi"))))
(inputs (modify-inputs (package-inputs gnu:libfabric)
(prepend `(,util-linux "lib") gnu:numactl)))))
(define local-libfabric libfabric-upstream-1.19.0)
(define-public libfabric-latest (latest-version local-libfabric gnu:libfabric))
(define-public psm2-upstream-11.2.230
(package
(inherit gnu:psm2)
(name "psm2-upstream")
(version "11.2.230")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cornelisnetworks/opa-psm2")
(commit (string-append "PSM2_" version))))
(file-name (git-file-name name version))
(sha256 (base32 "1bm7ndhi8qzmd0plnggj2h52yb34bab4k38530nsnkmv9smwdivl"))))))
(define local-psm2 psm2-upstream-11.2.230)
(define-public psm2-latest (latest-version local-psm2 gnu:psm2))
(define-public psm2-upstream-11.2.228
(package
(inherit local-psm2)
(version "11.2.228")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cornelisnetworks/opa-psm2")
(commit (string-append "PSM2_" version))))
(file-name (git-file-name "local-psm2" version))
(sha256 (base32 "1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz"))))))
(define-public corefreq
(package
(inherit gnu:corefreq)
(name "corefreq")
(version "1.96.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cyring/CoreFreq")
(commit version)))
(file-name (git-file-name name version))
(sha256 (base32 "15wi9v7zcd62ab03zji43l33f1mc70lsdvqylv33kfpaf3k72lm4"))))))
(define-public lvm2-past-20311
(package
(name "lvm2")
(version "2.03.11")
(source (origin
(method url-fetch)
(uri (list (string-append "https://sourceware.org/ftp/lvm2/LVM2."
version ".tgz")
(string-append "ftp://sources.redhat.com/pub/lvm2/releases/LVM2."
version ".tgz")))
(sha256
(base32
"1m4xpda8vbyd89ca0w8nacvnl4j34yzsa625gn990fb5sh84ab44"))
(modules '((guix build utils)))
(snippet
'(begin
(use-modules (guix build utils))
;; Honor sysconfdir.
(substitute* "make.tmpl.in"
(("^confdir = .*$")
"confdir = @sysconfdir@\n")
(("DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@")
"DEFAULT_SYS_DIR = @sysconfdir@"))
#t))
;YD; (patches (search-patches "lvm2-static-link.patch"))
))
(build-system gnu-build-system)
(native-inputs
(list config
pkg-config procps)) ;tests use 'pgrep'
(inputs
`(("libaio" ,libaio)
("udev" ,eudev)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'update-config
(lambda* (#:key inputs native-inputs #:allow-other-keys)
(install-file (search-input-file
(or native-inputs inputs) "/bin/config.sub")
"autoconf")
(install-file (search-input-file
(or native-inputs inputs) "/bin/config.guess")
"autoconf")))
(add-after 'configure 'set-makefile-shell
(lambda _
;; Use 'sh', not 'bash', so that '. lib/utils.sh' works as
;; expected.
(setenv "SHELL" (which "sh"))
;; Replace /bin/sh with the right file name.
(patch-makefile-SHELL "make.tmpl")
#t)))
#:configure-flags (list (string-append "--sysconfdir="
(assoc-ref %outputs "out")
"/etc/lvm")
"--enable-udev_sync"
"--enable-udev_rules"
"--enable-pkgconfig"
"--enable-cmdlib"
"--enable-dmeventd" ; Requires '--enable-cmdlib'.
;; Make sure programs such as 'dmsetup' can
;; find libdevmapper.so.
(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out")
"/lib,-rpath="
(assoc-ref %outputs "out")
"/lib/device-mapper")
;; This is needed when cross-compiling.
,@(if (%current-target-system)
'("ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes")
'()))
;; The tests use 'mknod', which requires root access.
#:tests? #f))
(supported-systems (delete "i586-gnu" %supported-systems))
(home-page "https://sourceware.org/lvm2/")
(synopsis "Logical volume management for Linux")
(description
"LVM2 is the logical volume management tool set for Linux-based systems.
This package includes the user-space libraries and tools, including the device
mapper. Kernel components are part of Linux-libre.")
;; Libraries (liblvm2, libdevmapper) are LGPLv2.1.
;; Command-line tools are GPLv2.
(license (list license:gpl2 license:lgpl2.1))))
(define-public lvm2
(package
(inherit gnu:lvm2)
(version "2.03.22")
(source (origin
(method url-fetch)
(uri (list (string-append "https://sourceware.org/ftp/lvm2/LVM2."
version ".tgz")
(string-append "ftp://sources.redhat.com/pub/lvm2/releases/LVM2."
version ".tgz")))
(sha256
(base32
"0z6w6bknhwh1n3qfkb5ij6x57q3wjf28lq3l8kh7rkhsplinjnjc"))
(patches (search-patches "glicid/packages/patches/lvm2-no-systemd.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(use-modules (guix build utils))
;; Honor sysconfdir.
(substitute* "make.tmpl.in"
(("^confdir = .*$")
"confdir = @sysconfdir@\n")
(("DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@")
"DEFAULT_SYS_DIR = @sysconfdir@"))))))
))

98
glicid/packages/mpi.scm
View file

@ -10,99 +10,9 @@
#:use-module (glicid packages parallel) #:use-module (glicid packages parallel)
#:use-module (gnu packages)) #:use-module (gnu packages))
(define-public openmpi-upstream-4.1.6
(package
(inherit gnu:openmpi)
(name "openmpi-upstream")
(version "4.1.6")
(source (origin
(method url-fetch)
(uri (string-append "https://www.open-mpi.org/software/ompi/v"
(version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2"))
(sha256
(base32
"05g4245v0pdqcyjmgn50519ry5v5q8ig26iinmiynvaihm29jh7p"))
(patches (search-patches "openmpi-mtl-priorities.patch"))))))
(define-public openmpi-upstream-4.1.5
(package
(inherit gnu:openmpi)
(name "openmpi-upstream")
(version "4.1.5")
(source (origin
(method url-fetch)
(uri (string-append "https://www.open-mpi.org/software/ompi/v"
(version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2"))
(sha256
(base32
"1qyvc77diyrxmviirdwqpibgm32c4vkdlvw8g79rsf2pq9mrhh56"))
(patches (search-patches "openmpi-mtl-priorities.patch"))))))
(define-public openmpi-upstream-4.1.4
(package
(inherit gnu:openmpi)
(name "openmpi-upstream")
(version "4.1.4")
(source (origin
(method url-fetch)
(uri (string-append "https://www.open-mpi.org/software/ompi/v"
(version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2"))
(sha256
(base32
"03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj"))
(patches (search-patches "openmpi-mtl-priorities.patch"))))))
(define local-openmpi
openmpi-upstream-4.1.6)
(define-public openmpi-latest
(latest-version local-openmpi gnu:openmpi))
(define openmpi-slurm-glicid
(package
(inherit (transform-package ((instead-of "slurm" slurm-glicid)
openmpi-latest) "glicid"))))
(define openmpi-glicid-libfabric
(transform-package ((instead-of "libfabric" libfabric-latest)
openmpi-slurm-glicid) "libfabric"))
(define openmpi-glicid-libfabric-rdma
(transform-package ((instead-of "rdma-core" rdma-core-latest)
openmpi-glicid-libfabric) "rdma"))
(define openmpi-glicid-libfabric-rdma-ucx
(transform-package ((instead-of "ucx" ucx-latest-glicid)
openmpi-glicid-libfabric-rdma) "ucx"))
(define openmpi-glicid-libfabric-rdma-ucx-psm2
(transform-package ((instead-of "psm2" psm2-latest)
openmpi-glicid-libfabric-rdma-ucx) "psm2"))
(define-public openmpi-glicid (define-public openmpi-glicid
(package/inherit openmpi-glicid-libfabric-rdma-ucx-psm2
(name "openmpi-glicid") (package
) (inherit gnu:openmpi-4)
(name "openmpi-glicid")
) )
(define-public openmpi-glicid-waves
(package
(inherit (transform-package ((instead-of "slurm-glicid" slurm-ccipl)
openmpi-glicid-libfabric-rdma-ucx-psm2)
"waves"))
(name "openmpi-glicid-waves")))
(define openmpi-glicid-transform-gcc-11
(gcc11-instead-of-gcc openmpi-glicid))
(define-public openmpi-glicid-gcc-11
(package
(inherit openmpi-glicid-transform-gcc-11)
(name (string-append (package-name openmpi-glicid-transform-gcc-11)
"-gcc-11"))))

174
glicid/packages/parallel.scm
View file

@ -17,7 +17,7 @@
#:use-module (gnu packages haskell-xyz) #:use-module (gnu packages haskell-xyz)
#: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 (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
@ -130,91 +130,91 @@
(sha256 (sha256
(base32 "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 ; ucx
openpmix-3 ;for pmix support ; openpmix-3 ;for pmix support
json-c ; json-c
libjwt ; libjwt
libyaml ; libyaml
http-parser ;for REST API ; http-parser ;for REST API
`(,mariadb "dev")))))) ; `(,mariadb "dev"))))))
; for mariadb/mysql client support ; for mariadb/mysql client support
(define-public slurm-22.05-glicid ;(define-public slurm-22.05-glicid
(package ; (package
(inherit slurm-22.05-glicid-std) ; (inherit slurm-22.05-glicid-std)
(version "22.05.11") ; (version "22.05.11")
(name "slurm-glicid") ; (name "slurm-glicid")
(arguments ; (arguments
(list ; (list
#:configure-flags #~(list "--enable-pam" ; #:configure-flags #~(list "--enable-pam"
"--sysconfdir=/etc/slurm" ; "--sysconfdir=/etc/slurm"
"--disable-static" ; "--disable-static"
(string-append "--with-freeipmi=" ; (string-append "--with-freeipmi="
#$(this-package-input ; #$(this-package-input
"freeipmi")) ; "freeipmi"))
(string-append "--with-hwloc=" ; (string-append "--with-hwloc="
(ungexp (this-package-input ; (ungexp (this-package-input
"hwloc") "lib")) ; "hwloc") "lib"))
(string-append "--with-json=" ; (string-append "--with-json="
#$(this-package-input "json-c")) ; #$(this-package-input "json-c"))
(string-append "--with-munge=" ; (string-append "--with-munge="
#$(this-package-input "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") ":" #$(this-package-input "openpmix-4") )
(string-append "--with-pmix=" ; (string-append "--with-pmix="
#$(this-package-input ; #$(this-package-input
"openpmix-3")) ; "openpmix-3"))
(string-append "--with-yaml=" ; (string-append "--with-yaml="
#$(this-package-input "libyaml")) ; #$(this-package-input "libyaml"))
(string-append "--with-jwt=" ; (string-append "--with-jwt="
#$(this-package-input "libjwt")) ; #$(this-package-input "libjwt"))
(string-append "--with-http-parser=" ; (string-append "--with-http-parser="
#$(this-package-input ; #$(this-package-input
"http-parser")) ; "http-parser"))
(string-append "--with-ucx=" ; (string-append "--with-ucx="
#$(this-package-input "ucx")) ; #$(this-package-input "ucx"))
;; (string-append "--with-pmix=" #$(this-package-input "openpmix-4")) ; ;; (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?) ; #$@(if (target-64bit?)
'() ; '()
'("--enable-deprecated"))) ; '("--enable-deprecated")))
#:phases #~(modify-phases %standard-phases ; #:phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-plugin-linker-flags ; (add-after 'unpack 'patch-plugin-linker-flags
(lambda _ ; (lambda _
(substitute* (find-files "src/plugins/" "Makefile.in") ; (substitute* (find-files "src/plugins/" "Makefile.in")
(("_la_LDFLAGS = ") ; (("_la_LDFLAGS = ")
"_la_LDFLAGS = ../../../api/libslurm.la ")))) ; "_la_LDFLAGS = ../../../api/libslurm.la "))))
(add-after 'patch-plugin-linker-flags 'autoconf ; (add-after 'patch-plugin-linker-flags 'autoconf
(lambda _ ; (lambda _
(invoke "autoconf"))) ;configure.ac was patched ; (invoke "autoconf"))) ;configure.ac was patched
(add-after 'install 'install-libpmi ; (add-after 'install 'install-libpmi
(lambda _ ; (lambda _
;; Open MPI expects libpmi to be provided by Slurm so install it. ; ;; Open MPI expects libpmi to be provided by Slurm so install it.
(invoke "make" "install" "-C" "contribs/pmi") ; (invoke "make" "install" "-C" "contribs/pmi")
;
; ;; Others expect pmi2.
; (invoke "make" "install" "-C" "contribs/pmi2"))))))))
;; Others expect pmi2. ;(define slurm-23.02-latest
(invoke "make" "install" "-C" "contribs/pmi2")))))))) ; (latest-version gnu:slurm slurm-upstream-23.02))
(define slurm-23.02-latest ;(define-public slurm-23.02-glicid
(latest-version gnu:slurm slurm-upstream-23.02)) ; (package
; (inherit slurm-23.02-latest)
(define-public slurm-23.02-glicid ; (name "slurm-upstream-glicid")
(package ; (inputs (modify-inputs (package-inputs slurm-23.02-latest)
(inherit slurm-23.02-latest) ; (prepend gtk+-2
(name "slurm-upstream-glicid") ; `(,mariadb "dev")
(inputs (modify-inputs (package-inputs slurm-23.02-latest) ; ucx-latest-glicid ;not autotested by config
(prepend gtk+-2 ; podman
`(,mariadb "dev") ; lua
ucx-latest-glicid ;not autotested by config ; lz4)))))
podman
lua
lz4)))))
(define (make-slurm-glicid base-package) (define (make-slurm-glicid base-package)
(package (package
@ -279,13 +279,13 @@
http-parser ;for REST API http-parser ;for REST API
`(,mariadb "dev")))))) ; for mariadb/mysql client support `(,mariadb "dev")))))) ; for mariadb/mysql client support
(define-public slurm-glicid-23.11
(make-slurm-glicid slurm-upstream-23.11)) (define-public slurm-glicid-22.05 (make-slurm-glicid slurm-upstream-22.05))
(define-public slurm-glicid-24.11 (define-public slurm-glicid-23.11 (make-slurm-glicid slurm-upstream-23.11))
(make-slurm-glicid slurm-upstream-24.11)) (define-public slurm-glicid-24.11 (make-slurm-glicid slurm-upstream-24.11))
(define-public slurm-glicid slurm-glicid-24.11) (define-public slurm-glicid slurm-glicid-24.11)
(define-public slurm-ccipl slurm-22.05-glicid) (define-public slurm-ccipl slurm-glicid-22.05)
(define-public slurm-glicid-preprod slurm-glicid-24.11) (define-public slurm-glicid-preprod slurm-glicid-24.11)
(define-public slurm-glicid-test slurm-glicid-24.11) (define-public slurm-glicid-test slurm-glicid-24.11)