Skip to content

Commit ffc9c70

Browse files
authored
Fix package installation for wheels CI (#238)
Normal wheel tests should not install any CUDA pip packages because they should use the toolkit from the container. The test depending on the toolkit wheels should install the specific toolkit version used for the test (as opposed to just using the latest version, which they were set up to do before).
1 parent 02df550 commit ffc9c70

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.github/workflows/wheels-test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ jobs:
142142
- name: Run tests
143143
run: ${{ inputs.script }}
144144
env:
145+
CUDA_VER: ${{ matrix.CUDA_VER }}
145146
GH_TOKEN: ${{ github.token }}
146147
RAPIDS_AUX_SECRET_1: ${{ secrets.RAPIDS_AUX_SECRET_1 }}
147148

ci/test_wheel.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ python -m pip install \
99
psutil \
1010
cffi \
1111
cuda-python \
12-
nvidia-cuda-cccl-cu12 \
13-
nvidia-curand-cu12 \
1412
pytest
1513

1614
rapids-logger "Install wheel"

ci/test_wheel_deps_wheels.sh

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,22 @@
33

44
set -euo pipefail
55

6+
# cuRAND versions don't follow the toolkit versions - map toolkit versions to
7+
# appropriate cuRAND versions
8+
declare -A CTK_CURAND_VMAP=( ["12.8"]="10.3.9" ["12.9"]="10.3.10")
9+
CUDA_VER_MAJOR_MINOR=${CUDA_VER%.*}
10+
CURAND_VER="${CTK_CURAND_VMAP[${CUDA_VER_MAJOR_MINOR}]}"
11+
612
rapids-logger "Install testing dependencies"
713
# TODO: Replace with rapids-dependency-file-generator
814
python -m pip install \
915
psutil \
1016
cffi \
11-
cuda-python \
12-
nvidia-cuda-runtime-cu12 \
13-
nvidia-curand-cu12 \
14-
nvidia-cuda-nvcc-cu12 \
15-
nvidia-cuda-nvrtc-cu12 \
17+
"cuda-python==${CUDA_VER_MAJOR_MINOR}.*" \
18+
"nvidia-cuda-runtime-cu12==${CUDA_VER_MAJOR_MINOR}.*" \
19+
"nvidia-curand-cu12==${CURAND_VER}.*" \
20+
"nvidia-cuda-nvcc-cu12==${CUDA_VER_MAJOR_MINOR}.*" \
21+
"nvidia-cuda-nvrtc-cu12==${CUDA_VER_MAJOR_MINOR}.*" \
1622
pynvjitlink-cu12 \
1723
pytest
1824

ci/test_wheel_pynvjitlink.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ python -m pip install \
99
psutil \
1010
cffi \
1111
cuda-python \
12-
nvidia-curand-cu12 \
1312
pytest
1413

1514
rapids-logger "Install pynvjitlink"

0 commit comments

Comments
 (0)