saiph: fix hardening and affinity

This commit is contained in:
Rodrigo Arias 2020-09-21 19:23:17 +02:00
parent cc101ad1d3
commit 5920c964d2
2 changed files with 10 additions and 11 deletions

View File

@ -22,7 +22,7 @@ let
mpi = pkgs.bsc.impi; mpi = pkgs.bsc.impi;
# Resources # Resources
ntasksPerSocket = "1"; ntasksPerNode = "2";
nodes = "2"; nodes = "2";
# Stage configuration # Stage configuration
@ -50,7 +50,7 @@ let
time = "02:00:00"; time = "02:00:00";
qos = "debug"; qos = "debug";
jobName = "saiph"; jobName = "saiph";
inherit nixPrefix nodes ntasksPerSocket; inherit nixPrefix nodes ntasksPerNode;
}; };
control = {stage, conf, ...}: with conf; w.control { control = {stage, conf, ...}: with conf; w.control {

View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
programPath = "/bin/ExHeat3D"; programPath = "/bin/ExHeat3D";
enableParallelBuilding = false; enableParallelBuilding = true;
dontStrip = true; dontStrip = true;
enableDebugging = true; enableDebugging = true;
@ -35,15 +35,14 @@ stdenv.mkDerivation rec {
boost boost
]; ];
hardeningDisable = [ "all" ]; # Required for nanos6
hardeningDisable = [ "bindnow" ];
hardeningEnable = [ "stackprotector" ]; # Enable debug
# postPatch = ''
postPatch = '' # sed -i 's/^SANITIZE_FLAGS=/SANITIZE_FLAGS=$(DEBUG_FLAGS)/g' \
# saiphv2/cpp/src/Makefile.clang
sed -i 's/^SANITIZE_FLAGS=/SANITIZE_FLAGS=$(DEBUG_FLAGS)/g' \ # '';
saiphv2/cpp/src/Makefile.clang
'';
preBuild = '' preBuild = ''
cd saiphv2/cpp/src cd saiphv2/cpp/src