From c1b64e88974bc510e316671237d4b458dce61464 Mon Sep 17 00:00:00 2001
From: sandra <smacia@bsc.es>
Date: Wed, 23 Sep 2020 13:13:51 +0200
Subject: [PATCH] saiph: if extrae add some env var

---
 garlic/exp/saiph/numcomm.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/garlic/exp/saiph/numcomm.nix b/garlic/exp/saiph/numcomm.nix
index de853ac..15709f6 100644
--- a/garlic/exp/saiph/numcomm.nix
+++ b/garlic/exp/saiph/numcomm.nix
@@ -115,6 +115,18 @@ let
   # have to get the definition of the bsc packages and the garlic ones as
   # overlays.
 
+  argv = {stage, conf, ...}: with conf; w.argv {
+    program = stageProgram stage;
+    env = ''
+      export NANOS6_REPORT_PREFIX="#"
+      export I_MPI_THREAD_SPLIT=1
+    ''
+    + optionalString enableExtrae
+    ''export NANOS6=extrae
+      export NANOS6_EXTRAE_AS_THREADS=0
+    '';
+  };
+
   saiphFn = {stage, conf, ...}: with conf;
     let
       # We set the mpi implementation to the one specified in the conf, so all
@@ -153,7 +165,7 @@ let
     ++ optional enablePerf perf
 
     # Execute the saiph example app
-    ++ [ saiphFn ];
+    ++ [ argv saiphFn ];
 
   # List of actual programs to be executed
   jobs = map (conf: w.stagen { inherit conf stages; }) configs;