From 79801ad18d35c8f42e5b04af4f6b11a868375c67 Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann.dupont@univ-nantes.fr>
Date: Fri, 26 Nov 2021 22:03:59 +0100
Subject: [PATCH] tests mpi et reecriture packets

---
 glicid/packages/mpi.scm | 11 +++++++++--
 glicid/utils.scm        | 17 ++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm
index c34e628..82fda1d 100644
--- a/glicid/packages/mpi.scm
+++ b/glicid/packages/mpi.scm
@@ -94,6 +94,8 @@
   #:use-module (glicid packages linux)
   #:use-module (glicid packages fabric-management)
   #:use-module (glicid utils)
+  #:use-module (gnu packages parallel)
+
 
 )
 
@@ -105,9 +107,10 @@
   (version (string-append (package-version latest-openmpi) "-glicid" ))
  
  (inputs `(
-            ("ucx",ucx-latest) ;; should be latest beetween guix and glicid
+;            ("ucx",ucx-latest) ;; should be latest beetween guix and glicid
             ("rdma-core",rdma-core-latest) ;; should be latest beetween guix and glicid
-            ("libfabric",libfabric-latest)  
+            ("libfabric",libfabric-latest)
+            ("slurm",slurm-20.02)
                   ,@(package-inputs latest-openmpi)))
  )
 )
@@ -132,3 +135,7 @@
   (version (string-append (package-version openmpi-glicid-transform-gcc-10) "-gcc-10" ))
  )
 )
+
+
+
+openmpi-glicid
diff --git a/glicid/utils.scm b/glicid/utils.scm
index 339620f..10dccb0 100644
--- a/glicid/utils.scm
+++ b/glicid/utils.scm
@@ -25,9 +25,16 @@
   )
 )
 
-(define gcc10-instead-of-gcc
-  ;; This is a procedure to replace GCC by GCC10,
-  ;; recursively.
-;  (package-input-rewriting/spec `((,gcc-toolchain . ,(const gcc-toolchain-10)))))
-  (package-input-rewriting `((,gcc-toolchain . ,gcc-toolchain-10))))
+;(define gcc10-instead-of-gcc 
+;  ;; This is a procedure to replace GCC by GCC10,
+;  ;; recursively.
+;;  (package-input-rewriting/spec `((,gcc-toolchain . ,(const gcc-toolchain-10)))))
+;  (package-input-rewriting `((,gcc-toolchain . ,gcc-toolchain-10))))
 
+
+
+(define (gcc10-instead-of-gcc packagetorewrite)
+ (let ((toolchaingcc (specification->package "gcc-toolchain@10"))
+       (toolchaingfortran  (specification->package "gfortran-toolchain@10")))
+   (package-with-c-toolchain packagetorewrite `(("toolchaingcc" ,toolchaingcc)
+                                    ("toulchaingfortran",toolchaingfortran)))))