Fix CUDA version detection mechanism (#179)

* fix cuda version detection mechanism * update feature version * update feature version
rapidsai · Dec 12, 2023 · a2f5a73 · a2f5a73
1 parent 7ee82e0
commit a2f5a73
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/features/src/cuda/devcontainer-feature.json b/features/src/cuda/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "CUDA Toolkit",
   "id": "cuda",
-  "version": "24.2.0",
+  "version": "24.2.1",
   "description": "A feature to install the NVIDIA CUDA Toolkit",
   "options": {
     "version": {

diff --git a/features/src/cuda/install.sh b/features/src/cuda/install.sh
@@ -65,7 +65,7 @@ echo "Installing dev CUDA toolkit...";
 export CUDA_HOME="/usr/local/cuda";
 
 cuda_ver="${VERSION}";
-cuda_ver=$(cut -d'.' -f3 --complement <<< "${cuda_ver}");
+cuda_ver=$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_ver}");
 
 cudapath="${CUDA_HOME}-${cuda_ver}";
 cuda_tag="cuda${cuda_ver}";

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -14,7 +14,7 @@ make_conda_env() {
     fi
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
-    cuda_version="$(cut -d'.' -f3 --complement <<< "${cuda_version}")";
+    cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
 
     local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
     python_version="$(cut -d'.' -f3 --complement <<< "${python_version}")";

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -14,7 +14,7 @@ make_pip_env() {
     fi
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
-    cuda_version="$(cut -d'.' -f3 --complement <<< "${cuda_version}")";
+    cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
     local cuda_version_major="$(cut -d'.' -f1 <<< "${cuda_version}")";
 
     local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";