Merge branch 'branch-24.08' into cuda-12.5

rapidsai · Jul 2, 2024 · 40dfe3c · 40dfe3c
2 parents d8f91e9 + 2f216e1
commit 40dfe3c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/features/src/rapids-build-utils/.bashrc b/features/src/rapids-build-utils/.bashrc
@@ -17,3 +17,6 @@ if [[ "${PYTHON_PACKAGE_MANAGER:-}" == "pip" ]]; then
         fi
     fi
 fi
+
+# shellcheck disable=SC2155
+export CUDA_VERSION_MAJOR_MINOR="$(grep -Po '^[0-9]+\.[0-9]+' <<< "${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}")";
diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "24.8.12",
+  "version": "24.8.13",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
@@ -44,7 +44,7 @@ get_cmake_build_dir() {
         echo "${src:+${src}/}$(python -c 'from skbuild import constants; print(constants.CMAKE_BUILD_DIR())')";
     else
         local -r type="$(rapids-select-cmake-build-type "${OPTS[@]}" "${REST[@]:1}" | tr '[:upper:]' '[:lower:]')";
-        local -r cuda="$(grep -o '^[0-9]*.[0-9]*' <<< "${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}")";
+        local -r cuda="${CUDA_VERSION_MAJOR_MINOR:-}";
         local bin="build";
         bin+="${PYTHON_PACKAGE_MANAGER:+/${PYTHON_PACKAGE_MANAGER}}${cuda:+/cuda-${cuda}}";
 

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -53,8 +53,7 @@ make_pip_dependencies() {
         _include+=(-f "${inc}");
     done
 
-    local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
-    cuda_version="$(grep -o '^[0-9]*.[0-9]*' <<< "${cuda_version}")";
+    local cuda_version="${CUDA_VERSION_MAJOR_MINOR:-}";
     local -r cuda_version_major="$(cut -d'.' -f1 <<< "${cuda_version}")";
 
     local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
@@ -41,7 +41,7 @@ clean_${PY_LIB}_python() {
     done
 
     local py_ver="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
-    py_ver="$(grep -o '^[0-9]*.[0-9]*' <<< "${py_ver}")";
+    py_ver="$(grep -Po '^[0-9]+\.[0-9]+' <<< "${py_ver}")";
 
     if test -d "${PY_SRC}/build"; then
         local slug="$(uname -s)-$(uname -m)";

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -4,9 +4,9 @@ x-git-defaults: &git_defaults
     upstream: rapidsai
 
 x-rapids-build-backend-args: &rapids_build_backend_args |
-  --config-settings skbuild.strict-config=false
-  --config-settings rapidsai.disable-cuda=true
-  --config-settings rapidsai.matrix_entry=cuda=$(grep -o '^[0-9]+.[0-9]+' <<< "${CUDA_VERSION}")
+  --config-settings "skbuild.strict-config=false"
+  --config-settings "rapidsai.disable-cuda=true"
+  --config-settings "rapidsai.matrix-entry=cuda=${CUDA_VERSION_MAJOR_MINOR}"
 
 repos: