From b9e9409a59f3579a617dd64c0912b29ba6fc05f1 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias <rodrigo.arias@bsc.es>
Date: Mon, 10 Aug 2020 14:13:28 +0200
Subject: [PATCH] Success sbatch launch in MN4 with nbody seq

---
 bsc/garlic/default.nix       |  8 +++++++-
 bsc/garlic/dispatcher.nix    |  2 +-
 bsc/garlic/nbody/default.nix | 15 ++++++++++++++-
 bsc/garlic/srunner.nix       |  9 ++++-----
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/bsc/garlic/default.nix b/bsc/garlic/default.nix
index 8518514..90b2ad2 100644
--- a/bsc/garlic/default.nix
+++ b/bsc/garlic/default.nix
@@ -65,7 +65,13 @@ let
       };
 
       nbodyBSjob = callPackage ./dispatcher.nix {
-        jobs = map (app: srunner {app=app;}) (
+        jobs = map (app: srunner {
+            app=app;
+            prefix="/gpfs/projects/bsc15/nix";
+            exclusive=false;
+            ntasks = "1";
+          }
+        ) (
           genApp nbody (
             genConfigs {
               cc = [ bsc.icc ];
diff --git a/bsc/garlic/dispatcher.nix b/bsc/garlic/dispatcher.nix
index 4594b34..6400916 100644
--- a/bsc/garlic/dispatcher.nix
+++ b/bsc/garlic/dispatcher.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
     mkdir -p $out/bin
     cat > $out/bin/execute-all-jobs <<EOF
-    #!/bin/bash
+    #!/bin/sh
 
     for j in $out/jobs/*; do
       echo "sbatch \$j"
diff --git a/bsc/garlic/nbody/default.nix b/bsc/garlic/nbody/default.nix
index 7199dde..e4b96c1 100644
--- a/bsc/garlic/nbody/default.nix
+++ b/bsc/garlic/nbody/default.nix
@@ -29,12 +29,25 @@ stdenv.mkDerivation {
     "BS=${toString blocksize}"
   ];
 
+  dontPatchShebangs = true;
+
   installPhase = ''
     mkdir -p $out/bin
     cp nbody $out/bin/
 
     cat > $out/bin/run <<EOF
-    #!/bin/bash
+    #!/bin/sh
+
+    # We need to enter the nix namespace first, in order to have /nix
+    # available, so we use this hack:
+    if [ ! -e /nix ]; then
+      echo "running nix-setup \$0"
+      exec nix-setup \$0
+    fi
+
+    ls -l /nix
+    pwd
+
     exec $out/bin/nbody -p ${toString particles} -t ${toString timesteps}
     EOF
 
diff --git a/bsc/garlic/srunner.nix b/bsc/garlic/srunner.nix
index a18648d..17a7454 100644
--- a/bsc/garlic/srunner.nix
+++ b/bsc/garlic/srunner.nix
@@ -5,6 +5,7 @@
 
 {
   app
+, prefix ? ""
 , argv ? ""
 , binary ? "/bin/run"
 , ntasks ? null
@@ -55,11 +56,9 @@ stdenv.mkDerivation rec {
     + sbatchOpt "time" time
     + sbatchOpt "qos" qos
     + optionalString (extra!=null) extra
-    +''
-    
-    ${numactl}/bin/numactl -s
-
-    srun ${app}${binary} ${argv}
+    +
+    ''
+    srun ${prefix}${app}${binary} ${argv}
     EOF
   '';
 }