[nvidia-cuda] - Fix installation issue on debian trixie(13) (#1591)

* [nvidia-cuda] - Fix installation issue on debian trixie(13)

* Update test in line with the latest defailt cuda version 12.5

* Remove uwanted submodule

* Adding symlinks for duplicate test files

Author: Kaniska244

src/nvidia-cuda/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
@@ -42,7 +42,7 @@
         "11.3",
         "11.2"
       ],
-      "default": "11.8",
+      "default": "12.5",
       "description": "Version of CUDA to install"
     },
     "cudnnVersion": {

src/nvidia-cuda/install.sh

@@ -62,13 +62,26 @@ esac
 # Add NVIDIA's package repository to apt so that we can download packages
 # Updating the repo to ubuntu2204 as ubuntu 20.04 is going out of support. 
 NVIDIA_REPO_URL="https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/$NVIDIA_ARCH"
-KEYRING_PACKAGE="cuda-keyring_1.0-1_all.deb"
-KEYRING_PACKAGE_URL="$NVIDIA_REPO_URL/$KEYRING_PACKAGE"
-KEYRING_PACKAGE_PATH="$(mktemp -d)"
-KEYRING_PACKAGE_FILE="$KEYRING_PACKAGE_PATH/$KEYRING_PACKAGE"
-wget -O "$KEYRING_PACKAGE_FILE" "$KEYRING_PACKAGE_URL"
-apt-get install -yq "$KEYRING_PACKAGE_FILE"
-apt-get update -yq
+
+
+if [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; then
+    echo "(!) Temporary workaround on debian:trixie: bypassing NVIDIA repo signature checks"
+    cat > /etc/apt/sources.list.d/cuda.list <<EOF
+deb [trusted=yes] ${NVIDIA_REPO_URL}/ /
+EOF
+
+    apt-get -o Acquire::AllowInsecureRepositories=true \
+            -o Acquire::AllowDowngradeToInsecureRepositories=true \
+            update -yq
+else
+    KEYRING_PACKAGE="cuda-keyring_1.0-1_all.deb"
+    KEYRING_PACKAGE_URL="$NVIDIA_REPO_URL/$KEYRING_PACKAGE"
+    KEYRING_PACKAGE_PATH="$(mktemp -d)"
+    KEYRING_PACKAGE_FILE="$KEYRING_PACKAGE_PATH/$KEYRING_PACKAGE"
+    wget -O "$KEYRING_PACKAGE_FILE" "$KEYRING_PACKAGE_URL"
+    apt-get install -yq "$KEYRING_PACKAGE_FILE"
+    apt-get update -yq
+fi
 
 # Ensure that the requested version of CUDA is available
 cuda_pkg="cuda-libraries-${CUDA_VERSION/./-}"

test/nvidia-cuda/install_all_options.sh

@@ -5,17 +5,18 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# Check installation of libcudnn8
-check "libcudnn.so.8" test 1 -eq "$(find /usr -name 'libcudnn.so.8' | wc -l)"
+# Check installation of libcudnn9
+check "libcudnn.so.9" test 1 -eq "$(find /usr -name 'libcudnn.so.9' | wc -l)"
 
-# Check installation of libcudnn8-dev
+# Check installation of libcudnn9-dev
 check "cudnn.h" test 1 -eq "$(find /usr -name 'cudnn.h' | wc -l)"
 
-# Check installation of cuda-nvtx-11-<version>
-check "cuda-11+nvtx" test -e '/usr/local/cuda-11/targets/x86_64-linux/include/nvtx3'
+# Check installation of cuda-nvtx-12-<version>
+check "cuda-12+nvtx" test -e '/usr/local/cuda-12.5/targets/x86_64-linux/include/nvtx3'
 
-# Check installation of cuda-nvcc-11-<version>
-check "cuda-11+nvcc" test -e '/usr/local/cuda-11/bin/nvcc'
+# Check installation of cuda-nvcc-12-<version>
+check "cuda-12+nvcc" test -e '/usr/local/cuda-12.5/bin/nvcc'
 
 # Report result
 reportResults
+

test/nvidia-cuda/install_all_options_debian_12.sh

@@ -0,0 +1 @@
+install_all_options.sh

test/nvidia-cuda/install_all_options_ubuntu_noble.sh

@@ -0,0 +1 @@
+install_all_options.sh

test/nvidia-cuda/scenarios.json

@@ -10,6 +10,28 @@
             }
         }
     },
+    "install_all_options_debian_12": {
+        "image": "debian:12",
+        "features": {
+            "nvidia-cuda": {
+                "installCudnn": true,
+                "installCudnnDev": true,
+                "installNvtx": true,
+                "installToolkit": true
+            }
+        }
+    },
+    "install_all_options_ubuntu_noble": {
+        "image": "ubuntu:noble",
+        "features": {
+            "nvidia-cuda": {
+                "installCudnn": true,
+                "installCudnnDev": true,
+                "installNvtx": true,
+                "installToolkit": true
+            }
+        }
+    },
     "install_cudnn_nvxt_version": {
         "image": "debian",
         "features": {

test/nvidia-cuda/test.sh

@@ -5,16 +5,16 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "cuda version" test -d /usr/local/cuda-11.8
+check "cuda version" test -d /usr/local/cuda-12.5
 
-# Check installation of cuda-libraries-11-<version>
-check "libcudart.so.11.0" test 1 -eq "$(find /usr -name 'libcudart.so.11.0' | wc -l)"
-check "libcublas.so.11" test 1 -eq "$(find /usr -name 'libcublas.so.11' | wc -l)"
-check "libcublasLt.so.11" test 1 -eq "$(find /usr -name 'libcublasLt.so.11' | wc -l)"
-check "libcufft.so.10" test 1 -eq "$(find /usr -name 'libcufft.so.10' | wc -l)"
+# Check installation of cuda-libraries-12-<version>
+check "libcudart.so.12" test 1 -eq "$(find /usr -name 'libcudart.so.12' | wc -l)"
+check "libcublas.so.12" test 1 -eq "$(find /usr -name 'libcublas.so.12' | wc -l)"
+check "libcublasLt.so.12" test 1 -eq "$(find /usr -name 'libcublasLt.so.12' | wc -l)"
+check "libcufft.so.11" test 1 -eq "$(find /usr -name 'libcufft.so.11' | wc -l)"
 check "libcurand.so.10" test 1 -eq "$(find /usr -name 'libcurand.so.10' | wc -l)"
 check "libcusolver.so.11" test 1 -eq "$(find /usr -name 'libcusolver.so.11' | wc -l)"
-check "libcusparse.so.11" test 1 -eq "$(find /usr -name 'libcusparse.so.11' | wc -l)"
+check "libcusparse.so.12" test 1 -eq "$(find /usr -name 'libcusparse.so.12' | wc -l)"
 
 # Report result
 reportResults