From 4ea76562d7acdfa2f080f5ef1eb88d3b5c8526e7 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 22 Mar 2022 23:52:46 +0100 Subject: [PATCH] tests --- glicid/packages/fabric-management.scm | 27 ++++++++++++--------------- glicid/packages/mpi.scm | 6 +++--- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm index c826118..21448c9 100644 --- a/glicid/packages/fabric-management.scm +++ b/glicid/packages/fabric-management.scm @@ -21,21 +21,6 @@ ) ) -(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) @@ -51,5 +36,17 @@ ) ) + (define local-ucx ucx-upstream-1.12.0) (define-public ucx-latest (latest-version local-ucx gnu:ucx)) + + + +(define-public ucx-latest-glicid + (transform-package + ( + (instead-of "rdma-core" rdma-core-latest) + ucx-latest + ) "glicid" + ) +) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index f8472ea..ed38a5e 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -63,7 +63,7 @@ (define-public openmpi-glicid-ucx (transform-package ( - (instead-of "ucx" ucx-latest) openmpi-glicid + (instead-of "ucx" ucx-latest-glicid) openmpi-glicid ) "ucx" ) ) @@ -80,7 +80,7 @@ (define-public openmpi-glicid-libfabric-ucx (transform-package ( - (instead-of "ucx" ucx-latest) + (instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric ) "ucx" ) @@ -89,7 +89,7 @@ (define-public openmpi-glicid-libfabric-rdma-ucx (transform-package ( - (instead-of "ucx" ucx-latest) + (instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric-rdma ) "ucx" )