Fix non-hybrid strong scalability experiments

garlic/exp/creams/SS+nohybrid.nix

@@ -19,18 +19,18 @@ let
     mpi = [ bsc.impi ]; # [ bsc.impi bsc.openmpi-mn4 ];
 
     input = [
-      { nodes=1 ; nprocz=48 ; granul=0; }
-      { nodes=2 ; nprocz=96 ; granul=0; }
-      { nodes=4 ; nprocz=192; granul=0; }
-      { nodes=8 ; nprocz=384; granul=0; }
-      { nodes=16; nprocz=768; granul=0; }
+      { nodes=1 ; nprocz=48 ; granul=0; time= "10:00:00";  }
+      { nodes=2 ; nprocz=96 ; granul=0; time= "05:00:00";  }
+      { nodes=4 ; nprocz=192; granul=0; time= "03:00:00";  }
+      { nodes=8 ; nprocz=384; granul=0; time= "02:00:00";  }
+      { nodes=16; nprocz=768; granul=0; time= "01:00:00";  }
     ];
+
+    gitBranch = [ "garlic/mpi+send+seq" ];
   };
 
   # Common configuration
   common = {
-    gitBranch = "garlic/mpi+send+seq";
-
     # Resources
     ntasksPerNode   = 48;
     #ntasksPerSocket = 24; // Add this variable to nix
@@ -56,14 +56,13 @@ let
   w = runWrappers;
 
   sbatch = {stage, conf, ...}: with conf; w.sbatch {
+    nodes = input.nodes;
     program = stageProgram stage;
     exclusive = true;
-    time = "10:00:00";
-    ####qos = "debug";
-    jobName = "creams-ss-mpi+send+seq";
+    time = input.time;
+    #qos = "debug";
+    jobName = "creams-ss-${toString input.nodes}-${toString gitBranch}";
     inherit nixPrefix ntasksPerNode;
-
-    nodes = input.nodes;
   };
 
   control = {stage, conf, ...}: with conf; w.control {

garlic/exp/creams/test.nix~

@@ -1,169 +0,0 @@
-{
-  stdenv
-, nixpkgs
-, pkgs
-, genApp
-, genConfigs
-, runWrappers
-}:
-
-with stdenv.lib;
-
-let
-  bsc = pkgs.bsc;
-
-  # Set variable configuration for the experiment
-  varConfig = {
-    mpi = [ bsc.impi bsc.openmpi ];
-    nodes = [ 1 ];
-  };
-
-  # Common configuration
-  common = {
-    # Compile time nbody config
-    gitBranch = "garlic/mpi+send+seq";
-
-    cc = bsc.icc;
-
-    # Resources
-    ntasksPerNode = 48;
-    nodes = 1;
-
-    # Stage configuration
-    enableSbatch = true;
-    enableControl = true;
-    enableExtrae = false;
-    enablePerf = false;
-    enableCtf = false;
-
-    # MN4 path
-    nixPrefix = "/gpfs/projects/bsc15/nix";
-  };
-
-  # Compute the cartesian product of all configurations
-  configs = map (conf: conf // common) (genConfigs varConfig);
-
-  stageProgram = stage:
-    if stage ? programPath
-    then "${stage}${stage.programPath}" else "${stage}";
-
-  w = runWrappers;
-
-  sbatch = {stage, conf, ...}: with conf; w.sbatch {
-    program = stageProgram stage;
-    exclusive = true;
-    time = "02:00:00";
-    qos = "debug";
-    jobName = "nbody-bs";
-    inherit nixPrefix nodes ntasksPerNode;
-  };
-
-  control = {stage, conf, ...}: with conf; w.control {
-    program = stageProgram stage;
-  };
-
-  srun = {stage, conf, ...}: with conf; w.srun {
-    program = stageProgram stage;
-    srunOptions = "--cpu-bind=verbose,rank";
-    inherit nixPrefix;
-  };
-
-  statspy = {stage, conf, ...}: with conf; w.statspy {
-    program = stageProgram stage;
-  };
-
-  perf = {stage, conf, ...}: with conf; w.perf {
-    program = stageProgram stage;
-    perfArgs = "sched record -a";
-  };
-
-  nixsetup = {stage, conf, ...}: with conf; w.nixsetup {
-    program = stageProgram stage;
-    nixsetup = "${nixPrefix}/bin/nix-setup";
-  };
-
-  extrae = {stage, conf, ...}: w.extrae {
-    program = stageProgram stage;
-    traceLib = "mpi"; # mpi -> libtracempi.so
-    configFile = ./extrae.xml;
-  };
-
-  ctf = {stage, conf, ...}: w.argv {
-    program = stageProgram stage;
-    env = ''
-      export NANOS6=ctf
-      export NANOS6_CTF2PRV=0
-    '';
-  };
-
-  bscOverlay = import ../../../overlay.nix;
-
-  genPkgs = newOverlay: nixpkgs {
-    overlays = [
-      bscOverlay
-      newOverlay
-    ];
-  };
-
-  inputDataset = {stage, conf, ...}: with conf;
-  let
-    input = bsc.garlic.creamsInput.override {
-      inherit gitBranch nodes;
-    };
-  in w.argv
-  {
-    program = stageProgram stage;
-    env = ''
-      cp -r ${input}/SodTubeBenchmark/* .
-
-      pwd
-      ls -l
-    '';
-  };
-
-  # We may be able to use overlays by invoking the fix function directly, but we
-  # have to get the definition of the bsc packages and the garlic ones as
-  # overlays.
-
-  creamsFn = {stage, conf, ...}: with conf;
-    let
-      # We set the mpi implementation to the one specified in the conf, so all
-      # packages in bsc will use that one.
-      customPkgs = genPkgs (self: super: {
-        bsc = super.bsc // { mpi = conf.mpi; };
-      });
-    in
-    customPkgs.bsc.garlic.creams.override {
-      inherit cc mpi gitBranch;
-    };
-
-  stages = with common; []
-    # Use sbatch to request resources first
-    ++ optional enableSbatch sbatch
-
-    # Repeats the next stages N times
-    ++ optionals enableControl [ nixsetup control ]
-
-    # Executes srun to launch the program in the requested nodes, and
-    # immediately after enters the nix environment again, as slurmstepd launches
-    # the next stages from outside the namespace.
-    ++ [ srun nixsetup ]
-
-    # Intrumentation with extrae
-    ++ optional enableExtrae extrae
-
-    # Optionally profile the next stages with perf
-    ++ optional enablePerf perf
-
-    # Optionally profile nanos6 with the new ctf
-    ++ optional enableCtf ctf
-
-    # Execute the nbody app with the argv and env vars
-    ++ [ inputDataset creamsFn ];
-
-  # List of actual programs to be executed
-  jobs = map (conf: w.stagen { inherit conf stages; }) configs;
-
-in
-  # We simply run each program one after another
-  w.launch jobs

overlay.nix

@@ -237,8 +237,8 @@ let
           };
         };
 
-        creams = {
-          SS_mpi_send_seq = callPackage ./garlic/exp/creams/SS+mpi+send+seq.nix {
+        creamsSS = {
+          nohybrid = callPackage ./garlic/exp/creams/SS+nohybrid.nix {
             pkgs = self // self.bsc.garlic;
             nixpkgs = import <nixpkgs>;
             genApp = self.bsc.garlic.genApp;