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

Use discrete deps in nanos6. Pass nblocks to omp version and use the same experiments as oss

Browse Source
This commit is contained in:
Raúl Peñacoba 2020-10-27 18:13:21 +01:00
parent 22a294f9cc
commit b856e2147a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,23 +11,25 @@ with stdenv.lib;
let let
# Initial variable configuration # Initial variable configuration
varConf = with bsc; { varConf = with bsc; {
n = [ 104 64 ]; n = [ 200 104 64 ];
nblocks = [ 128 ];
}; };
# 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;
nblocks = c.nblocks;
cc = icc; cc = icc;
mpi = null; # TODO: Remove this for omp mpi = null; # TODO: Remove this for omp
gitBranch = "garlic/seq"; gitBranch = "garlic/omp";
# Repeat the execution of each unit 30 times # Repeat the execution of each unit 30 times
loops = 30; loops = 30;
# 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 = "sockets,verbose";
@ -45,6 +47,7 @@ let
"--nx=${toString n}" "--nx=${toString n}"
"--ny=${toString n}" "--ny=${toString n}"
"--nz=${toString n}" "--nz=${toString n}"
"--nblocks=${toString nblocks}"
]; ];
}; };

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

@ -45,6 +45,7 @@ let
exec = {nextStage, conf, ...}: with conf; stages.exec { exec = {nextStage, conf, ...}: with conf; stages.exec {
inherit nextStage; inherit nextStage;
env = "NANOS6_DEPENDENCIES=discrete";
argv = [ argv = [
"--nx=${toString n}" "--nx=${toString n}"
"--ny=${toString n}" "--ny=${toString n}"