From a44042615a14436cc0c499f47bfd99393b2ffd8c 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 17:42:17 +0200
Subject: [PATCH] WIP

---
 garlic/apps/hpcg/default.nix | 17 ++++++-------
 overlay.nix                  | 48 ++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/garlic/apps/hpcg/default.nix b/garlic/apps/hpcg/default.nix
index f311804..8ab7bec 100644
--- a/garlic/apps/hpcg/default.nix
+++ b/garlic/apps/hpcg/default.nix
@@ -2,40 +2,37 @@
   stdenv
 , nanos6
 , mpi
-, mcxx
 , tampi
-, icc
+, cc
+, gitBranch ? "garlic/seq"
+, makefileName ? "Linux_Serial"
 }:
 
 stdenv.mkDerivation rec {
   name = "hpcg";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/rpenacob/hpcg.git";
-    ref = "symgs_coloring_more_than_one_block_per_task_halos_blocking_discreete";
+    url = "ssh://git@bscpm02.bsc.es/rpenacob/garlic-hpcg.git";
+    ref = "${gitBranch}";
   };
 
   prePatch = ''
     #export NIX_DEBUG=6
   '';
 
-  patches = [ ./tampi.patch ];
-
   buildInputs = [
     nanos6
     mpi
-    icc
     tampi
-    mcxx
+    cc
   ];
 
   enableParallelBuilding = true;
 
   configurePhase = ''
-    export TAMPI_HOME=${tampi}
     mkdir build
     cd build
-    ../configure MPI_ICPC_OSS
+    ../configure ${makefileName}
   '';
 
   installPhase = ''
diff --git a/overlay.nix b/overlay.nix
index 69b9a3e..d117f2b 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -172,19 +172,6 @@ let
       # Apps for Garlic
 
       apps = {
-        creams = callPackage ./garlic/apps/creams/default.nix {
-          gnuDef   = self.gfortran10 ; # Default GNU   compiler version
-          intelDef = self.bsc.icc    ; # Default Intel compiler version
-
-          gitBranch = "garlic/mpi+send+seq";
-
-          cc  = self.bsc.icc; # self.bsc.icc OR self.gfortran10;
-          mpi = self.bsc.mpi; # self.bsc.mpi OR self.bsc.openmpi-mn4;
-        };
-
-        creamsInput = callPackage ./garlic/apps/creams/input.nix {
-          gitBranch = "garlic/mpi+send+seq";
-        };
 
         nbody = callPackage ./garlic/apps/nbody/default.nix {
           cc = self.bsc.icc;
@@ -198,6 +185,23 @@ let
           cc = self.bsc.clangOmpss2;
         };
 
+        creams = callPackage ./garlic/apps/creams/default.nix {
+          gnuDef   = self.gfortran10 ; # Default GNU   compiler version
+          intelDef = self.bsc.icc    ; # Default Intel compiler version
+          gitBranch = "garlic/mpi+send+seq";
+          cc  = self.bsc.icc; # self.bsc.icc OR self.gfortran10;
+          mpi = self.bsc.mpi; # self.bsc.mpi OR self.bsc.openmpi-mn4;
+        };
+
+        creamsInput = callPackage ./garlic/apps/creams/input.nix {
+          gitBranch = "garlic/mpi+send+seq";
+        };
+
+        hpcg = callPackage ./garlic/hpcg {
+          cc = self.bsc.icc;
+          gitBranch = "garlic/seq";
+        };
+
 #        heat = callPackage ./garlic/apps/heat {
 #          stdenv = pkgs.gcc7Stdenv;
 #          mpi = intel-mpi;
@@ -208,8 +212,6 @@ let
 #          mpi = intel-mpi;
 #        };
 #  
-#        hpcg = callPackage ./garlic/apps/hpcg { };
-#  
 #        hpccg = callPackage ./garlic/apps/hpccg { };
 #  
 #        fwi = callPackage ./garlic/apps/fwi { };
@@ -257,11 +259,19 @@ let
           };
         };
       };
-    };
 
-    test = {
-      exec = callPackage ./test/garlic/exec.nix {
-        exec = self.bsc.garlic.stages.exec;
+      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;
+        };
       };
     };
   };