From 65dc303b3d361644b54eb2f831b5d02170101ab0 Mon Sep 17 00:00:00 2001
From: Igor Sfiligoi <isfiligoi@sdsc.edu>
Date: Mon, 12 Dec 2022 09:29:49 -0800
Subject: [PATCH 1/3] Remove install dir

---
 scripts/install_hpc_sdk.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/install_hpc_sdk.sh b/scripts/install_hpc_sdk.sh
index 5e79bf8..1a8a722 100755
--- a/scripts/install_hpc_sdk.sh
+++ b/scripts/install_hpc_sdk.sh
@@ -123,4 +123,7 @@ source $PWD/setup_scripts/setup_nv_hpc_bins.sh
 PATH=${PWD}/conda_h5:\$PATH
 EOF
 
+# we don't need the install dir anymore
+rm -fr nvhpc_*
+
 echo "Setup script avaiabile in $PWD/setup_nv_h5.sh"

From 97c6d51aa58291d2cb578cc66ffe00ef082856ce Mon Sep 17 00:00:00 2001
From: Igor Sfiligoi <isfiligoi@sdsc.edu>
Date: Mon, 12 Dec 2022 10:47:50 -0800
Subject: [PATCH 2/3] Do not unpack things we do not use for unifrac in default
 mode

---
 scripts/install_hpc_sdk.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/install_hpc_sdk.sh b/scripts/install_hpc_sdk.sh
index 1a8a722..5ce6382 100755
--- a/scripts/install_hpc_sdk.sh
+++ b/scripts/install_hpc_sdk.sh
@@ -41,6 +41,7 @@ if [ "x${NV_URL}" == "x" ]; then
   NV_URL=https://developer.download.nvidia.com/hpc-sdk/21.7/nvhpc_2021_217_Linux_x86_64_cuda_multi.tar.gz
 fi
 
+echo "Downloading the NVIDIA HPC SDK"
 # Defaults to using curl
 # set USE_CURL=N if you want to use aria2 or wget
 if [ "x${USE_CURL}" == "x" ]; then
@@ -51,7 +52,8 @@ if [ "x${USE_CURL}" == "x" ]; then
     tar xpzf nvhpc.tgz
     rm -f nvhpc.tgz
   else
-    curl "${NV_URL}" | tar xpzf -
+    # Do not unpack things we do not use for unifrac
+    curl -s "${NV_URL}" | tar xpzf - --exclude '*libcublas*' --exclude '*libcufft*' --exclude '*libcusparse*' --exclude '*libcusolver*' --exclude '*libcurand*' --exclude '*profilers*' --exclude '*comm_libs*' --exclude '*/doc/*' --exclude '*/plugin*'
   fi
 elif [ "x${USE_ARIA2}" == "x" ]; then
   aria2c "${NV_URL}"
@@ -63,6 +65,8 @@ else
   rm -f nvhpc_*.tar.gz
 fi
 
+echo "Installing NVIDIA HPC SDK"
+
 # must patch the install scripts to find the right gcc
 for f in nvhpc_*/install_components/install nvhpc_*/install_components/*/*/compilers/bin/makelocalrc nvhpc_*/install_components/install_cuda; do
   sed -i -e "s#PATH=/#PATH=$PWD/conda_nv_bins:/#g" $f

From 9ee8cc011e5cdde716cfeee93538bdb8d156dd02 Mon Sep 17 00:00:00 2001
From: Igor Sfiligoi <isfiligoi@sdsc.edu>
Date: Mon, 12 Dec 2022 10:48:41 -0800
Subject: [PATCH 3/3] Do no hide errors

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a22e380..d6d0a2f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -56,7 +56,7 @@ jobs:
         which h5c++
         if [[ "$(uname -s)" == "Linux" ]];
         then
-          ./scripts/install_hpc_sdk.sh >/dev/null 2>/dev/null </dev/null
+          ./scripts/install_hpc_sdk.sh </dev/null
           source setup_nv_h5.sh
         fi
         df -h .