From cd37d513e8ad585273a932cab80791de0b80223f Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Tue, 22 Sep 2020 14:26:01 +0200
Subject: [PATCH] saiph: Extrae with the correct MPI

---
 garlic/exp/saiph/numcomm.nix | 27 +++++++++++++++++++--------
 garlic/stages/extrae.nix     |  2 +-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/garlic/exp/saiph/numcomm.nix b/garlic/exp/saiph/numcomm.nix
index ac17d9d..541ab0f 100644
--- a/garlic/exp/saiph/numcomm.nix
+++ b/garlic/exp/saiph/numcomm.nix
@@ -12,7 +12,7 @@ with stdenv.lib;
 let
   # Set variable configuration for the experiment
   varConfig = {
-    numComm = [ 1 2 3 4 ];
+    numComm = [ 1 ];
   };
 
   # Common configuration
@@ -27,8 +27,8 @@ let
 
     # Stage configuration
     enableSbatch = true;
-    enableControl = true;
-    enableExtrae = false;
+    enableControl = false;
+    enableExtrae = true;
     enablePerf = false;
 
     # MN4 path
@@ -76,11 +76,22 @@ let
     program = stageProgram stage;
   };
 
-  extrae = {stage, conf, ...}: w.extrae {
-    program = stageProgram stage;
-    traceLib = "mpi"; # mpi -> libtracempi.so
-    configFile = ./extrae.xml;
-  };
+  extrae = {stage, conf, ...}:
+    let
+      # We set the mpi implementation to the one specified in the conf, so all
+      # packages in bsc will use that one.
+      customPkgs = genPkgs (self: super: {
+        bsc = super.bsc // { mpi = conf.mpi; };
+      });
+
+      extrae = customPkgs.bsc.extrae;
+    in
+      w.extrae {
+        program = stageProgram stage;
+        extrae = extrae;
+        traceLib = "nanosmpi"; # mpi -> libtracempi.so
+        configFile = ./extrae.xml;
+      };
 
   bscOverlay = import ../../../overlay.nix;
 
diff --git a/garlic/stages/extrae.nix b/garlic/stages/extrae.nix
index 4c38bd3..a450ca9 100644
--- a/garlic/stages/extrae.nix
+++ b/garlic/stages/extrae.nix
@@ -1,7 +1,6 @@
 {
   stdenv
 , bash
-, extrae
 #, writeShellScriptBin
 }:
 
@@ -9,6 +8,7 @@
   program
 , configFile
 , traceLib
+, extrae
 }:
 
 #writeShellScriptBin "extraeWrapper" ''