set NVHPC_CUDA_HOME to /cuda/<cuda_ver>

rapidsai · Oct 2, 2024 · 49aa876 · 49aa876
1 parent 7123581
commit 49aa876
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/features/src/nvhpc/devcontainer-feature.json b/features/src/nvhpc/devcontainer-feature.json
@@ -1,12 +1,14 @@
 {
   "name": "NVHPC SDK",
   "id": "nvhpc",
-  "version": "24.12.0",
+  "version": "24.12.1",
   "description": "A feature to install the NVHPC SDK",
   "options": {
     "version": {
       "type": "string",
       "proposals": [
+        "24.9",
+        "24.7",
         "24.5",
         "24.3",
         "24.1",
@@ -20,7 +22,7 @@
         "22.9",
         "22.7"
       ],
-      "default": "24.5",
+      "default": "24.9",
       "description": "Version of NVHPC SDK to install."
     }
   },

diff --git a/features/src/nvhpc/install.sh b/features/src/nvhpc/install.sh
@@ -58,7 +58,7 @@ check_packages ${pkgs[@]};
 export NVHPC="/opt/nvidia/hpc_sdk";
 export NVHPC_VERSION="${NVHPC_VERSION}";
 export NVHPC_ROOT="${NVHPC}/Linux_$(uname -p)/${NVHPC_VERSION}";
-export NVHPC_CUDA_HOME="${NVHPC_ROOT}/cuda";
+export NVHPC_CUDA_HOME="$(dirname "$(find "$NVHPC_ROOT/cuda" -type f -name 'version.json' | head -n1)")";
 export NVHPC_MODULEFILE_DIRS="($(find "${NVHPC}/" -type d -name modulefiles -exec echo -n \"{}\"\  \;))";
 
 if ! test -L /usr/local/cuda; then

diff --git a/features/test/nvhpc/test.sh b/features/test/nvhpc/test.sh
@@ -24,7 +24,7 @@ module list 1>&2
 
 # Feature-specific tests
 # The 'check' command comes from the dev-container-features-test-lib.
-check "version" bash -c "echo '$NVHPC_VERSION' | grep '24.5'"
+check "version" bash -c "echo '$NVHPC_VERSION' | grep '24.9'"
 check "installed" stat /opt/nvidia/hpc_sdk
 check "nvc++ exists and is on path" which nvc++
 check "mpic++ exists and is on path" which mpic++