cuda-toolkit 12.5 on win (compatible with VS 2022 17.10 and above); 1…

…2.4 on linux (latest available from nvidia rhel7 repo) cuda 12.4 on linux
osqp · Jul 28, 2024 · caa6446 · caa6446
1 parent 552dcff
commit caa6446
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/build_cuda.yml b/.github/workflows/build_cuda.yml
@@ -46,11 +46,11 @@ jobs:
         CIBW_BEFORE_BUILD: >-
           rm -rf {package}/osqp_sources/build
 
-        CIBW_ENVIRONMENT_LINUX: CMAKE_CUDA_COMPILER=/usr/local/cuda-11.7/bin/nvcc
+        CIBW_ENVIRONMENT_LINUX: CMAKE_CUDA_COMPILER=/usr/local/cuda-12.4/bin/nvcc
         CIBW_BEFORE_ALL_LINUX: bash .github/workflows/prepare_build_environment_linux_cuda.sh
         CIBW_REPAIR_WHEEL_COMMAND_LINUX: ""
 
-        CIBW_ENVIRONMENT_WINDOWS: CMAKE_CUDA_COMPILER="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.6/bin/nvcc.exe" CUDA_TOOLKIT_ROOT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.6" CMAKE_GENERATOR_TOOLSET="cuda=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.6"
+        CIBW_ENVIRONMENT_WINDOWS: CMAKE_CUDA_COMPILER="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.5/bin/nvcc.exe" CUDA_TOOLKIT_ROOT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.5" CMAKE_GENERATOR_TOOLSET="cuda=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.5"
         CIBW_BEFORE_ALL_WINDOWS: bash .github/workflows/prepare_build_environment_windows_cuda.sh
         CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: ""
 

diff --git a/.github/workflows/prepare_build_environment_linux_cuda.sh b/.github/workflows/prepare_build_environment_linux_cuda.sh
@@ -3,9 +3,7 @@
 set -e
 set -x
 
-# Install CUDA 11.2, see:
-# * https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.2.2/centos7-x86_64/base/Dockerfile
 yum-config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo
-yum install -y cuda-toolkit-11-7
+yum install -y cuda-toolkit-12-4
 
-/usr/local/cuda-11.7/bin/nvcc --version
+/usr/local/cuda-12.4/bin/nvcc --version
diff --git a/.github/workflows/prepare_build_environment_windows_cuda.sh b/.github/workflows/prepare_build_environment_windows_cuda.sh
@@ -3,6 +3,6 @@
 set -e
 set -x
 
-curl -s -L -nv -o cuda.exe https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_511.65_windows.exe
-./cuda.exe -s nvcc_11.6 cudart_11.6 cublas_dev_11.6 curand_dev_11.6 cusparse_dev_11.6 thrust_11.6 visual_studio_integration_11.6
+curl -s -L -nv -o cuda.exe https://developer.download.nvidia.com/compute/cuda/12.5.1/local_installers/cuda_12.5.1_555.85_windows.exe
+./cuda.exe -s nvcc_12.5 cudart_12.5 cublas_dev_12.5 curand_dev_12.5 cusparse_dev_12.5 thrust_12.5 visual_studio_integration_12.5
 rm cuda.exe