diff --git a/garlic/exp/hpcg/mpi+omp.nix b/garlic/exp/hpcg/mpi+omp.nix index 261979f..5605901 100644 --- a/garlic/exp/hpcg/mpi+omp.nix +++ b/garlic/exp/hpcg/mpi+omp.nix @@ -11,7 +11,7 @@ with stdenv.lib; let # Initial variable configuration varConf = with bsc; { - n = [ { x = 64; y = 64; z = 88; } ]; + n = [ { x = 128; y = 192; z = 192; } ]; nblocks = [ 12 24 48 96 192 384 ]; }; @@ -29,10 +29,10 @@ let # Resources qos = "debug"; ntasksPerNode = 1; - nodes = 2; + nodes = 4; time = "02:00:00"; # Each task in different socket - cpuBind = "verbose,mask_cpu:0xffffff"; + cpuBind = "verbose,mask_cpu:0x3f"; jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}"; }; @@ -45,7 +45,7 @@ let inherit nextStage; env = '' OMP_PROC_BIND=true - OMP_NUM_THREADS=12 + OMP_NUM_THREADS=6 ''; argv = [ "--nx=${toString n.x}" diff --git a/garlic/exp/hpcg/mpi.nix b/garlic/exp/hpcg/mpi.nix index d57dc88..a2a2ec4 100644 --- a/garlic/exp/hpcg/mpi.nix +++ b/garlic/exp/hpcg/mpi.nix @@ -11,7 +11,7 @@ with stdenv.lib; let # Initial variable configuration varConf = with bsc; { - n = [ { x = 64; y = 64; z = 88; } ]; + n = [ { x = 96; y = 96; z = 96; } ]; }; # Generate the complete configuration for each unit diff --git a/garlic/exp/hpcg/omp.nix b/garlic/exp/hpcg/omp.nix index aca3a5b..9960302 100644 --- a/garlic/exp/hpcg/omp.nix +++ b/garlic/exp/hpcg/omp.nix @@ -11,7 +11,7 @@ with stdenv.lib; let # Initial variable configuration varConf = with bsc; { - n = [ { x = 128; y = 256; z = 264; } ]; + n = [ { x = 256; y = 288; z = 288; } ]; nblocks = [ 12 24 48 96 192 384 ]; }; diff --git a/garlic/exp/hpcg/oss.nix b/garlic/exp/hpcg/oss.nix index 6695023..5084504 100644 --- a/garlic/exp/hpcg/oss.nix +++ b/garlic/exp/hpcg/oss.nix @@ -11,7 +11,7 @@ with stdenv.lib; let # Initial variable configuration varConf = with bsc; { - n = [ { x = 128; y = 256; z = 264; } ]; + n = [ { x = 256; y = 288; z = 288; } ]; nblocks = [ 12 24 48 96 192 384 ]; }; diff --git a/garlic/exp/hpcg/serial.nix b/garlic/exp/hpcg/serial.nix index 90356ef..3c58b42 100644 --- a/garlic/exp/hpcg/serial.nix +++ b/garlic/exp/hpcg/serial.nix @@ -11,7 +11,7 @@ with stdenv.lib; let # Initial variable configuration varConf = with bsc; { - n = [ { x = 128; y = 256; z = 264; } ]; + n = [ { x = 256; y = 288; z = 288; } ]; }; # Generate the complete configuration for each unit