From 7febbd46ba7278bbbe115fe879d2b8fbf397ee07 Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Fri, 13 Oct 2023 09:14:44 +0200 Subject: [PATCH] bump openmpi, libfabric, rdma-core, openucx --- glicid/packages/fabric-management.scm | 22 ++++++-- glicid/packages/linux.scm | 74 +++++++++------------------ glicid/packages/mpi.scm | 19 ++++++- 3 files changed, 59 insertions(+), 56 deletions(-) diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm index 391bb68..9e0fb52 100644 --- a/glicid/packages/fabric-management.scm +++ b/glicid/packages/fabric-management.scm @@ -92,11 +92,25 @@ (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.14.0) -(define-public ucx-latest - (latest-version local-ucx gnu:ucx)) + + + +(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) diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index 2224a00..18cf11f 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -21,6 +21,17 @@ #: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")))))) + + (define-public rdma-core-upstream-45.0 (package (inherit gnu:rdma-core) @@ -31,29 +42,23 @@ (uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) (sha256 (base32 "16k08qm08ssqnri3217y687j6v4sz7ag4frq4nj31dssyg65c4lq")))))) - -(define-public rdma-core-upstream-44.0 - (package - (inherit gnu:rdma-core) - (name (string-append (package-name gnu:rdma-core) "-upstream")) - (version "44.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 "12w5v74wz1akac09frw7qk1yd06b00239zh7bvbvqyzjc0g61mi5")))))) - -(define local-rdma-core rdma-core-upstream-45.0) +(define local-rdma-core rdma-core-upstream-48.0) (define-public rdma-core-latest (latest-version local-rdma-core gnu:rdma-core)) -(define-public rdma-core-upstream-42.1 + + +(define-public libfabric-upstream-1.19.0 (package - (inherit local-rdma-core) - (version "42.1") + (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/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) - (sha256 (base32 "02xjksnm71aak215f9262c2qbs77n4yc856ra6dlcfblciqk1cxp")))))) + (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 @@ -69,43 +74,10 @@ (prepend `(,util-linux "lib") gnu:numactl))))) -(define-public libfabric-upstream-1.17.1 - (package - (inherit gnu:libfabric) - (version "1.17.1") - (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 "0da0ckryvyws2r15mr5f7496c3pblq0sfl5dzm9lqy267zdjsdwb")))) - (inputs (modify-inputs (package-inputs gnu:libfabric) - (prepend `(,util-linux "lib") gnu:numactl))))) - - -(define-public libfabric-upstream-1.17.0 - (package - (inherit gnu:libfabric) - (version "1.17.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 "0pblwkgbnpf40is3isn47andkbm5j7dd8srx9lpwgh1nyrg0z72p")))) - (inputs (modify-inputs (package-inputs gnu:libfabric) - (prepend `(,util-linux "lib") gnu:numactl))))) - -(define local-libfabric libfabric-upstream-1.18.0) +(define local-libfabric libfabric-upstream-1.19.0) (define-public libfabric-latest (latest-version local-libfabric gnu:libfabric)) -(define-public libfabric-upstream-1.16.1 - (package - (inherit local-libfabric) - (version "1.16.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) - (sha256 (base32 "0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak")))))) (define-public psm2-upstream-11.2.230 (package diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index a3f2908..8ed72a8 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -10,6 +10,23 @@ #: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) @@ -42,7 +59,7 @@ (patches (search-patches "openmpi-mtl-priorities.patch")))))) (define local-openmpi - openmpi-upstream-4.1.5) + openmpi-upstream-4.1.6) (define-public openmpi-latest (latest-version local-openmpi gnu:openmpi))