Merge branch 'main' into test/xfail_strict

rapidsai · Jun 3, 2024 · 3ac4c06 · 3ac4c06
2 parents d687555 + 7852be4
commit 3ac4c06
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/.github/actions/compute-matrix/action.yaml b/.github/actions/compute-matrix/action.yaml
@@ -16,10 +16,10 @@ runs:
         set -eo pipefail
 
         export BUILD_MATRIX="
-        - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.9', LINUX_VER: 'centos7' }
-        - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.10', LINUX_VER: 'centos7' }
-        - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'centos7' }
-        - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.12', LINUX_VER: 'centos7' }
+        - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.9', LINUX_VER: 'rockylinux8' }
+        - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.10', LINUX_VER: 'rockylinux8' }
+        - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'rockylinux8' }
+        - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.12', LINUX_VER: 'rockylinux8' }
         - { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.9', LINUX_VER: 'rockylinux8' }
         - { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.10', LINUX_VER: 'rockylinux8' }
         - { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.11', LINUX_VER: 'rockylinux8' }

diff --git a/ci/install_latest_cuda_toolkit.sh b/ci/install_latest_cuda_toolkit.sh
@@ -8,13 +8,11 @@ yum update -y
 yum install -y epel-release
 
 OS_ID=$(. /etc/os-release; echo $ID)
-if [ "${OS_ID}" == "centos" ]; then
-    yum install -y nvidia-driver-latest-dkms
-elif [ "${OS_ID}" == "rocky" ]; then
+if [ "${OS_ID}" == "rocky" ]; then
     yum install -y nvidia-driver
 else
-    echo "Error: OS not detected as CentOS or Rocky Linux. Exiting."
+    echo "Error: OS not detected as Rocky Linux. Exiting."
     exit 1
 fi
 
-yum install -y cuda-toolkit-12-4
+yum install -y cuda-toolkit-12-5
diff --git a/conda/recipes/pynvjitlink/conda_build_config.yaml b/conda/recipes/pynvjitlink/conda_build_config.yaml
@@ -8,4 +8,4 @@ cuda_compiler:
   - cuda-nvcc
 
 cuda_compiler_version:
-  - 12.4
+  - 12.5
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ cuda_compiler: @@
       - cuda-nvcc
     cuda_compiler_version:
-      - 12.4
+      - 12.5