From 2992349804fbef69b1e27b9a7bbed6bb09da0a2f Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Tue, 28 Jan 2025 18:42:16 +0100 Subject: [PATCH] lots of old packages cleaned --- glicid/packages/fabric-management.scm | 112 +------------ glicid/packages/linux.scm | 218 +------------------------- glicid/packages/mpi.scm | 97 +----------- glicid/packages/parallel.scm | 174 ++++++++++---------- 4 files changed, 90 insertions(+), 511 deletions(-) diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm index 9e0fb52..b4ebee9 100644 --- a/glicid/packages/fabric-management.scm +++ b/glicid/packages/fabric-management.scm @@ -8,114 +8,4 @@ ) -(define-public ucx-upstream-1.11.2 - (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")) +;; obsolete packages deleted \ No newline at end of file diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index b3d11d3..c5a6540 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -22,221 +22,5 @@ #:use-module (glicid utils)) -(define-public rdma-core-upstream-48.0 - (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")))))) +;; lots of obsolete packages deleted - -(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@")))))) -)) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index 8ed72a8..6f4e6e7 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -10,99 +10,4 @@ #:use-module (glicid packages parallel) #: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 - (package/inherit openmpi-glicid-libfabric-rdma-ucx-psm2 - (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")))) +(define-public openmpi-glicid gnu:openmpi-4) \ No newline at end of file diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm index 5f7be32..30d3a38 100644 --- a/glicid/packages/parallel.scm +++ b/glicid/packages/parallel.scm @@ -17,7 +17,7 @@ #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages databases) #: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 (gnu packages compression) ;lz4 @@ -130,91 +130,91 @@ (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")))))) +;(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 -(define-public slurm-22.05-glicid - (package - (inherit slurm-22.05-glicid-std) - (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") +;(define-public slurm-22.05-glicid +; (package +; (inherit slurm-22.05-glicid-std) +; (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")))))))) - ;; Others expect pmi2. - (invoke "make" "install" "-C" "contribs/pmi2")))))))) +;(define slurm-23.02-latest +; (latest-version gnu:slurm slurm-upstream-23.02)) -(define slurm-23.02-latest - (latest-version gnu:slurm slurm-upstream-23.02)) - -(define-public slurm-23.02-glicid - (package - (inherit slurm-23.02-latest) - (name "slurm-upstream-glicid") - (inputs (modify-inputs (package-inputs slurm-23.02-latest) - (prepend gtk+-2 - `(,mariadb "dev") - ucx-latest-glicid ;not autotested by config - podman - lua - lz4))))) +;(define-public slurm-23.02-glicid +; (package +; (inherit slurm-23.02-latest) +; (name "slurm-upstream-glicid") +; (inputs (modify-inputs (package-inputs slurm-23.02-latest) +; (prepend gtk+-2 +; `(,mariadb "dev") +; ucx-latest-glicid ;not autotested by config +; podman +; lua +; lz4))))) (define (make-slurm-glicid base-package) (package @@ -279,13 +279,13 @@ http-parser ;for REST API `(,mariadb "dev")))))) ; for mariadb/mysql client support -(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-22.05 (make-slurm-glicid slurm-upstream-22.05)) +(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 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-test slurm-glicid-24.11)