From 1b703bd431e291e7b39ce1af587e91d2fd0e727f Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 9 Oct 2020 19:40:49 +0200
Subject: [PATCH] Fix saiph numcomm experiment

---
 garlic/exp/nbody/test.nix    |  4 ++--
 garlic/exp/saiph/numcomm.nix | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/garlic/exp/nbody/test.nix b/garlic/exp/nbody/test.nix
index 934aace..724328a 100644
--- a/garlic/exp/nbody/test.nix
+++ b/garlic/exp/nbody/test.nix
@@ -31,6 +31,7 @@ let
     qos = "debug";
     ntasksPerNode = 2;
     nodes = 1;
+    time = "02:00:00";
     cpuBind = "sockets,verbose";
     jobName = "nbody-bs-${toString blocksize}-${gitBranch}";
   };
@@ -53,8 +54,7 @@ let
       inherit cc blocksize mpi gitBranch;
     };
 
-    pipeline = stdexp.stdUnitPre {sbatch=mySbatch;}
-    ++ [ exec program ];
+  pipeline = stdexp.stdPipeline ++ [ exec program ];
 
 in
  
diff --git a/garlic/exp/saiph/numcomm.nix b/garlic/exp/saiph/numcomm.nix
index f75b173..47ab513 100644
--- a/garlic/exp/saiph/numcomm.nix
+++ b/garlic/exp/saiph/numcomm.nix
@@ -9,31 +9,34 @@
 with stdenv.lib;
 
 let
-  # Configurations for each unit (using the cartesian product)
-  confUnit = with bsc; {
+  # Initial variable configuration
+  varConf = with bsc; {
     numComm = [ 1 2 ];
   };
 
-  # Configuration for the complete experiment
-  confExperiment = with bsc; {
+  # Generate the complete configuration for each unit
+  genConf = with bsc; c: targetMachine.config // rec {
     # saiph options
     devMode = false;
+    inherit (c) numComm;
     mpi = impi;
     gitBranch = "garlic/tampi+isend+oss+task+simd";
 
-    # Repeat the execution of each unit 30 times
+    # Repeat the execution of each unit 100 times
     loops = 100;
 
     # Resources
+    qos = "debug";
+    time = "02:00:00";
     ntasksPerNode = 2;
     nodes = 1;
     cpuBind = "sockets,verbose";
+    jobName = "saiph-${toString numComm}-${gitBranch}";
   };
 
   # Compute the array of configurations
   configs = stdexp.buildConfigs {
-    var = confUnit;
-    fixed = targetMachine.config // confExperiment;
+    inherit varConf genConf;
   };
 
   exec = {nextStage, conf, ...}: with conf; stages.exec {
@@ -50,11 +53,11 @@ let
   let
     customPkgs = stdexp.replaceMpi conf.mpi;
   in
-  customPkgs.apps.saiph.override {
-    inherit devMode numComm mpi gitBranch;
-  };
+    customPkgs.apps.saiph.override {
+      inherit devMode numComm mpi gitBranch;
+    };
 
-  pipeline = stdexp.stdStages ++ [ exec program ];
+  pipeline = stdexp.stdPipeline ++ [ exec program ];
 
 in