From cbc0ccc045e35c905f142f89358d9e34e566b09f Mon Sep 17 00:00:00 2001
From: Edoardo Zoni <ezoni@lbl.gov>
Date: Tue, 4 Mar 2025 10:58:56 -0800
Subject: [PATCH] NVHPC 25.1

---
 .github/workflows/cuda.yml              |  8 ++++----
 .github/workflows/dependencies/nvhpc.sh | 22 +++++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
index e533eed7e0d..c323db7131a 100644
--- a/.github/workflows/cuda.yml
+++ b/.github/workflows/cuda.yml
@@ -129,8 +129,8 @@ jobs:
         ccache -s
         du -hs ~/.cache/ccache
 
-  build_nvhpc24-1-nvcc:
-    name: NVHPC@24.1 NVCC/NVC++ Release [tests]
+  build_nvhpc:
+    name: NVHPC 25.1 NVCC/NVC++ Release [tests]
     runs-on: ubuntu-24.04
     if: github.event.pull_request.draft == false
     #env:
@@ -139,7 +139,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Dependencies
-      run: .github/workflows/dependencies/nvhpc.sh
+      run: .github/workflows/dependencies/nvhpc.sh 25.1
     - name: CCache Cache
       uses: actions/cache@v4
       with:
@@ -155,7 +155,7 @@ jobs:
         ccache -z
 
         source /etc/profile.d/modules.sh
-        module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/24.1
+        module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/25.1
         which nvcc || echo "nvcc not in PATH!"
         which nvc++ || echo "nvc++ not in PATH!"
         which nvc || echo "nvc not in PATH!"
diff --git a/.github/workflows/dependencies/nvhpc.sh b/.github/workflows/dependencies/nvhpc.sh
index 3533d6ca9f6..5c8774e8779 100755
--- a/.github/workflows/dependencies/nvhpc.sh
+++ b/.github/workflows/dependencies/nvhpc.sh
@@ -28,20 +28,24 @@ sudo apt install -y     \
 # ccache
 $(dirname "$0")/ccache.sh
 
-echo 'deb [trusted=yes] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | \
-  sudo tee /etc/apt/sources.list.d/nvhpc.list
-sudo apt update -y && \
-sudo apt install -y --no-install-recommends nvhpc-24-1 && \
-sudo rm -rf /var/lib/apt/lists/* && \
-  sudo rm -rf /opt/nvidia/hpc_sdk/Linux_x86_64/24.1/examples \
-              /opt/nvidia/hpc_sdk/Linux_x86_64/24.1/profilers \
-              /opt/nvidia/hpc_sdk/Linux_x86_64/24.1/math_libs/11.5/targets/x86_64-linux/lib/lib*_static*.a
+# parse version number from command line argument
+VERSION_DOTTED=${1-25.1} && VERSION_DASHED=$(sed 's/\./-/' <<< ${VERSION_DOTTED})
+
+curl https://developer.download.nvidia.com/hpc-sdk/ubuntu/DEB-GPG-KEY-NVIDIA-HPC-SDK | sudo gpg --dearmor -o /usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg
+echo 'deb [signed-by=/usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | sudo tee /etc/apt/sources.list.d/nvhpc.list
+sudo apt update -y
+sudo apt install -y --no-install-recommends nvhpc-${VERSION_DASHED} #&& \
+#sudo rm -rf /var/lib/apt/lists/* && \
+#  sudo rm -rf /opt/nvidia/hpc_sdk/Linux_x86_64/${VERSION_DOTTED}/examples \
+#              /opt/nvidia/hpc_sdk/Linux_x86_64/${VERSION_DOTTED}/profilers \
+#              /opt/nvidia/hpc_sdk/Linux_x86_64/${VERSION_DOTTED}/math_libs/11.5/targets/x86_64-linux/lib/lib*_static*.a
+ls -la /opt/nvidia/hpc_sdk/Linux_x86_64/${VERSION_DOTTED}/
 
 # things should reside in /opt/nvidia/hpc_sdk now
 
 # activation via:
 #   source /etc/profile.d/modules.sh
-#   module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/24.1
+#   module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/${VERSION_DOTTED}
 
 # cmake-easyinstall
 #