From 338736d25781d4461b55777a330afa9dc480caa8 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias <rodrigo.arias@bsc.es>
Date: Tue, 11 Aug 2020 12:05:43 +0200
Subject: [PATCH] Add control and nix-setup layers

---
 bsc/garlic/control.nix       | 23 +++++++++++++++++++++++
 bsc/garlic/default.nix       |  2 ++
 bsc/garlic/exp/nbody/bs.nix  |  4 +++-
 bsc/garlic/nbody/default.nix | 10 ----------
 bsc/garlic/nix-setup.nix     | 29 +++++++++++++++++++++++++++++
 5 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 bsc/garlic/control.nix
 create mode 100644 bsc/garlic/nix-setup.nix

diff --git a/bsc/garlic/control.nix b/bsc/garlic/control.nix
new file mode 100644
index 0000000..cee9edb
--- /dev/null
+++ b/bsc/garlic/control.nix
@@ -0,0 +1,23 @@
+{
+  stdenv
+}:
+
+program:
+
+stdenv.mkDerivation {
+  inherit program;
+  name = "${program.name}-control";
+  preferLocalBuild = true;
+  phases = [ "installPhase" ];
+  dontPatchShebangs = true;
+  installPhase = ''
+    mkdir -p $out/bin
+    cat > $out/bin/run <<EOF
+    #!/bin/sh
+    for n in {1..30}; do
+      $program/bin/run
+    done
+    EOF
+    chmod +x $out/bin/run
+  '';
+}
diff --git a/bsc/garlic/default.nix b/bsc/garlic/default.nix
index 191da96..626ad70 100644
--- a/bsc/garlic/default.nix
+++ b/bsc/garlic/default.nix
@@ -25,6 +25,8 @@ let
 
     sbatch = callPackage ./sbatch.nix { };
     launcher = callPackage ./launcher.nix { };
+    control = callPackage ./control.nix { };
+    nixsetup = callPackage ./nix-setup.nix { };
 
     exp = {
       nbody = {
diff --git a/bsc/garlic/exp/nbody/bs.nix b/bsc/garlic/exp/nbody/bs.nix
index 9a32b26..5d0670a 100644
--- a/bsc/garlic/exp/nbody/bs.nix
+++ b/bsc/garlic/exp/nbody/bs.nix
@@ -5,6 +5,8 @@
 , genConfigs
 , sbatch
 , launcher
+, control
+, nixsetup
 }:
 
 let
@@ -22,7 +24,7 @@ let
   # Job generator helper function
   genJobs = map (app:
     sbatch {
-      app = app;
+      app = (nixsetup (control app));
       nixPrefix = "/gpfs/projects/bsc15/nix";
       exclusive = false;
       ntasks = "1";
diff --git a/bsc/garlic/nbody/default.nix b/bsc/garlic/nbody/default.nix
index e4b96c1..f7430e4 100644
--- a/bsc/garlic/nbody/default.nix
+++ b/bsc/garlic/nbody/default.nix
@@ -38,16 +38,6 @@ stdenv.mkDerivation {
     cat > $out/bin/run <<EOF
     #!/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/nix-setup.nix b/bsc/garlic/nix-setup.nix
new file mode 100644
index 0000000..8ae89bc
--- /dev/null
+++ b/bsc/garlic/nix-setup.nix
@@ -0,0 +1,29 @@
+{
+  stdenv
+}:
+
+program:
+
+stdenv.mkDerivation {
+  inherit program;
+  name = "${program.name}-nixsetup";
+  preferLocalBuild = true;
+  phases = [ "installPhase" ];
+  dontPatchShebangs = true;
+  installPhase = ''
+    mkdir -p $out/bin
+    cat > $out/bin/run <<EOF
+    #!/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
+      >&2 echo "running nix-setup \$0"
+      exec nix-setup \$0
+    fi
+
+    exec $program/bin/run
+    EOF
+    chmod +x $out/bin/run
+  '';
+}