From 203dc9f2953eb01a3bb3928823a835d76366296c Mon Sep 17 00:00:00 2001 From: Pedro Martinez Date: Tue, 15 Dec 2020 19:34:49 +0100 Subject: [PATCH] Configure the nanos6 environment and get the right hardware attributes --- garlic/exp/creams/ss+hybrid.nix | 11 ++++++++++- garlic/exp/creams/ss+pure.nix | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/garlic/exp/creams/ss+hybrid.nix b/garlic/exp/creams/ss+hybrid.nix index 2c1bace..e10071e 100644 --- a/garlic/exp/creams/ss+hybrid.nix +++ b/garlic/exp/creams/ss+hybrid.nix @@ -45,6 +45,7 @@ let # Resources qos = "debug"; ntasksPerNode = hw.socketsPerNode; + cpusPerTask = hw.cpusPerSocket; inherit (c.input) time nodes; jobName = unitName; }; @@ -54,6 +55,14 @@ let inherit varConf genConf; }; + # Use nanos6 with regions + nanos6Env = {nextStage, conf, ...}: with conf; stages.exec { + inherit nextStage; + env = '' + export NANOS6_CONFIG_OVERRIDE="version.dependencies=regions" + ''; + }; + # Custom stage to copy the creams input dataset copyInput = {nextStage, conf, ...}: let @@ -78,7 +87,7 @@ let inherit cc mpi gitBranch; }; - pipeline = stdexp.stdPipeline ++ [ copyInput creams ]; + pipeline = stdexp.stdPipeline ++ [ nanos6Env copyInput creams ]; in diff --git a/garlic/exp/creams/ss+pure.nix b/garlic/exp/creams/ss+pure.nix index d58e74d..75bcf5f 100644 --- a/garlic/exp/creams/ss+pure.nix +++ b/garlic/exp/creams/ss+pure.nix @@ -38,6 +38,7 @@ let # Resources qos = "debug"; ntasksPerNode = hw.cpusPerNode; + cpusPerTask = 1; inherit (c.input) time nodes; jobName = unitName; }; @@ -47,6 +48,14 @@ let inherit varConf genConf; }; + # Use nanos6 with regions + nanos6Env = {nextStage, conf, ...}: with conf; stages.exec { + inherit nextStage; + env = '' + export NANOS6_CONFIG_OVERRIDE="version.dependencies=regions" + ''; + }; + # Custom stage to copy the creams input dataset copyInput = {nextStage, conf, ...}: let @@ -71,7 +80,7 @@ let inherit cc mpi gitBranch; }; - pipeline = stdexp.stdPipeline ++ [ copyInput creams ]; + pipeline = stdexp.stdPipeline ++ [ nanos6Env copyInput creams ]; in