From fe0bd8b20011b6f3ff93e01e563508a32d158dd8 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Tue, 17 Nov 2020 12:31:03 +0100
Subject: [PATCH] creams: fix pure experiment

Use machine agnostic specification for resources
---
 garlic/exp/creams/ss+hybrid.nix | 2 +-
 garlic/exp/creams/ss+pure.nix   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/garlic/exp/creams/ss+hybrid.nix b/garlic/exp/creams/ss+hybrid.nix
index 5414837..226f7a0 100644
--- a/garlic/exp/creams/ss+hybrid.nix
+++ b/garlic/exp/creams/ss+hybrid.nix
@@ -37,7 +37,7 @@ let
     mpi = impi;
     inherit (c.input) granul;
     inherit (c) gitBranch;
-    nprocz = hw.socketsPerNode * nodes;
+    nprocz = ntasksPerNode * nodes;
 
     # Repeat the execution of each unit 30 times
     loops = 30;
diff --git a/garlic/exp/creams/ss+pure.nix b/garlic/exp/creams/ss+pure.nix
index 1acaec1..c1de84c 100644
--- a/garlic/exp/creams/ss+pure.nix
+++ b/garlic/exp/creams/ss+pure.nix
@@ -30,16 +30,16 @@ let
     mpi = impi;
     granul = 0;
     gitBranch = "garlic/mpi+send+seq";
-    nprocz = 48 * nodes;
+    nprocz = ntasksPerNode * nodes;
 
     # Repeat the execution of each unit 30 times
     loops = 30;
 
     # Resources
     qos = "debug";
-    ntasksPerNode = 48;
+    ntasksPerNode = hw.cpusPerNode;
     inherit (c.input) time nodes;
-    cpusPerTask = hw.cpusPerSocket;
+    cpusPerTask = 1;
     jobName = unitName;
   };