diff --git a/garlic/exp/saiph/blocking.nix b/garlic/exp/saiph/blocking.nix index c999f91..05b2287 100644 --- a/garlic/exp/saiph/blocking.nix +++ b/garlic/exp/saiph/blocking.nix @@ -17,12 +17,13 @@ let # Generate the complete configuration for each unit genConf = with bsc; c: targetMachine.config // rec { expName = "saiph.blocking"; - unitName = "${expName}.1-nby-nbz-${toString nby}-${toString nbz}"; + unitName = "${expName}.1-nby-nbz-${toString nby}-${toString nbz}.nsteps-${toString nsteps}"; inherit (targetMachine.config) hw; # saiph options nby = c.nb; nbz = c.nb; + nsteps = 500; mpi = impi; gitBranch = "garlic/tampi+isend+oss+task+simd"; @@ -56,7 +57,7 @@ let customPkgs = stdexp.replaceMpi conf.mpi; in customPkgs.apps.saiph.override { - inherit nby nbz mpi gitBranch cachelineBytes; + inherit nby nbz nsteps mpi gitBranch cachelineBytes; }; pipeline = stdexp.stdPipeline ++ [ exec program ]; diff --git a/garlic/exp/saiph/blocking_Y.nix b/garlic/exp/saiph/blocking_Y.nix index 9a78acc..e5c7a9d 100644 --- a/garlic/exp/saiph/blocking_Y.nix +++ b/garlic/exp/saiph/blocking_Y.nix @@ -17,13 +17,14 @@ let # Generate the complete configuration for each unit genConf = with bsc; c: targetMachine.config // rec { expName = "saiph.blockingY"; - unitName = "${expName}.nbx-nby-nbz-${toString nbx}-${toString nby}-${toString nbz}"; + unitName = "${expName}.nbx-nby-nbz-${toString nbx}-${toString nby}-${toString nbz}.nsteps-${toString nsteps}"; inherit (targetMachine.config) hw; # saiph options nbx = 1; nby = c.nb; nbz = 1; + nsteps = 500; mpi = impi; gitBranch = "garlic/tampi+isend+oss+task+simd"; @@ -57,7 +58,7 @@ let customPkgs = stdexp.replaceMpi conf.mpi; in customPkgs.apps.saiph.override { - inherit nbx nby nbz mpi gitBranch cachelineBytes; + inherit nbx nby nbz nsteps mpi gitBranch cachelineBytes; }; pipeline = stdexp.stdPipeline ++ [ exec program ]; diff --git a/garlic/exp/saiph/blocking_YZ.nix b/garlic/exp/saiph/blocking_YZ.nix index d85b04a..70041e1 100644 --- a/garlic/exp/saiph/blocking_YZ.nix +++ b/garlic/exp/saiph/blocking_YZ.nix @@ -17,13 +17,14 @@ let # Generate the complete configuration for each unit genConf = with bsc; c: targetMachine.config // rec { expName = "saiph.blockingY"; - unitName = "${expName}.nbx-nby-nbz-${toString nbx}-${toString nby}-${toString nbz}"; + unitName = "${expName}.nbx-nby-nbz-${toString nbx}-${toString nby}-${toString nbz}.nsteps-${toString nsteps}"; inherit (targetMachine.config) hw; # saiph options nbx = 1; nby = 8; nbz = c.nb; + nsteps = 500; mpi = impi; gitBranch = "garlic/tampi+isend+oss+task+simd"; @@ -57,7 +58,7 @@ let customPkgs = stdexp.replaceMpi conf.mpi; in customPkgs.apps.saiph.override { - inherit nbx nby nbz mpi gitBranch cachelineBytes; + inherit nbx nby nbz nsteps mpi gitBranch cachelineBytes; }; pipeline = stdexp.stdPipeline ++ [ exec program ]; diff --git a/garlic/exp/saiph/blocking_Z.nix b/garlic/exp/saiph/blocking_Z.nix index d98a6e2..52b282f 100644 --- a/garlic/exp/saiph/blocking_Z.nix +++ b/garlic/exp/saiph/blocking_Z.nix @@ -17,13 +17,14 @@ let # Generate the complete configuration for each unit genConf = with bsc; c: targetMachine.config // rec { expName = "saiph.blockingZ"; - unitName = "${expName}.nbx-nby-nbz-${toString nbx}-${toString nby}-${toString nbz}"; + unitName = "${expName}.nbx-nby-nbz-${toString nbx}-${toString nby}-${toString nbz}.nsteps-${toString nsteps}"; inherit (targetMachine.config) hw; # saiph options nbx = 1; nby = 1; nbz = c.nb; + nsteps = 500; mpi = impi; gitBranch = "garlic/tampi+isend+oss+task+simd"; @@ -57,7 +58,7 @@ let customPkgs = stdexp.replaceMpi conf.mpi; in customPkgs.apps.saiph.override { - inherit nbx nby nbz mpi gitBranch cachelineBytes; + inherit nbx nby nbz nsteps mpi gitBranch cachelineBytes; }; pipeline = stdexp.stdPipeline ++ [ exec program ]; diff --git a/garlic/exp/saiph/blocking_ZY.nix b/garlic/exp/saiph/blocking_ZY.nix index f29ffb3..7ea45c5 100644 --- a/garlic/exp/saiph/blocking_ZY.nix +++ b/garlic/exp/saiph/blocking_ZY.nix @@ -17,13 +17,14 @@ let # Generate the complete configuration for each unit genConf = with bsc; c: targetMachine.config // rec { expName = "saiph.blockingZY"; - unitName = "${expName}.nbx-nby-nbz-${toString nbx}-${toString nby}-${toString nbz}"; + unitName = "${expName}.nbx-nby-nbz-${toString nbx}-${toString nby}-${toString nbz}.nsteps-${toString nsteps}"; inherit (targetMachine.config) hw; # saiph options nbx = 1; nby = c.nb; nbz = 8; + nsteps = 500; mpi = impi; gitBranch = "garlic/tampi+isend+oss+task+simd"; @@ -57,7 +58,7 @@ let customPkgs = stdexp.replaceMpi conf.mpi; in customPkgs.apps.saiph.override { - inherit nbx nby nbz mpi gitBranch cachelineBytes; + inherit nbx nby nbz nsteps mpi gitBranch cachelineBytes; }; pipeline = stdexp.stdPipeline ++ [ exec program ]; diff --git a/garlic/exp/saiph/granularity.nix b/garlic/exp/saiph/granularity.nix index af466e2..f19934b 100644 --- a/garlic/exp/saiph/granularity.nix +++ b/garlic/exp/saiph/granularity.nix @@ -17,13 +17,14 @@ let # Generate the complete configuration for each unit genConf = with bsc; c: targetMachine.config // rec { expName = "saiph.granularity"; - unitName = "${expName}.nbx-nby-nbz-${toString nbx}-${toString nby}-${toString nbz}"; + unitName = "${expName}.nbx-nby-nbz-${toString nbx}-${toString nby}-${toString nbz}.nsteps-${nsteps}"; inherit (targetMachine.config) hw; # saiph options nbx = 1; nby = c.nb; nbz = c.nb; + nsteps = 500; mpi = impi; gitBranch = "garlic/tampi+isend+omp+task+simd"; @@ -59,7 +60,7 @@ let customPkgs = stdexp.replaceMpi conf.mpi; in customPkgs.apps.saiph.override { - inherit nbx nby nbz mpi gitBranch cachelineBytes; + inherit nbx nby nbz nsteps mpi gitBranch cachelineBytes; }; pipeline = stdexp.stdPipeline ++ [ exec program ]; diff --git a/garlic/exp/saiph/strongScaling.nix b/garlic/exp/saiph/strongScaling.nix index 753e61e..ec201e2 100644 --- a/garlic/exp/saiph/strongScaling.nix +++ b/garlic/exp/saiph/strongScaling.nix @@ -17,13 +17,14 @@ let # Generate the complete configuration for each unit genConf = with bsc; c: targetMachine.config // rec { expName = "saiph.strongScaling"; - unitName = "${expName}.nodes-${toString nodes}-nb{y, z}=4"; + unitName = "${expName}.nodes-${toString nodes}-nb{y, z}=4.nsteps-${toString nsteps}"; inherit (targetMachine.config) hw; # saiph options nbx = 1; nby = 4; nbz = 4; + nsteps = 500; mpi = impi; gitBranch = "garlic/tampi+isend+oss+task+simd"; @@ -59,7 +60,7 @@ let customPkgs = stdexp.replaceMpi conf.mpi; in customPkgs.apps.saiph.override { - inherit nbx nby nbz mpi gitBranch cachelineBytes; + inherit nbx nby nbz nsteps mpi gitBranch cachelineBytes; }; pipeline = stdexp.stdPipeline ++ [ exec program ];