From 4b25a5d8127710c13cb0c34ffb1af8c11da8d492 Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann.dupont@univ-nantes.fr>
Date: Tue, 22 Sep 2020 15:14:18 +0200
Subject: [PATCH] include specific libfabric

---
 gnu/packages/glicid.scm | 64 +++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm
index 469536c..9d58136 100644
--- a/gnu/packages/glicid.scm
+++ b/gnu/packages/glicid.scm
@@ -294,27 +294,6 @@
   )
 )
 
-(define-public glicid-specific-ucx-gcc-10
- (package
-  (inherit ucx)
-  (name "glicid-ucx-gcc-10")
-  (version "1.9.0")
-  (source 
-   (origin
-    (method url-fetch)
-    (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" ))
-    (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7"))
-   ))
-
-  (inputs `(("gcc-10", gcc-10)
-            ("gfortran-10", gfortran-10)
-            ("glicid-libfabric-gcc-10", glicid-libfabric-gcc-10)
-	    ("glicid-specific-rdma-core",glicid-specific-rdma-core)
-
-                  ,@(package-inputs ucx)))
-  )
-)
-
 (define-public glicid-openmpi-gcc-10
  (package
   (inherit openmpi)
@@ -406,6 +385,7 @@
 	))
 ))
 
+
 (define-public glicid-specific-rdma-core-gcc-10
   (package
     (inherit rdma-core)
@@ -427,12 +407,54 @@
  )
 )
 
+(define-public glicid-specific-libfabric-gcc-10
+(package
+    (inherit libfabric)
+    (name "glicid-specific-libfabric-gcc-10")
+    (version "1.11.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://github.com/ofiwg/libfabric/releases/download/v"
+                       version "/libfabric-" version ".tar.bz2"))
+       (sha256
+        (base32 "13ymh0y3fsifvfv7hd3kqvdw1ywrsii4njm9c37qvsp753vanf4r"))))
+
+    (inputs `(("gcc-10", gcc-10)
+      ,@(package-inputs libfabric)))
+ )
+)
+
+(define-public glicid-specific-ucx-gcc-10
+ (package
+  (inherit ucx)
+  (name "glicid-ucx-gcc-10")
+  (version "1.9.0")
+  (source 
+   (origin
+    (method url-fetch)
+    (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" ))
+    (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7"))
+   ))
+
+  (inputs `(("gcc-10", gcc-10)
+            ("gfortran-10", gfortran-10)
+            ("glicid-specific-libfabric-gcc-10", glicid-specific-libfabric-gcc-10)
+	    ("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10)
+
+                  ,@(package-inputs ucx)))
+  )
+)
+
+
 (define-public glicid-specific-openmpi-gcc-10
   (package
     (inherit glicid-openmpi-gcc-10)
     (name "glicid-specific-openmpi-gcc-10")
       (inputs `(("glicid-specific-rdma-core-gcc-10",glicid-specific-rdma-core-gcc-10)
        ("glicid-specific-ucx-gcc-10",glicid-specific-ucx-gcc-10)
+       ("glicid-specific-fabric-gcc-10",glicid-specific-fabric-gcc-10)
       ,@(package-inputs glicid-openmpi-gcc-10)))
   )
 )