Fix saiph numcomm experiment

This commit is contained in:
Rodrigo Arias 2020-10-09 19:40:49 +02:00
parent 298c7362b3
commit 1b703bd431
2 changed files with 16 additions and 13 deletions

View File

@ -31,6 +31,7 @@ let
qos = "debug"; qos = "debug";
ntasksPerNode = 2; ntasksPerNode = 2;
nodes = 1; nodes = 1;
time = "02:00:00";
cpuBind = "sockets,verbose"; cpuBind = "sockets,verbose";
jobName = "nbody-bs-${toString blocksize}-${gitBranch}"; jobName = "nbody-bs-${toString blocksize}-${gitBranch}";
}; };
@ -53,8 +54,7 @@ let
inherit cc blocksize mpi gitBranch; inherit cc blocksize mpi gitBranch;
}; };
pipeline = stdexp.stdUnitPre {sbatch=mySbatch;} pipeline = stdexp.stdPipeline ++ [ exec program ];
++ [ exec program ];
in in

View File

@ -9,31 +9,34 @@
with stdenv.lib; with stdenv.lib;
let let
# Configurations for each unit (using the cartesian product) # Initial variable configuration
confUnit = with bsc; { varConf = with bsc; {
numComm = [ 1 2 ]; numComm = [ 1 2 ];
}; };
# Configuration for the complete experiment # Generate the complete configuration for each unit
confExperiment = with bsc; { genConf = with bsc; c: targetMachine.config // rec {
# saiph options # saiph options
devMode = false; devMode = false;
inherit (c) numComm;
mpi = impi; mpi = impi;
gitBranch = "garlic/tampi+isend+oss+task+simd"; gitBranch = "garlic/tampi+isend+oss+task+simd";
# Repeat the execution of each unit 30 times # Repeat the execution of each unit 100 times
loops = 100; loops = 100;
# Resources # Resources
qos = "debug";
time = "02:00:00";
ntasksPerNode = 2; ntasksPerNode = 2;
nodes = 1; nodes = 1;
cpuBind = "sockets,verbose"; cpuBind = "sockets,verbose";
jobName = "saiph-${toString numComm}-${gitBranch}";
}; };
# Compute the array of configurations # Compute the array of configurations
configs = stdexp.buildConfigs { configs = stdexp.buildConfigs {
var = confUnit; inherit varConf genConf;
fixed = targetMachine.config // confExperiment;
}; };
exec = {nextStage, conf, ...}: with conf; stages.exec { exec = {nextStage, conf, ...}: with conf; stages.exec {
@ -50,11 +53,11 @@ let
let let
customPkgs = stdexp.replaceMpi conf.mpi; customPkgs = stdexp.replaceMpi conf.mpi;
in in
customPkgs.apps.saiph.override { customPkgs.apps.saiph.override {
inherit devMode numComm mpi gitBranch; inherit devMode numComm mpi gitBranch;
}; };
pipeline = stdexp.stdStages ++ [ exec program ]; pipeline = stdexp.stdPipeline ++ [ exec program ];
in in