Skip to content

Enhancements in CUDA Support #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Samruddhi Khandale (samruddhikhandale) merged 11 commits into from
Sep 27, 2023
Merged

Enhancements in CUDA Support #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aba2457
add cuda tookit installing support
ar90n Sep 24, 2023
665fd62
add nvcc installing support
ar90n Sep 24, 2023
54cb1cc
add libcudnn8-dev installing support
ar90n Sep 24, 2023
5e06743
add new cuda versions adn cudnn versions
ar90n Sep 24, 2023
0dcdb92
add specificaitons of new option
ar90n Sep 24, 2023
9aa23ee
remove installNvcc
ar90n Sep 26, 2023
50a7b16
add tests for new nvidia-cuda options
ar90n Sep 26, 2023
58ae521
fix wrong scenario name
ar90n Sep 26, 2023
3ec682a
Revert "add specificaitons of new option"
ar90n Sep 27, 2023
7ff1845
make cudnn-dev installation isolated
ar90n Sep 27, 2023
9cfcf6c
dump minor version to 1.1.0
ar90n Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion src/nvidia-cuda/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "nvidia-cuda",
"version": "1.0.7",
"version": "1.1.0",
"name": "NVIDIA CUDA",
"description": "Installs shared libraries for NVIDIA CUDA.",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
Expand All @@ -10,14 +10,27 @@
"default": false,
"description": "Additionally install CUDA Deep Neural Network (cuDNN) shared library"
Comment thread
samruddhikhandale marked this conversation as resolved.
},
"installCudnnDev": {
"type": "boolean",
"default": false,
"description": "Additionally install CUDA Deep Neural Network (cuDNN) development libraries and headers"
},
"installNvtx": {
"type": "boolean",
"default": false,
"description": "Additionally install NVIDIA Tools Extension (NVTX)"
},
"installToolkit": {
"type": "boolean",
"default": false,
"description": "Additionally install NVIDIA CUDA Toolkit"
},
"cudaVersion": {
"type": "string",
"proposals": [
"12.2",
"12.1",
"12.0",
"11.8",
"11.7",
"11.6",
Expand All @@ -32,6 +45,15 @@
"cudnnVersion": {
"type": "string",
"proposals": [
"8.9.5.29",
"8.9.4.25",
"8.9.3.28",
"8.9.2.26",
"8.9.1.23",
"8.9.0.131",
"8.8.1.3",
"8.8.0.121",
"8.7.0.84",
"8.6.0.163",
"8.5.0.96",
"8.4.1.50",
Expand Down
20 changes: 20 additions & 0 deletions src/nvidia-cuda/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ set -e
rm -rf /var/lib/apt/lists/*

INSTALL_CUDNN=${INSTALLCUDNN}
INSTALL_CUDNNDEV=${INSTALLCUDNNDEV}
INSTALL_NVTX=${INSTALLNVTX}
INSTALL_TOOLKIT=${INSTALLTOOLKIT}
CUDA_VERSION=${CUDAVERSION}
CUDNN_VERSION=${CUDNNVERSION}

Expand Down Expand Up @@ -47,6 +49,7 @@ apt-get update -yq
# Ensure that the requested version of CUDA is available
cuda_pkg="cuda-libraries-${CUDA_VERSION/./-}"
nvtx_pkg="cuda-nvtx-${CUDA_VERSION/./-}"
toolkit_pkg="cuda-toolkit-${CUDA_VERSION/./-}"
if ! apt-cache show "$cuda_pkg"; then
echo "The requested version of CUDA is not available: CUDA $CUDA_VERSION"
exit 1
Expand All @@ -67,11 +70,28 @@ if [ "$INSTALL_CUDNN" = "true" ]; then
apt-get install -yq "$cudnn_pkg_version"
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 ! 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
fi

echo "Installing cuDNN dev libraries..."
apt-get install -yq "$cudnn_dev_pkg_version"
fi

if [ "$INSTALL_NVTX" = "true" ]; then
echo "Installing NVTX..."
apt-get install -yq "$nvtx_pkg"
fi

if [ "$INSTALL_TOOLKIT" = "true" ]; then
echo "Installing CUDA Toolkit..."
apt-get install -yq "$toolkit_pkg"
fi

# Clean up
rm -rf /var/lib/apt/lists/*

Expand Down
6 changes: 6 additions & 0 deletions test/nvidia-cuda/install_cudnn_nvxt.sh → test/nvidia-cuda/install_all_options.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,14 @@ 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 libcudnn8-dev
Comment thread
samruddhikhandale marked this conversation as resolved.
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-nvcc-11-<version>
check "cuda-11+nvcc" test -e '/usr/local/cuda-11/bin/nvcc'

# Report result
reportResults
8 changes: 5 additions & 3 deletions test/nvidia-cuda/scenarios.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"install_cudnn_nvxt": {
"install_all_options": {
"image": "debian",
"features": {
"nvidia-cuda": {
"installCudnn": true,
"installNvtx": true
"installCudnnDev": true,
"installNvtx": true,
"installToolkit": true
}
}
},
Expand All @@ -19,4 +21,4 @@
}
}
}
}
}