From 5920c964d2a981231113d24eb032b302cafc29ca Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Mon, 21 Sep 2020 19:23:17 +0200
Subject: [PATCH] saiph: fix hardening and affinity

---
 garlic/exp/saiph/numcomm.nix |  4 ++--
 garlic/saiph/default.nix     | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/garlic/exp/saiph/numcomm.nix b/garlic/exp/saiph/numcomm.nix
index 0bf21c5..384c346 100644
--- a/garlic/exp/saiph/numcomm.nix
+++ b/garlic/exp/saiph/numcomm.nix
@@ -22,7 +22,7 @@ let
     mpi = pkgs.bsc.impi;
 
     # Resources
-    ntasksPerSocket = "1";
+    ntasksPerNode = "2";
     nodes = "2";
 
     # Stage configuration
@@ -50,7 +50,7 @@ let
     time = "02:00:00";
     qos = "debug";
     jobName = "saiph";
-    inherit nixPrefix nodes ntasksPerSocket;
+    inherit nixPrefix nodes ntasksPerNode;
   };
 
   control = {stage, conf, ...}: with conf; w.control {
diff --git a/garlic/saiph/default.nix b/garlic/saiph/default.nix
index 4f04f40..c4c646a 100644
--- a/garlic/saiph/default.nix
+++ b/garlic/saiph/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   
   programPath = "/bin/ExHeat3D";
 
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
   dontStrip = true;
   enableDebugging = true;
 
@@ -35,15 +35,14 @@ stdenv.mkDerivation rec {
     boost
   ];
 
-  hardeningDisable = [ "all" ];
+  # Required for nanos6
+  hardeningDisable = [ "bindnow" ];
   
-  hardeningEnable = [ "stackprotector" ];
-
-  postPatch = ''
-    
-    sed -i 's/^SANITIZE_FLAGS=/SANITIZE_FLAGS=$(DEBUG_FLAGS)/g' \
-      saiphv2/cpp/src/Makefile.clang
-  '';
+#  Enable debug
+#  postPatch = ''
+#    sed -i 's/^SANITIZE_FLAGS=/SANITIZE_FLAGS=$(DEBUG_FLAGS)/g' \
+#      saiphv2/cpp/src/Makefile.clang
+#  '';
 
   preBuild = ''
     cd saiphv2/cpp/src