cuda 12.3 to 12.5 support

devcontainers · Sep 16, 2024 · 4276368 · 4276368
1 parent 0b53c1b
commit 4276368
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 12 deletions.
diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
@@ -77,13 +77,6 @@
         "9.2.0.82",
         "9.2.1.18",
         "9.3.0.75",
-        "9.4.0.58",
-        "9.0.0.312",
-        "9.1.0.70",
-        "9.1.1.17",
-        "9.2.0.82",
-        "9.2.1.18",
-        "9.3.0.75",
         "9.4.0.58"
       ],
       "default": "8.6.0.163",

diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh
@@ -59,6 +59,8 @@ apt-get update -yq
 cuda_pkg="cuda-libraries-${CUDA_VERSION/./-}"
 nvtx_pkg="cuda-nvtx-${CUDA_VERSION/./-}"
 toolkit_pkg="cuda-toolkit-${CUDA_VERSION/./-}"
+major_cudnn_version=$(echo "${CUDNN_VERSION}" | cut -d '.' -f 1)
+major_cuda_version=$(echo "${CUDA_VERSION}" | cut -d '.' -f 1)
 if ! apt-cache show "$cuda_pkg"; then
     echo "The requested version of CUDA is not available: CUDA $CUDA_VERSION"
     exit 1
@@ -68,14 +70,12 @@ echo "Installing CUDA libraries..."
 apt-get install -yq "$cuda_pkg"
 
 if [ "$INSTALL_CUDNN" = "true" ]; then
-    major_cudnn_version=$(echo "${CUDNN_VERSION}" | cut -d '.' -f 1)
     # Ensure that the requested version of cuDNN is available AND compatible
     #if major cudnn version is 9, then we need to install libcudnn9-cuda-<major_version> package
     #else we need to install libcudnn8-cuda-<major_version> package
     if [[ $major_cudnn_version = "9" ]]
     then
-        major_version=$(echo "${CUDA_VERSION}" | cut -d '.' -f 1)
-        cudnn_pkg_version="libcudnn9=libcudnn9-cuda-${major_version} ${CUDNN_VERSION}-1"
+        cudnn_pkg_version="libcudnn9-cuda-${major_cuda_version}=${CUDNN_VERSION}-1"
     else
         cudnn_pkg_version="libcudnn8=${CUDNN_VERSION}-1+cuda${CUDA_VERSION}"
     fi
@@ -91,7 +91,13 @@ fi
 
 if [ "$INSTALL_CUDNNDEV" = "true" ]; then
     # Ensure that the requested version of cuDNN development package is available AND compatible
-    cudnn_dev_pkg_version="libcudnn8-dev=${CUDNN_VERSION}-1+cuda${CUDA_VERSION}"
+    if [[ $major_cudnn_version = "9" ]]
+    then
+        cudnn_dev_pkg_version="libcudnn9-dev-cuda-${major_cuda_version}=${CUDNN_VERSION}-1"
+    else
+        cudnn_dev_pkg_version="libcudnn8-dev=${CUDNN_VERSION}-1+cuda${CUDA_VERSION}"
+    fi
+
     if ! apt-cache show "$cudnn_dev_pkg_version"; then
         echo "The requested version of cuDNN development package is not available: cuDNN $CUDNN_VERSION for CUDA $CUDA_VERSION"
         exit 1

diff --git a/test/nvidia-cuda/install_cudnn_123_version.sh b/test/nvidia-cuda/install_cudnn_123_version.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check installation of libcudnn9-cuda-12 (9.4.0)
+check "libcudnn.so.9.4.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.4.0' | wc -l)"
+
+# Check installation of cuda-nvtx-11-7 (11.7)
+# check "cuda-12-4+nvtx" test -e '/usr/local/cuda-12.4/targets/x86_64-linux/include/nvtx3'
+
+# Report result
+reportResults
+
diff --git a/test/nvidia-cuda/install_cudnn_124_version.sh b/test/nvidia-cuda/install_cudnn_124_version.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check installation of libcudnn9-cuda-12 (9.4.0)
+check "libcudnn.so.9.4.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.4.0' | wc -l)"
+
+# Check installation of cuda-nvtx-11-7 (11.7)
+# check "cuda-12-4+nvtx" test -e '/usr/local/cuda-12.4/targets/x86_64-linux/include/nvtx3'
+
+# Report result
+reportResults
+
diff --git a/test/nvidia-cuda/install_cudnn_latest_version.sh b/test/nvidia-cuda/install_cudnn_latest_version.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check installation of libcudnn9-cuda-12 (9.4.0)
+check "libcudnn.so.9.4.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.4.0' | wc -l)"
+
+# Check installation of cuda-nvtx-11-7 (11.7)
+# check "cuda-12-4+nvtx" test -e '/usr/local/cuda-12.4/targets/x86_64-linux/include/nvtx3'
+
+# Report result
+reportResults
+
diff --git a/test/nvidia-cuda/scenarios.json b/test/nvidia-cuda/scenarios.json
@@ -20,5 +20,44 @@
                 "cudnnVersion": "8.5.0.96"
             }
         }
+    },
+    "install_cudnn_123_version": {
+        "image": "debian",
+        "features": {
+            "nvidia-cuda": {
+                "installCudnn": true,
+                "installNvtx": true,
+                "installCudnnDev": true,
+                "installToolkit": true,
+                "cudaVersion": "12.3",
+                "cudnnVersion": "9.4.0.58"
+            }
+        }
+    },
+    "install_cudnn_124_version": {
+        "image": "debian",
+        "features": {
+            "nvidia-cuda": {
+                "installCudnn": true,
+                "installNvtx": true,
+                "installCudnnDev": true,
+                "installToolkit": true,
+                "cudaVersion": "12.4",
+                "cudnnVersion": "9.4.0.58"
+            }
+        }
+    },
+    "install_cudnn_latest_version": {
+        "image": "debian",
+        "features": {
+            "nvidia-cuda": {
+                "installCudnn": true,
+                "installNvtx": true,
+                "installCudnnDev": true,
+                "installToolkit": true,
+                "cudaVersion": "12.5",
+                "cudnnVersion": "9.4.0.58"
+            }
+        }
     }
 }