diff --git a/garlic/exp/index.nix b/garlic/exp/index.nix index 1d71c1e..c8335fb 100644 --- a/garlic/exp/index.nix +++ b/garlic/exp/index.nix @@ -35,6 +35,10 @@ numcomm = callPackage ./saiph/numcomm.nix { }; granularity = callPackage ./saiph/granularity.nix { }; scaling = callPackage ./saiph/scaling.nix { }; + blockingY = callPackage ./saiph/blocking_Y.nix { }; + blockingZ = callPackage ./saiph/blocking_Z.nix { }; + blockingYZ = callPackage ./saiph/blocking_YZ.nix { }; + blockingZY = callPackage ./saiph/blocking_ZY.nix { }; }; creams = rec { diff --git a/garlic/exp/saiph/blocking.nix b/garlic/exp/saiph/blocking.nix index d8fc11f..c999f91 100644 --- a/garlic/exp/saiph/blocking.nix +++ b/garlic/exp/saiph/blocking.nix @@ -47,8 +47,6 @@ let exec = {nextStage, conf, ...}: with conf; stages.exec { inherit nextStage; env = '' - export NANOS6_REPORT_PREFIX="#" - export I_MPI_THREAD_SPLIT=1 export ASAN_SYMBOLIZER_PATH=${bsc.clangOmpss2Unwrapped}/bin/llvm-symbolizer ''; }; diff --git a/garlic/exp/saiph/blocking_Y.nix b/garlic/exp/saiph/blocking_Y.nix index 1f5b1ed..9a78acc 100644 --- a/garlic/exp/saiph/blocking_Y.nix +++ b/garlic/exp/saiph/blocking_Y.nix @@ -48,8 +48,6 @@ let exec = {nextStage, conf, ...}: with conf; stages.exec { inherit nextStage; env = '' - export NANOS6_REPORT_PREFIX="#" - export I_MPI_THREAD_SPLIT=1 export ASAN_SYMBOLIZER_PATH=${bsc.clangOmpss2Unwrapped}/bin/llvm-symbolizer ''; }; diff --git a/garlic/exp/saiph/blocking_YZ.nix b/garlic/exp/saiph/blocking_YZ.nix index a283727..d85b04a 100644 --- a/garlic/exp/saiph/blocking_YZ.nix +++ b/garlic/exp/saiph/blocking_YZ.nix @@ -48,8 +48,6 @@ let exec = {nextStage, conf, ...}: with conf; stages.exec { inherit nextStage; env = '' - export NANOS6_REPORT_PREFIX="#" - export I_MPI_THREAD_SPLIT=1 export ASAN_SYMBOLIZER_PATH=${bsc.clangOmpss2Unwrapped}/bin/llvm-symbolizer ''; }; diff --git a/garlic/exp/saiph/blocking_Z.nix b/garlic/exp/saiph/blocking_Z.nix index d3ee3c5..d98a6e2 100644 --- a/garlic/exp/saiph/blocking_Z.nix +++ b/garlic/exp/saiph/blocking_Z.nix @@ -48,8 +48,6 @@ let exec = {nextStage, conf, ...}: with conf; stages.exec { inherit nextStage; env = '' - export NANOS6_REPORT_PREFIX="#" - export I_MPI_THREAD_SPLIT=1 export ASAN_SYMBOLIZER_PATH=${bsc.clangOmpss2Unwrapped}/bin/llvm-symbolizer ''; }; diff --git a/garlic/exp/saiph/blocking_ZY.nix b/garlic/exp/saiph/blocking_ZY.nix index 12749f2..f29ffb3 100644 --- a/garlic/exp/saiph/blocking_ZY.nix +++ b/garlic/exp/saiph/blocking_ZY.nix @@ -48,8 +48,6 @@ let exec = {nextStage, conf, ...}: with conf; stages.exec { inherit nextStage; env = '' - export NANOS6_REPORT_PREFIX="#" - export I_MPI_THREAD_SPLIT=1 export ASAN_SYMBOLIZER_PATH=${bsc.clangOmpss2Unwrapped}/bin/llvm-symbolizer ''; }; diff --git a/garlic/exp/saiph/numcomm.nix b/garlic/exp/saiph/numcomm.nix index 03bd7e2..9c88c7a 100644 --- a/garlic/exp/saiph/numcomm.nix +++ b/garlic/exp/saiph/numcomm.nix @@ -46,7 +46,6 @@ let inherit nextStage; env = '' export OMP_NUM_THREADS=24 - export NANOS6_REPORT_PREFIX="#" export ASAN_SYMBOLIZER_PATH=${bsc.clangOmpss2Unwrapped}/bin/llvm-symbolizer ''; }; diff --git a/garlic/exp/saiph/strongScaling.nix b/garlic/exp/saiph/strongScaling.nix index cc58317..753e61e 100644 --- a/garlic/exp/saiph/strongScaling.nix +++ b/garlic/exp/saiph/strongScaling.nix @@ -50,8 +50,6 @@ let exec = {nextStage, conf, ...}: with conf; stages.exec { inherit nextStage; env = '' - export NANOS6_REPORT_PREFIX="#" - export I_MPI_THREAD_SPLIT=1 export ASAN_SYMBOLIZER_PATH=${bsc.clangOmpss2Unwrapped}/bin/llvm-symbolizer ''; }; diff --git a/garlic/fig/index.nix b/garlic/fig/index.nix index 0d60563..3ef184d 100644 --- a/garlic/fig/index.nix +++ b/garlic/fig/index.nix @@ -44,6 +44,10 @@ in saiph = with exp.saiph; { granularity = rPlotExp ./saiph/granularity.R [ granularity ]; scaling = rPlotExp ./saiph/scaling.R [ scaling ]; + blockingY = rPlotExp ./saiph/granularityY.R [ blockingY ]; + blockingZ = rPlotExp ./saiph/granularityZ.R [ blockingZ ]; + blockingYZ = rPlotExp ./saiph/granularityYZ.R [ blockingYZ ]; + blockingZY = rPlotExp ./saiph/granularityZY.R [ blockingZY ]; }; heat = with exp.heat; {