From 5cd9894636c4eb0b472296f404cefb71ab9dc08b Mon Sep 17 00:00:00 2001
From: Pedro Martinez <pedro.martinez-ferrer@bsc.es>
Date: Tue, 23 Mar 2021 11:21:01 +0100
Subject: [PATCH] creams: redefine granularity experiments

---
 garlic/exp/creams/gran+node1.nix  | 1 -
 garlic/exp/creams/gran+node16.nix | 3 +--
 garlic/exp/creams/gran+node2.nix  | 1 -
 garlic/exp/creams/gran+node4.nix  | 3 +--
 garlic/exp/creams/gran+node8.nix  | 3 +--
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/garlic/exp/creams/gran+node1.nix b/garlic/exp/creams/gran+node1.nix
index 10be85db..beb23cf7 100644
--- a/garlic/exp/creams/gran+node1.nix
+++ b/garlic/exp/creams/gran+node1.nix
@@ -23,7 +23,6 @@ let
     ];
 
     gitBranch = [
-      "garlic/mpi+send+omp+fork"
       "garlic/mpi+send+omp+task"
       "garlic/mpi+send+oss+task"
       "garlic/mpi+isend+omp+task"
diff --git a/garlic/exp/creams/gran+node16.nix b/garlic/exp/creams/gran+node16.nix
index 5b41d6a4..54a1ff23 100644
--- a/garlic/exp/creams/gran+node16.nix
+++ b/garlic/exp/creams/gran+node16.nix
@@ -12,7 +12,6 @@ let
   # Initial variable configuration
   varConf = {
     input = [
-      { nodes=16 ; nprocz=32 ; granul=128; time= "02:00:00"; }
       { nodes=16 ; nprocz=32 ; granul=64;  time= "02:00:00"; }
       { nodes=16 ; nprocz=32 ; granul=32;  time= "02:00:00"; }
       { nodes=16 ; nprocz=32 ; granul=16;  time= "02:00:00"; }
@@ -20,10 +19,10 @@ let
       { nodes=16 ; nprocz=32 ; granul= 5;  time= "02:00:00"; }
       { nodes=16 ; nprocz=32 ; granul= 4;  time= "02:00:00"; }
       { nodes=16 ; nprocz=32 ; granul= 2;  time= "02:00:00"; }
+      { nodes=16 ; nprocz=32 ; granul= 1;  time= "02:00:00"; }
     ];
 
     gitBranch = [
-      "garlic/mpi+send+omp+fork"
       "garlic/mpi+send+omp+task"
       "garlic/mpi+send+oss+task"
       "garlic/mpi+isend+omp+task"
diff --git a/garlic/exp/creams/gran+node2.nix b/garlic/exp/creams/gran+node2.nix
index d7937e30..4e05306d 100644
--- a/garlic/exp/creams/gran+node2.nix
+++ b/garlic/exp/creams/gran+node2.nix
@@ -23,7 +23,6 @@ let
     ];
 
     gitBranch = [
-      "garlic/mpi+send+omp+fork"
       "garlic/mpi+send+omp+task"
       "garlic/mpi+send+oss+task"
       "garlic/mpi+isend+omp+task"
diff --git a/garlic/exp/creams/gran+node4.nix b/garlic/exp/creams/gran+node4.nix
index 6e0ef6a0..5fc46cad 100644
--- a/garlic/exp/creams/gran+node4.nix
+++ b/garlic/exp/creams/gran+node4.nix
@@ -12,7 +12,6 @@ let
   # Initial variable configuration
   varConf = {
     input = [
-      { nodes=4 ; nprocz=8 ; granul=128; time= "02:00:00"; }
       { nodes=4 ; nprocz=8 ; granul=64;  time= "02:00:00"; }
       { nodes=4 ; nprocz=8 ; granul=32;  time= "02:00:00"; }
       { nodes=4 ; nprocz=8 ; granul=16;  time= "02:00:00"; }
@@ -20,10 +19,10 @@ let
       { nodes=4 ; nprocz=8 ; granul= 5;  time= "02:00:00"; }
       { nodes=4 ; nprocz=4 ; granul= 4;  time= "02:00:00"; }
       { nodes=4 ; nprocz=8 ; granul= 2;  time= "02:00:00"; }
+      { nodes=4 ; nprocz=8 ; granul= 1;  time= "02:00:00"; }
     ];
 
     gitBranch = [
-      "garlic/mpi+send+omp+fork"
       "garlic/mpi+send+omp+task"
       "garlic/mpi+send+oss+task"
       "garlic/mpi+isend+omp+task"
diff --git a/garlic/exp/creams/gran+node8.nix b/garlic/exp/creams/gran+node8.nix
index 01b66fa6..c6ad00c6 100644
--- a/garlic/exp/creams/gran+node8.nix
+++ b/garlic/exp/creams/gran+node8.nix
@@ -12,7 +12,6 @@ let
   # Initial variable configuration
   varConf = {
     input = [
-      { nodes=8 ; nprocz=16 ; granul=128; time= "02:00:00"; }
       { nodes=8 ; nprocz=16 ; granul=64;  time= "02:00:00"; }
       { nodes=8 ; nprocz=16 ; granul=32;  time= "02:00:00"; }
       { nodes=8 ; nprocz=16 ; granul=16;  time= "02:00:00"; }
@@ -20,10 +19,10 @@ let
       { nodes=8 ; nprocz=16 ; granul= 5;  time= "02:00:00"; }
       { nodes=8 ; nprocz=16 ; granul= 4;  time= "02:00:00"; }
       { nodes=8 ; nprocz=16 ; granul= 2;  time= "02:00:00"; }
+      { nodes=8 ; nprocz=16 ; granul= 1;  time= "02:00:00"; }
     ];
 
     gitBranch = [
-      "garlic/mpi+send+omp+fork"
       "garlic/mpi+send+omp+task"
       "garlic/mpi+send+oss+task"
       "garlic/mpi+isend+omp+task"