From 58e6c76349dce84ef2751569869fdaef01c84f73 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Tue, 22 Sep 2020 17:41:40 +0200
Subject: [PATCH] Move apps to garlic

---
 {bsc/apps => garlic}/cpic/default.nix   |  0
 {bsc/apps => garlic}/creams/default.nix |  0
 {bsc/apps => garlic}/fwi/default.nix    |  0
 {bsc/apps => garlic}/heat/default.nix   |  0
 {bsc/apps => garlic}/hpccg/default.nix  |  0
 {bsc/apps => garlic}/hpcg/default.nix   |  0
 {bsc/apps => garlic}/hpcg/tampi.patch   |  0
 {bsc/apps => garlic}/lulesh/default.nix |  0
 garlic/mkDerivation.nix                 | 19 +++++++++++
 overlay.nix                             | 43 +++++++++++++++++++------
 10 files changed, 53 insertions(+), 9 deletions(-)
 rename {bsc/apps => garlic}/cpic/default.nix (100%)
 rename {bsc/apps => garlic}/creams/default.nix (100%)
 rename {bsc/apps => garlic}/fwi/default.nix (100%)
 rename {bsc/apps => garlic}/heat/default.nix (100%)
 rename {bsc/apps => garlic}/hpccg/default.nix (100%)
 rename {bsc/apps => garlic}/hpcg/default.nix (100%)
 rename {bsc/apps => garlic}/hpcg/tampi.patch (100%)
 rename {bsc/apps => garlic}/lulesh/default.nix (100%)
 create mode 100644 garlic/mkDerivation.nix

diff --git a/bsc/apps/cpic/default.nix b/garlic/cpic/default.nix
similarity index 100%
rename from bsc/apps/cpic/default.nix
rename to garlic/cpic/default.nix
diff --git a/bsc/apps/creams/default.nix b/garlic/creams/default.nix
similarity index 100%
rename from bsc/apps/creams/default.nix
rename to garlic/creams/default.nix
diff --git a/bsc/apps/fwi/default.nix b/garlic/fwi/default.nix
similarity index 100%
rename from bsc/apps/fwi/default.nix
rename to garlic/fwi/default.nix
diff --git a/bsc/apps/heat/default.nix b/garlic/heat/default.nix
similarity index 100%
rename from bsc/apps/heat/default.nix
rename to garlic/heat/default.nix
diff --git a/bsc/apps/hpccg/default.nix b/garlic/hpccg/default.nix
similarity index 100%
rename from bsc/apps/hpccg/default.nix
rename to garlic/hpccg/default.nix
diff --git a/bsc/apps/hpcg/default.nix b/garlic/hpcg/default.nix
similarity index 100%
rename from bsc/apps/hpcg/default.nix
rename to garlic/hpcg/default.nix
diff --git a/bsc/apps/hpcg/tampi.patch b/garlic/hpcg/tampi.patch
similarity index 100%
rename from bsc/apps/hpcg/tampi.patch
rename to garlic/hpcg/tampi.patch
diff --git a/bsc/apps/lulesh/default.nix b/garlic/lulesh/default.nix
similarity index 100%
rename from bsc/apps/lulesh/default.nix
rename to garlic/lulesh/default.nix
diff --git a/garlic/mkDerivation.nix b/garlic/mkDerivation.nix
new file mode 100644
index 0000000..31b3e02
--- /dev/null
+++ b/garlic/mkDerivation.nix
@@ -0,0 +1,19 @@
+{ lib }:
+
+let inherit (lib) optional; in
+
+mkDerivation:
+
+args:
+
+let
+  args_ = {
+
+    enableParallelBuilding = args.enableParallelBuilding or true;
+
+    hardeningDisable = [ "all" ];
+
+  };
+in
+
+mkDerivation (args // args_)
diff --git a/overlay.nix b/overlay.nix
index da0f5fd..d367137 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -128,11 +128,33 @@ let
       # Load some helper functions to generate app variants
       inherit (import ./garlic/gen.nix) genApps genApp genConfigs;
 
-      mpptest = callPackage ./garlic/mpptest { };
+      # Override the hardening flags and parallel build by default (TODO)
+      #mkDerivation = callPackage ./garlic/mkDerivation.nix { };
 
-      ppong = callPackage ./garlic/ppong {
-        mpi = self.bsc.mpi;
-      };
+      # Apps for Garlic
+#      heat = callPackage ./garlic/heat {
+#        stdenv = pkgs.gcc7Stdenv;
+#        mpi = intel-mpi;
+#        tampi = tampi;
+#      };
+#
+#      creams = callPackage ./garlic/creams {
+#        stdenv = pkgs.gcc9Stdenv;
+#        mpi = intel-mpi;
+#        tampi = tampi.override {
+#          mpi = intel-mpi;
+#        };
+#      };
+#
+#      lulesh = callPackage ./garlic/lulesh {
+#        mpi = intel-mpi;
+#      };
+#
+#      hpcg = callPackage ./garlic/hpcg { };
+#
+#      hpccg = callPackage ./garlic/hpccg { };
+#
+#      fwi = callPackage ./garlic/fwi { };
 
       nbody = callPackage ./garlic/nbody {
         cc = self.bsc.icc;
@@ -158,13 +180,16 @@ let
         extrae    = callPackage ./garlic/stages/extrae.nix { };
         stagen    = callPackage ./garlic/stages/stagen.nix { };
         perf      = callPackage ./garlic/stages/perf.nix { };
+        broom     = callPackage ./garlic/stages/broom.nix { };
+        envRecord = callPackage ./garlic/stages/envRecord.nix { };
       };
 
-      # Perf is tied to a linux kernel specific version
-      #linuxPackages = self.linuxPackages_4_4;
-      #perfWrapper = callPackage ./garlic/perf.nix {
-      #  perf = self.linuxPackages.perf;
-      #};
+      # Tests (move to bsc ?)
+      mpptest = callPackage ./garlic/mpptest { };
+
+      ppong = callPackage ./garlic/ppong {
+        mpi = self.bsc.mpi;
+      };
 
       exp = {
         noise = callPackage ./garlic/exp/noise.nix { };