From 748d335a394ec87f62f85256ac63d6777ebeefca Mon Sep 17 00:00:00 2001
From: Pedro Martinez <pedro.martinez-ferrer@bsc.es>
Date: Mon, 7 Dec 2020 15:36:49 +0100
Subject: [PATCH] Define variables 'ntasksPerNode' and 'cpusPerTask' for each
 experiment and other minor changes

---
 garlic/exp/creams/ss+hybrid.nix | 14 +++++++-------
 garlic/exp/creams/ss+pure.nix   | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/garlic/exp/creams/ss+hybrid.nix b/garlic/exp/creams/ss+hybrid.nix
index 226f7a0..5d4026d 100644
--- a/garlic/exp/creams/ss+hybrid.nix
+++ b/garlic/exp/creams/ss+hybrid.nix
@@ -12,17 +12,17 @@ let
   # Initial variable configuration
   varConf = {
     input = [
-      { nodes=1 ; nprocz=2 ; granul=37; time= "10:00:00"; }
-      { nodes=2 ; nprocz=4 ; granul=19; time= "05:00:00"; }
-      { nodes=4 ; nprocz=8 ; granul=10; time= "03:00:00"; }
+      { nodes=1 ; nprocz=2 ; granul=37; time= "02:00:00"; }
+      { nodes=2 ; nprocz=4 ; granul=19; time= "02:00:00"; }
+      { nodes=4 ; nprocz=8 ; granul=10; time= "02:00:00"; }
       { nodes=8 ; nprocz=16; granul=9 ; time= "02:00:00"; }
-      { nodes=16; nprocz=32; granul=9 ; time= "01:00:00"; }
+      { nodes=16; nprocz=32; granul=9 ; time= "02:00:00"; }
     ];
 
     gitBranch = [
-      "garlic/mpi+isend+oss+task"
       "garlic/mpi+send+omp+fork"
       "garlic/mpi+send+oss+task"
+      "garlic/mpi+isend+oss+task"
       "garlic/tampi+isend+oss+task"
     ];
   };
@@ -44,9 +44,9 @@ let
 
     # Resources
     qos = "debug";
-    ntasksPerNode = hw.socketsPerNode;
+    ntasksPerNode =  2;
+    cpusPerTask   = 24;
     inherit (c.input) time nodes;
-    cpusPerTask = hw.cpusPerSocket;
     jobName = unitName;
   };
 
diff --git a/garlic/exp/creams/ss+pure.nix b/garlic/exp/creams/ss+pure.nix
index c1de84c..eec78b7 100644
--- a/garlic/exp/creams/ss+pure.nix
+++ b/garlic/exp/creams/ss+pure.nix
@@ -12,11 +12,11 @@ let
   # Initial variable configuration
   varConf = {
     input = [
-      { time="10:00:00"; nodes=1;  }
-      { time="05:00:00"; nodes=2;  }
-      { time="03:00:00"; nodes=4;  }
+      { time="02:00:00"; nodes=1;  }
+      { time="02:00:00"; nodes=2;  }
+      { time="02:00:00"; nodes=4;  }
       { time="02:00:00"; nodes=8;  }
-      { time="01:00:00"; nodes=16; }
+      { time="02:00:00"; nodes=16; }
     ];
   };
 
@@ -37,9 +37,9 @@ let
 
     # Resources
     qos = "debug";
-    ntasksPerNode = hw.cpusPerNode;
+    ntasksPerNode = 48;
+    cpusPerTask   =  1;
     inherit (c.input) time nodes;
-    cpusPerTask = 1;
     jobName = unitName;
   };