From f7118060d237803632b15a8bc19a568f5dce3707 Mon Sep 17 00:00:00 2001 From: Robert Chisholm Date: Fri, 17 Nov 2023 10:37:22 +0000 Subject: [PATCH] Same fix for manylinux --- .github/scripts/install_cuda_centos.sh | 10 +++++++--- .github/scripts/install_cuda_ubuntu.sh | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/scripts/install_cuda_centos.sh b/.github/scripts/install_cuda_centos.sh index 47f3d9cfb..cc6f386b6 100755 --- a/.github/scripts/install_cuda_centos.sh +++ b/.github/scripts/install_cuda_centos.sh @@ -18,6 +18,7 @@ CUDA_PACKAGES_IN=( "cuda-nvtx" "cuda-nvrtc-devel" "libcurand-devel" # 11-0+ + "libnvjitlink-dev" # 12.0+ ) ## ------------------- @@ -91,9 +92,12 @@ do : if [[ ${package} == libcu* ]] && version_lt "$CUDA_VERSION_MAJOR_MINOR" "11.0" ; then package="${package/libcu/cuda-cu}" fi - # CUDA < 11, -devel- packages were actually -dev - if [[ ${package} == *devel* ]] && version_lt "$CUDA_VERSION_MAJOR_MINOR" "11.0" ; then - package="${package//devel/dev}" + # libnvjitlink not required prior to CUDA 12.0 + if [[ ${package} == libnvjitlink-dev* ]] && version_lt "$CUDA_VERSION_MAJOR_MINOR" "12.0" ;then + continue + # CUDA 11+ includes lib* / lib*-dev packages, which if they existed previously where cuda-cu*- / cuda-cu*-dev- + elif [[ ${package} == lib* ]] && version_lt "$CUDA_VERSION_MAJOR_MINOR" "11.0" ; then + package="${package/libcu/cuda-cu}" fi # Build the full package name and append to the string. CUDA_PACKAGES+=" ${package}-${CUDA_MAJOR}-${CUDA_MINOR}" diff --git a/.github/scripts/install_cuda_ubuntu.sh b/.github/scripts/install_cuda_ubuntu.sh index e5581ad27..99102e54d 100755 --- a/.github/scripts/install_cuda_ubuntu.sh +++ b/.github/scripts/install_cuda_ubuntu.sh @@ -14,7 +14,7 @@ CUDA_PACKAGES_IN=( "cuda-nvtx" "cuda-nvrtc-dev" "libcurand-dev" # 11-0+ - "cuda-cccl" # 11.4+, provides cub and thrust. On 11.3 knwon as cuda-thrust-11-3 + "cuda-cccl" # 11.4+, provides cub and thrust. On 11.3 known as cuda-thrust-11-3 "libnvjitlink-dev" # 12.0+ )