From b5fb3730ace902d0eb8694fdd769da82eb33e4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Pe=C3=B1acoba?= <rpenacob@bsc.es>
Date: Thu, 8 Oct 2020 18:24:56 +0200
Subject: [PATCH] WIP: first serial experiment. Don't know how to add gcc to
 compile

---
 garlic/apps/hpcg/default.nix | 11 +++++------
 overlay.nix                  | 22 +++++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/garlic/apps/hpcg/default.nix b/garlic/apps/hpcg/default.nix
index 8ab7bec..f9e7f89 100644
--- a/garlic/apps/hpcg/default.nix
+++ b/garlic/apps/hpcg/default.nix
@@ -1,8 +1,5 @@
 {
   stdenv
-, nanos6
-, mpi
-, tampi
 , cc
 , gitBranch ? "garlic/seq"
 , makefileName ? "Linux_Serial"
@@ -21,12 +18,14 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    nanos6
-    mpi
-    tampi
     cc
   ];
 
+  makeFlags = [
+    "CC=${cc.cc.CC}"
+    "CXX=${cc.cc.CXX}"
+  ];
+
   enableParallelBuilding = true;
 
   configurePhase = ''
diff --git a/overlay.nix b/overlay.nix
index d117f2b..5191ecc 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -258,19 +258,23 @@ let
             hybrid = callPackage ./garlic/exp/creams/ss+hybrid.nix { };
           };
         };
-      };
 
-      test = {
-        exec = callPackage ./test/garlic/exec.nix {
-          exec = self.bsc.garlic.stages.exec;
+        hpcg = {
+          serial = callPackage ./garlic/exp/hpcg/serial.nix { };
         };
 
-        osu = rec {
-          latency-internode = callPackage ./garlic/exp/osu/latency.nix { };
-          latency-intranode = callPackage ./garlic/exp/osu/latency.nix {
-            interNode = false;
+        test = {
+          exec = callPackage ./test/garlic/exec.nix {
+            exec = self.bsc.garlic.stages.exec;
+          };
+
+          osu = rec {
+            latency-internode = callPackage ./garlic/exp/osu/latency.nix { };
+            latency-intranode = callPackage ./garlic/exp/osu/latency.nix {
+              interNode = false;
+            };
+            latency = latency-internode;
           };
-          latency = latency-internode;
         };
       };
     };