saiph: update scaling exp and figures

garlic/exp/index.nix

@@ -35,6 +35,8 @@
     numcomm = callPackage ./saiph/numcomm.nix { };
     granularity = callPackage ./saiph/granularity.nix { };
     scaling = callPackage ./saiph/scaling.nix { };
+    scaling2 = callPackage ./saiph/scaling2.nix { };
+    debug = callPackage ./saiph/debug.nix { };
     blockingY = callPackage ./saiph/blocking_Y.nix { };
     blockingZ = callPackage ./saiph/blocking_Z.nix { };
     blockingYZ = callPackage ./saiph/blocking_YZ.nix { };

garlic/exp/saiph/debug.nix

@@ -0,0 +1,89 @@
+{
+  stdenv
+, stdexp
+, bsc
+, targetMachine
+, stages
+}:
+
+with stdenv.lib;
+
+let
+  # Initial variable configuration
+  varConf = with bsc; {
+  };
+
+  # Generate the complete configuration for each unit
+  genConf = with bsc; c: targetMachine.config // rec {
+    expName = "saiph";
+    unitName = "${expName}-debug";
+
+#    unitName = if (gitCommit == "3b52a616d44f4b86880663e2d951ad89c1dcab4f") 
+#      then "${expName}-N${toString nodes}" + "-nblx${toString nblx}-nbly${toString nbly}" + "-par-init"
+#      else  "${expName}-N${toString nodes}" + "-nblx${toString nblx}-nbly${toString nbly}" + "-seq-init";
+
+    inherit (targetMachine.config) hw;
+
+    # saiph options
+    manualDist = 1;
+    nbgx = 1;
+    nbgy = 1;
+    nbgz = 8;
+    nblx = 1;
+    nbly = 4;
+    nblz = 96;
+    nbltotal = 384;
+    mpi = impi;
+    gitBranch = "garlic/tampi+isend+oss+task+simd";
+    gitCommit = "3fa116620f1c7fbd1127d785c8bdc5d2372837b3";
+    #gitCommit = c.gitCommit; # if exp involves more than 1 commit
+    #inherit (c) gitCommit;   # if exp fixes the commit
+
+    # Repeat the execution of each unit 50 times
+    loops = 1;
+
+    # Resources
+    qos = "debug";
+    ntasksPerNode = hw.socketsPerNode;
+    nodes = 4;
+    cpusPerTask = hw.cpusPerSocket;
+    jobName = "${unitName}";
+
+    # Compile flags
+    debugFlags = 1;
+    asanFlags = 0;
+  };
+
+  # Compute the array of configurations
+  configs = stdexp.buildConfigs {
+    inherit varConf genConf;
+  };
+
+  exec = {nextStage, conf, ...}: with conf; stages.exec {
+    inherit nextStage;
+    env = ''
+      export OMP_NUM_THREADS=${toString hw.cpusPerSocket}
+      export ASAN_SYMBOLIZER_PATH=${bsc.clangOmpss2Unwrapped}/bin/llvm-symbolizer
+    '';
+    pre = ''
+      ulimit -c unlimited
+    '';
+  };
+
+  valgrind = {nextStage, ...}: stages.valgrind {
+    inherit nextStage;
+  };
+
+  program = {nextStage, conf, ...}:
+  let
+    customPkgs = stdexp.replaceMpi conf.mpi;
+  in
+    customPkgs.apps.saiph.override {
+      inherit (conf) manualDist nbgx nbgy nbgz nblx nbly nblz nbltotal mpi gitBranch gitCommit debugFlags asanFlags;
+    };
+
+  pipeline = stdexp.stdPipeline ++ [ exec valgrind program ];
+
+in
+ 
+  stdexp.genExperiment { inherit configs pipeline; }

garlic/exp/saiph/scaling.nix

@@ -11,9 +11,29 @@ with stdenv.lib;
 let
   # Initial variable configuration
   varConf = with bsc; {
-    nbl = [ 1 2 4 8 16 32 64 ];
+    #nbl = [ 1 2 4 8 16 32 64 ];
     nodes = [ 1 2 4 8 ];
-    #gitCommit = [ "3ecae7c209ec3e33d1108ae4783d7e733d54f2ca" "3b52a616d44f4b86880663e2d951ad89c1dcab4f" ];
+
+    input = [
+      { nbly=12 ; nblz=1; nbltotal=12 ; }
+      { nbly=24 ; nblz=1; nbltotal=24 ; }
+      { nbly=48 ; nblz=1; nbltotal=48 ; }
+      { nbly=96 ; nblz=1; nbltotal=96 ; }
+
+      { nbly=6 ;  nblz=2; nbltotal=12 ; }
+      { nbly=12 ; nblz=2; nbltotal=24 ; }
+      { nbly=24 ; nblz=2; nbltotal=48 ; }
+      { nbly=48 ; nblz=2; nbltotal=96 ; }
+      { nbly=96 ; nblz=2; nbltotal=192 ; }
+
+      { nbly=3  ; nblz=4; nbltotal=12 ; }
+      { nbly=6  ; nblz=4; nbltotal=24 ; }
+      { nbly=12 ; nblz=4; nbltotal=48 ; }
+      { nbly=24 ; nblz=4; nbltotal=96 ; }
+      { nbly=48 ; nblz=4; nbltotal=192 ; }
+      { nbly=96 ; nblz=4; nbltotal=384 ; }
+    ];
+
   };
 
   # Generate the complete configuration for each unit
@@ -30,31 +50,33 @@ let
     manualDist = 1;
     nbgx = 1;
     nbgy = 1;
-    nbgz = nodes;
+    nbgz = nodes*2;
     nblx = 1;
-    nbly = c.nbl;
-    nblz = c.nbl;
+    #nbly = c.nbl;
+    #nblz = c.nbl;
     mpi = impi;
     gitBranch = "garlic/tampi+isend+oss+task+simd";
     #gitCommit = c.gitCommit; # if exp involves more than 1 commit
+    gitCommit = "3fa116620f1c7fbd1127d785c8bdc5d2372837b3";
     #inherit (c) gitCommit;   # if exp fixes the commit
+    inherit (c.input) nbly nblz nbltotal ;
 
     # Repeat the execution of each unit 50 times
     loops = 10;
 
     # Resources
     qos = "bsc_cs";
-    ntasksPerNode = 1;
+    ntasksPerNode = hw.socketsPerNode;
     nodes = c.nodes;
     cpusPerTask = hw.cpusPerSocket;
     jobName = "${unitName}";
   };
 
   # Compute the array of configurations
-  configs = stdexp.buildConfigs {
+  configsAll = stdexp.buildConfigs {
     inherit varConf genConf;
   };
-  #configs = filter (el: if el.nbly == 1 && el.nblz == 1 && el.nodes == 1 && el.gitCommit == "3b52a616d44f4b86880663e2d951ad89c1dcab4f" then false else true) configsAll;
+  configs = filter (el: if (el.nbly == 24 && el.nblz == 4) && el.nodes == 4 then false else true) configsAll;
 
   exec = {nextStage, conf, ...}: with conf; stages.exec {
     inherit nextStage;
@@ -69,11 +91,14 @@ let
     customPkgs = stdexp.replaceMpi conf.mpi;
   in
     customPkgs.apps.saiph.override {
-      inherit (conf) manualDist nbgx nbgy nbgz nblx nbly nblz mpi gitBranch;
+      inherit (conf) manualDist nbgx nbgy nbgz nblx nbly nblz nbltotal mpi gitBranch gitCommit;
     };
 
   pipeline = stdexp.stdPipeline ++ [ exec program ];
 
 in
  
-  stdexp.genExperiment { inherit configs pipeline; }
+	stdexp.genExperiment { inherit configs pipeline; }
+
+
+# last plot hash: f5xb7jv1c4mbrcy6d9s9j10msfz3kkj0-plot

garlic/exp/saiph/scaling2.nix

@@ -0,0 +1,104 @@
+{
+  stdenv
+, stdexp
+, bsc
+, targetMachine
+, stages
+}:
+
+with stdenv.lib;
+
+let
+  # Initial variable configuration
+  varConf = with bsc; {
+    #nbl = [ 1 2 4 8 16 32 64 ];
+    nodes = [ 1 2 4 8 ];
+
+    input = [
+      { nblz=12 ; nbly=1; nbltotal=12 ; }
+      { nblz=24 ; nbly=1; nbltotal=24 ; }
+      { nblz=48 ; nbly=1; nbltotal=48 ; }
+      { nblz=96 ; nbly=1; nbltotal=96 ; }
+
+      { nblz=6 ;  nbly=2; nbltotal=12 ; }
+      { nblz=12 ; nbly=2; nbltotal=24 ; }
+      { nblz=24 ; nbly=2; nbltotal=48 ; }
+      { nblz=48 ; nbly=2; nbltotal=96 ; }
+      { nblz=96 ; nbly=2; nbltotal=192 ; }
+
+      { nblz=3  ; nbly=4; nbltotal=12 ; }
+      { nblz=6  ; nbly=4; nbltotal=24 ; }
+      { nblz=12 ; nbly=4; nbltotal=48 ; }
+      { nblz=24 ; nbly=4; nbltotal=96 ; }
+      { nblz=48 ; nbly=4; nbltotal=192 ; }
+      { nblz=96 ; nbly=4; nbltotal=384 ; }
+    ];
+
+  };
+
+  # Generate the complete configuration for each unit
+  genConf = with bsc; c: targetMachine.config // rec {
+    expName = "saiph";
+    unitName = "${expName}-N${toString nodes}" + "-nblx${toString nblx}-nbly${toString nbly}" + "-par-init-One-dimensionalDistribution";
+#    unitName = if (gitCommit == "3b52a616d44f4b86880663e2d951ad89c1dcab4f") 
+#      then "${expName}-N${toString nodes}" + "-nblx${toString nblx}-nbly${toString nbly}" + "-par-init"
+#      else  "${expName}-N${toString nodes}" + "-nblx${toString nblx}-nbly${toString nbly}" + "-seq-init";
+
+    inherit (targetMachine.config) hw;
+
+    # saiph options
+    manualDist = 1;
+    nbgx = 1;
+    nbgy = 1;
+    nbgz = nodes*2;
+    nblx = 1;
+    #nbly = c.nbl;
+    #nblz = c.nbl;
+    mpi = impi;
+    gitBranch = "garlic/tampi+isend+oss+task+simd";
+    #gitCommit = c.gitCommit; # if exp involves more than 1 commit
+    gitCommit = "3fa116620f1c7fbd1127d785c8bdc5d2372837b3";
+    #inherit (c) gitCommit;   # if exp fixes the commit
+    inherit (c.input) nbly nblz nbltotal ;
+
+    # Repeat the execution of each unit 50 times
+    loops = 10;
+
+    # Resources
+    qos = "bsc_cs";
+    ntasksPerNode = hw.socketsPerNode;
+    nodes = c.nodes;
+    cpusPerTask = hw.cpusPerSocket;
+    jobName = "${unitName}";
+  };
+
+  # Compute the array of configurations
+  configs = stdexp.buildConfigs {
+    inherit varConf genConf;
+  };
+  #configs = filter (el: if (el.nbly == 24 && el.nblz == 4) && el.nodes == 4 then false else true) configsAll;
+
+  exec = {nextStage, conf, ...}: with conf; stages.exec {
+    inherit nextStage;
+    env = ''
+      export OMP_NUM_THREADS=${toString hw.cpusPerSocket}
+      export ASAN_SYMBOLIZER_PATH=${bsc.clangOmpss2Unwrapped}/bin/llvm-symbolizer
+    '';
+  };
+
+  program = {nextStage, conf, ...}:
+  let
+    customPkgs = stdexp.replaceMpi conf.mpi;
+  in
+    customPkgs.apps.saiph.override {
+      inherit (conf) manualDist nbgx nbgy nbgz nblx nbly nblz nbltotal mpi gitBranch gitCommit;
+    };
+
+  pipeline = stdexp.stdPipeline ++ [ exec program ];
+
+in
+ 
+	stdexp.genExperiment { inherit configs pipeline; }
+
+
+# last plot hash: f5xb7jv1c4mbrcy6d9s9j10msfz3kkj0-plot