From a5af7890b843c9e0002abf8aebfce74ca4cc46a9 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Tue, 13 Jul 2021 12:37:04 +0200
Subject: [PATCH 1/3] bsc: add GPI-2 and TAGASPI

---
 bsc/gpi-2/default.nix   | 38 ++++++++++++++++++++++++++++++++++
 bsc/tagaspi/default.nix | 46 +++++++++++++++++++++++++++++++++++++++++
 overlay.nix             | 10 +++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 bsc/gpi-2/default.nix
 create mode 100644 bsc/tagaspi/default.nix

diff --git a/bsc/gpi-2/default.nix b/bsc/gpi-2/default.nix
new file mode 100644
index 00000000..425fe460
--- /dev/null
+++ b/bsc/gpi-2/default.nix
@@ -0,0 +1,38 @@
+{
+  stdenv
+, slurm
+, rdma-core
+, autoconf
+, automake
+, libtool
+, mpi
+, rsync
+, gfortran
+}:
+
+stdenv.mkDerivation rec {
+  pname = "GPI-2";
+  version = src.shortRev;
+
+  src = builtins.fetchGit {
+    url = "ssh://git@bscpm03.bsc.es/interoperability/GPI-2";
+    ref = "lowlevel";
+  };
+
+  preConfigure = ''
+    patchShebangs autogen.sh
+    ./autogen.sh
+  '';
+
+  configureFlags = [
+    "--with-infiniband=${rdma-core}"
+    "--with-mpi=${mpi}"
+    "--with-slurm"
+    "CFLAGS=-fPIC"
+    "CXXFLAGS=-fPIC"
+  ];
+
+  buildInputs = [ slurm mpi rdma-core autoconf automake libtool rsync gfortran ];
+
+  hardeningDisable = [ "all" ];
+}
diff --git a/bsc/tagaspi/default.nix b/bsc/tagaspi/default.nix
new file mode 100644
index 00000000..21e90193
--- /dev/null
+++ b/bsc/tagaspi/default.nix
@@ -0,0 +1,46 @@
+{
+  stdenv
+, automake
+, autoconf
+, libtool
+, mpi
+, autoreconfHook
+, gaspi
+, boost
+, numactl
+, rdma-core
+, gfortran
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tagaspi";
+  version = src.shortRev;
+  enableParallelBuilding = false;
+
+  buildInputs = [
+    autoreconfHook
+    automake
+    autoconf
+    libtool
+    boost
+    mpi
+    numactl
+    rdma-core
+    gfortran
+  ];
+
+  dontDisableStatic = true;
+
+  configureFlags = [
+    "--with-gaspi=${gaspi}"
+    "CFLAGS=-fPIC"
+    "CXXFLAGS=-fPIC"
+  ];
+
+  src = builtins.fetchGit {
+    url = "ssh://git@bscpm03.bsc.es/interoperability/tagaspi";
+    ref = "master";
+  };
+
+  hardeningDisable = [ "all" ];
+}
diff --git a/overlay.nix b/overlay.nix
index dc990c9b..6186f7a9 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -134,6 +134,16 @@ let
     tampiRelease = callPackage ./bsc/tampi/default.nix { };
     tampiGit = callPackage ./bsc/tampi/git.nix { };
 
+    # =================================================================
+    #  GASPI
+    # =================================================================
+    gpi-2 = callPackage ./bsc/gpi-2/default.nix { };
+
+    # Use GPI-2 as the default implementation for GASPI
+    gaspi = bsc.gpi-2;
+
+    tagaspi = callPackage ./bsc/tagaspi/default.nix { };
+
     # =================================================================
     #  Tracing
     # =================================================================
-- 
GitLab


From f74446b225cadc30eccb2d9a53143ce5bad905ff Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Tue, 5 Apr 2022 15:33:30 +0100
Subject: [PATCH 2/3] gpi-2: use last tagaspi tag

---
 bsc/gpi-2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bsc/gpi-2/default.nix b/bsc/gpi-2/default.nix
index 425fe460..ef7ce9d9 100644
--- a/bsc/gpi-2/default.nix
+++ b/bsc/gpi-2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = builtins.fetchGit {
     url = "ssh://git@bscpm03.bsc.es/interoperability/GPI-2";
-    ref = "lowlevel";
+    ref = "refs/tags/tagaspi-2021.11";
   };
 
   preConfigure = ''
-- 
GitLab


From 2227f08814d60344b8e38309b1937b79be80004c Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Tue, 5 Apr 2022 15:34:10 +0100
Subject: [PATCH 3/3] gpi-2 and tagaspi: enable parallel build

---
 bsc/gpi-2/default.nix   | 2 ++
 bsc/tagaspi/default.nix | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bsc/gpi-2/default.nix b/bsc/gpi-2/default.nix
index ef7ce9d9..a885e029 100644
--- a/bsc/gpi-2/default.nix
+++ b/bsc/gpi-2/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
     ref = "refs/tags/tagaspi-2021.11";
   };
 
+  enableParallelBuilding = true;
+
   preConfigure = ''
     patchShebangs autogen.sh
     ./autogen.sh
diff --git a/bsc/tagaspi/default.nix b/bsc/tagaspi/default.nix
index 21e90193..de893eb0 100644
--- a/bsc/tagaspi/default.nix
+++ b/bsc/tagaspi/default.nix
@@ -15,7 +15,7 @@
 stdenv.mkDerivation rec {
   pname = "tagaspi";
   version = src.shortRev;
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   buildInputs = [
     autoreconfHook
-- 
GitLab