rarias/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use mask_cpu and n.x n.y n.z instead of n

Browse Source
This commit is contained in:
Raúl Peñacoba 2020-10-30 14:05:40 +01:00
parent b856e2147a
commit 58e3d48a16
5 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
garlic/exp/hpcg/mpi+omp.nix
View File

@ -11,15 +11,16 @@ with stdenv.lib;
let let
# Initial variable configuration # Initial variable configuration
varConf = with bsc; { varConf = with bsc; {
n = [ 104 64 ]; n = [ { x = 64; y = 64; z = 88; } ];
nblocks = [ 12 24 48 96 192 384 ];
}; };
# Generate the complete configuration for each unit # Generate the complete configuration for each unit
genConf = with bsc; c: targetMachine.config // rec { genConf = with bsc; c: targetMachine.config // rec {
# hpcg options # hpcg options
n = c.n; n = c.n;
cc = icc; cc = bsc.icc;
mpi = impi; mpi = bsc.impi;
gitBranch = "garlic/mpi+omp"; gitBranch = "garlic/mpi+omp";
# Repeat the execution of each unit 30 times # Repeat the execution of each unit 30 times
@ -27,11 +28,12 @@ let
# Resources # Resources
qos = "debug"; qos = "debug";
ntasksPerNode = 48; ntasksPerNode = 1;
nodes = 1; nodes = 2;
time = "02:00:00"; time = "02:00:00";
cpuBind = "sockets,verbose"; # Each task in different socket
jobName = "hpcg-${toString n}-${gitBranch}"; cpuBind = "verbose,mask_cpu:0xffffff";
jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}";
}; };
# Compute the array of configurations # Compute the array of configurations
@ -41,10 +43,14 @@ let
exec = {nextStage, conf, ...}: with conf; stages.exec { exec = {nextStage, conf, ...}: with conf; stages.exec {
inherit nextStage; inherit nextStage;
env = ''
OMP_PROC_BIND=true
OMP_NUM_THREADS=12
'';
argv = [ argv = [
"--nx=${toString n}" "--nx=${toString n.x}"
"--ny=${toString n}" "--ny=${toString n.y}"
"--nz=${toString n}" "--nz=${toString n.z}"
]; ];
}; };

21
garlic/exp/hpcg/mpi.nix
View File

@ -11,15 +11,15 @@ with stdenv.lib;
let let
# Initial variable configuration # Initial variable configuration
varConf = with bsc; { varConf = with bsc; {
n = [ 104 64 ]; n = [ { x = 64; y = 64; z = 88; } ];
}; };
# Generate the complete configuration for each unit # Generate the complete configuration for each unit
genConf = with bsc; c: targetMachine.config // rec { genConf = with bsc; c: targetMachine.config // rec {
# hpcg options # hpcg options
n = c.n; n = c.n;
cc = icc; cc = bsc.icc;
mpi = impi; mpi = bsc.impi;
gitBranch = "garlic/mpi"; gitBranch = "garlic/mpi";
# Repeat the execution of each unit 30 times # Repeat the execution of each unit 30 times
@ -27,11 +27,12 @@ let
# Resources # Resources
qos = "debug"; qos = "debug";
ntasksPerNode = 48; ntasksPerNode = 1;
nodes = 1; nodes = 24;
time = "02:00:00"; time = "02:00:00";
cpuBind = "sockets,verbose"; # Each task in different socket
jobName = "hpcg-${toString n}-${gitBranch}"; cpuBind = "verbose,mask_cpu:0x1";
jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}";
}; };
# Compute the array of configurations # Compute the array of configurations
@ -42,9 +43,9 @@ let
exec = {nextStage, conf, ...}: with conf; stages.exec { exec = {nextStage, conf, ...}: with conf; stages.exec {
inherit nextStage; inherit nextStage;
argv = [ argv = [
"--nx=${toString n}" "--nx=${toString n.x}"
"--ny=${toString n}" "--ny=${toString n.y}"
"--nz=${toString n}" "--nz=${toString n.z}"
]; ];
}; };

21
garlic/exp/hpcg/omp.nix
View File

@ -11,8 +11,8 @@ with stdenv.lib;
let let
# Initial variable configuration # Initial variable configuration
varConf = with bsc; { varConf = with bsc; {
n = [ 200 104 64 ]; n = [ { x = 128; y = 256; z = 264; } ];
nblocks = [ 128 ]; nblocks = [ 12 24 48 96 192 384 ];
}; };
# Generate the complete configuration for each unit # Generate the complete configuration for each unit
@ -20,7 +20,7 @@ let
# hpcg options # hpcg options
n = c.n; n = c.n;
nblocks = c.nblocks; nblocks = c.nblocks;
cc = icc; cc = bsc.icc;
mpi = null; # TODO: Remove this for omp mpi = null; # TODO: Remove this for omp
gitBranch = "garlic/omp"; gitBranch = "garlic/omp";
@ -32,8 +32,9 @@ let
ntasksPerNode = 1; ntasksPerNode = 1;
nodes = 1; nodes = 1;
time = "02:00:00"; time = "02:00:00";
cpuBind = "sockets,verbose"; # task in one socket
jobName = "hpcg-${toString n}-${gitBranch}"; cpuBind = "verbose,mask_cpu:0xffffff";
jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}";
}; };
# Compute the array of configurations # Compute the array of configurations
@ -43,10 +44,14 @@ let
exec = {nextStage, conf, ...}: with conf; stages.exec { exec = {nextStage, conf, ...}: with conf; stages.exec {
inherit nextStage; inherit nextStage;
env = ''
OMP_PROC_BIND=true
OMP_NUM_THREADS=24
'';
argv = [ argv = [
"--nx=${toString n}" "--nx=${toString n.x}"
"--ny=${toString n}" "--ny=${toString n.y}"
"--nz=${toString n}" "--nz=${toString n.z}"
"--nblocks=${toString nblocks}" "--nblocks=${toString nblocks}"
]; ];
}; };

15
garlic/exp/hpcg/oss.nix
View File

@ -11,8 +11,8 @@ with stdenv.lib;
let let
# Initial variable configuration # Initial variable configuration
varConf = with bsc; { varConf = with bsc; {
n = [ 200 104 64 ]; n = [ { x = 128; y = 256; z = 264; } ];
nblocks = [ 128 ]; nblocks = [ 12 24 48 96 192 384 ];
}; };
# Generate the complete configuration for each unit # Generate the complete configuration for each unit
@ -34,8 +34,9 @@ let
ntasksPerNode = 1; ntasksPerNode = 1;
nodes = 1; nodes = 1;
time = "02:00:00"; time = "02:00:00";
cpuBind = "sockets,verbose"; # task in one socket
jobName = "hpcg-${toString n}-${gitBranch}"; cpuBind = "verbose,mask_cpu:0xffffff";
jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}";
}; };
# Compute the array of configurations # Compute the array of configurations
@ -47,9 +48,9 @@ let
inherit nextStage; inherit nextStage;
env = "NANOS6_DEPENDENCIES=discrete"; env = "NANOS6_DEPENDENCIES=discrete";
argv = [ argv = [
"--nx=${toString n}" "--nx=${toString n.x}"
"--ny=${toString n}" "--ny=${toString n.y}"
"--nz=${toString n}" "--nz=${toString n.z}"
"--nblocks=${toString nblocks}" "--nblocks=${toString nblocks}"
]; ];
}; };

14
garlic/exp/hpcg/serial.nix
View File

@ -11,7 +11,7 @@ with stdenv.lib;
let let
# Initial variable configuration # Initial variable configuration
varConf = with bsc; { varConf = with bsc; {
n = [ 104 64 ]; n = [ { x = 128; y = 256; z = 264; } ];
}; };
# Generate the complete configuration for each unit # Generate the complete configuration for each unit
@ -27,11 +27,11 @@ let
# Resources # Resources
qos = "debug"; qos = "debug";
ntasksPerNode = 48; ntasksPerNode = 1;
nodes = 1; nodes = 1;
time = "02:00:00"; time = "02:00:00";
cpuBind = "sockets,verbose"; cpuBind = "verbose,mask_cpu:0x1";
jobName = "hpcg-${toString n}-${gitBranch}"; jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}";
}; };
# Compute the array of configurations # Compute the array of configurations
@ -42,9 +42,9 @@ let
exec = {nextStage, conf, ...}: with conf; stages.exec { exec = {nextStage, conf, ...}: with conf; stages.exec {
inherit nextStage; inherit nextStage;
argv = [ argv = [
"--nx=${toString n}" "--nx=${toString n.x}"
"--ny=${toString n}" "--ny=${toString n.y}"
"--nz=${toString n}" "--nz=${toString n.z}"
]; ];
}; };