From 39a639ac1028e7fceff180618864ac74d5301b10 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias <rodrigo.arias@bsc.es>
Date: Tue, 4 Aug 2020 11:51:09 +0200
Subject: [PATCH] Testing SLURM jobs with ppong

---
 bsc/garlic/default.nix | 10 ++++++++++
 bsc/garlic/srunner.nix | 12 ++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/bsc/garlic/default.nix b/bsc/garlic/default.nix
index 5753b89..bdc0ede 100644
--- a/bsc/garlic/default.nix
+++ b/bsc/garlic/default.nix
@@ -28,6 +28,16 @@ let
     ppong-job = srunner { app=ppong; };
 
     exp = {
+      jobs = callPackage ./experiments {
+        apps = map (app: srunner {app=app;}) (
+          genApps [ ppong ] (
+            genConfigs {
+              mpi = [ bsc.intel-mpi pkgs.mpich pkgs.openmpi ];
+            }
+          )
+        );
+      };
+
       mpiImpl = callPackage ./experiments {
         apps = genApps [ ppong ] (
           genConfigs {
diff --git a/bsc/garlic/srunner.nix b/bsc/garlic/srunner.nix
index 08c99f3..46c0765 100644
--- a/bsc/garlic/srunner.nix
+++ b/bsc/garlic/srunner.nix
@@ -1,5 +1,6 @@
 {
   stdenv
+, numactl
 }:
 
 {
@@ -41,7 +42,8 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
-    cat > $out <<EOF
+    mkdir -p $out/bin
+    cat > $out/bin/run <<EOF
     #!/bin/bash
     #SBATCH --job-name="${name}"
     ''
@@ -56,13 +58,11 @@ stdenv.mkDerivation rec {
     + optionalString (extra!=null) extra
     +''
     
-    numactl -s
+    ${numactl}/bin/numactl -s
 
-    #!/bin/bash
-    exec ${app}${binary} ${argv}
-    done
+    srun ${app}${binary} ${argv}
     EOF
 
-    chmod +x $out
+    chmod +x $out/bin/run
   '';
 }