Update experiments with cpusPerTask

Try to avoid manually setting the hardware specs and rather use
the hw attrset.

garlic/exp/hpcg/gen.nix

@@ -18,6 +18,7 @@ let
     expName = "${c.expName}.gen";
     unitName = "${expName}.n${toString n.x}";
 
+    inherit (targetMachine.config) hw;
     # hpcg options
     cc = bsc.icc;
     mcxx = bsc.mcxx;
@@ -36,7 +37,7 @@ let
     nodes = 1;
     time = "02:00:00";
     # task in one socket
-    cpuBind = "verbose,mask_cpu:0xffffff";
+    cpusPerTask = hw.cpusPerSocket;
     jobName = unitName;
   };
 
@@ -74,7 +75,7 @@ let
     inputTre = genExp configs;
     #inputExp = getExperimentStage inputTrebuchet;
     #inputExp = trace inputTrebuchet inputTrebuchet.nextStage;
-    inputExp = trace (inputTre.name) (getExperimentStage inputTre);
+    inputExp = getExperimentStage inputTre;
     # Then load the result. This is only used to ensure that we have the
     # results, so it has been executed.
     inputRes = resultFromTrebuchet inputTre;

garlic/exp/hpcg/oss.nix

@@ -24,6 +24,7 @@ let
     expName = "hpcg.oss";
     unitName = "${expName}.nb${toString nblocks}";
 
+    inherit (targetMachine.config) hw;
     # hpcg options
     n = c.n;
     nblocks = c.nblocks;
@@ -42,7 +43,7 @@ let
     nodes = 1;
     time = "02:00:00";
     # task in one socket
-    cpuBind = "verbose,mask_cpu:0xffffff";
+    cpusPerTask = hw.cpusPerSocket;
     jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}";
   };