From c3ac90a52addeda371188fa5f046a72597602745 Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann.dupont@univ-nantes.fr>
Date: Fri, 17 Jun 2022 19:00:51 +0200
Subject: [PATCH 1/2] bump psm2 version

---
 glicid/packages/linux.scm | 25 +++++++++++++++++++++++++
 glicid/packages/mpi.scm   | 33 +++++++++++++++++++--------------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm
index 8cfe8b0..06fa113 100644
--- a/glicid/packages/linux.scm
+++ b/glicid/packages/linux.scm
@@ -170,6 +170,30 @@
 
 (define-public libfabric-latest (latest-version local-libfabric gnu:libfabric))
 
+(define-public psm2-upstream-11.2.228
+  (package
+    (inherit gnu:psm2)
+    (name "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 name version))
+              (sha256
+               (base32
+                "1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz"))))
+
+  )
+)
+
+(define local-psm2 psm2-upstream-11.2.228)
+
+(define-public psm2-latest (latest-version local-psm2 gnu:psm2))
+
+
+
 ;(define-public apptainer
 ;  (package
 ;    (name "apptainer")
@@ -289,3 +313,4 @@
 ;)
 ;
 ;local-libfabric
+psm2-upstream-11.2.228
\ No newline at end of file
diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm
index 820f9fe..8f23f3f 100644
--- a/glicid/packages/mpi.scm
+++ b/glicid/packages/mpi.scm
@@ -62,32 +62,37 @@
   )
 )
 
-(define-public openmpi-glicid-libfabric
+(define openmpi-glicid-libfabric
   (transform-package ((instead-of "libfabric" libfabric-latest) openmpi-glicid) "libfabric")
 )
 
-(define-public openmpi-glicid-rdma
-  (transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid) "rdma-core")
-)
+;(define-public openmpi-glicid-rdma
+;  (transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid) "rdma-core")
+;)
 
-(define-public openmpi-glicid-ucx
-  (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid) "ucx" )
-)
+;(define-public openmpi-glicid-ucx
+;  (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid) "ucx" )
+;)
 
-(define-public openmpi-glicid-libfabric-rdma
+(define openmpi-glicid-libfabric-rdma
   (transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid-libfabric) "rdma")
 )
 
-(define-public openmpi-glicid-libfabric-ucx
-  (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric) "ucx")
-)
+;(define-public openmpi-glicid-libfabric-ucx
+;  (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric) "ucx")
+;)
 
-(define-public openmpi-glicid-libfabric-rdma-ucx
+(define openmpi-glicid-libfabric-rdma-ucx
   (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric-rdma) "ucx")
 )
 
-(define-public openmpi-glicid-libfabric-rdma-ucx-ccipl
-  (transform-package ((instead-of "slurm-glicid" slurm-ccipl) openmpi-glicid-libfabric-rdma-ucx) "ccipl")
+(define openmpi-glicid-libfabric-rdma-ucx-psm2
+    (transform-package ((instead-of "psm2" ucx-latest-glicid) openmpi-glicid-libfabric-rdma-ucx) "psm2")
+)
+
+
+(define-public openmpi-glicid-waves
+  (transform-package ((instead-of "slurm-glicid" slurm-ccipl) openmpi-glicid-libfabric-rdma-ucx-psm2) "waves")
 )  
 
 

From 86f7aee72f93d55eb5c7a29b8478640a8ce5dac0 Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann.dupont@univ-nantes.fr>
Date: Fri, 17 Jun 2022 19:17:14 +0200
Subject: [PATCH 2/2] psm2 modifs

---
 glicid/packages/linux.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm
index 06fa113..e16bd68 100644
--- a/glicid/packages/linux.scm
+++ b/glicid/packages/linux.scm
@@ -173,7 +173,7 @@
 (define-public psm2-upstream-11.2.228
   (package
     (inherit gnu:psm2)
-    (name "psm2")
+    (name "psm2-upstream")
     (version "11.2.228")
     (source (origin
               (method git-fetch)