Skip to content

Commit 18d41b0

Browse files
Give Python wheel its own test-cu* dependencies
Follow-up to #1588 (comment)
1 parent f8d5dd6 commit 18d41b0

File tree

3 files changed

+54
-11
lines changed

3 files changed

+54
-11
lines changed

ci/test_wheel.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,12 @@ export RAPIDS_CUDA_MAJOR
1111

1212
DASK_CUDA_WHEELHOUSE=$(rapids-download-from-github "$(rapids-package-name "wheel_python" "dask-cuda" --pure)")
1313

14-
# Install cuda-suffixed dependencies b/c while `dask-cuda` has no cuda suffix, the test dependencies do
15-
rapids-dependency-file-generator \
16-
--output requirements \
17-
--file-key "test_python" \
18-
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true" \
19-
| tee /tmp/requirements-test.txt
20-
2114
rapids-logger "Installing test dependencies"
2215
# echo to expand wildcard
2316
rapids-pip-retry install \
2417
-v \
2518
--prefer-binary \
26-
-r /tmp/requirements-test.txt \
27-
"$(echo "${DASK_CUDA_WHEELHOUSE}"/dask_cuda*.whl)[cu${RAPIDS_CUDA_MAJOR}]"
19+
"$(echo "${DASK_CUDA_WHEELHOUSE}"/dask_cuda*.whl)[cu${RAPIDS_CUDA_MAJOR},test,test-cu${RAPIDS_CUDA_MAJOR}]"
2820

2921
RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
3022
mkdir -p "${RAPIDS_TESTS_DIR}"

dependencies.yaml

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ files:
2424
- cuda_version
2525
- py_version
2626
- test_python
27+
- test_python_cuda
2728
- depends_on_dask_cuda
2829
checks:
2930
output: none
@@ -61,6 +62,30 @@ files:
6162
key: cu13
6263
includes:
6364
- extra_cu13
65+
py_test:
66+
output: pyproject
67+
pyproject_dir: .
68+
extras:
69+
table: project.optional-dependencies
70+
key: test
71+
includes:
72+
- test_python
73+
py_test_cu12:
74+
output: pyproject
75+
pyproject_dir: .
76+
extras:
77+
table: project.optional-dependencies
78+
key: test-cu12
79+
includes:
80+
- test_python_cu12
81+
py_test_cu13:
82+
output: pyproject
83+
pyproject_dir: .
84+
extras:
85+
table: project.optional-dependencies
86+
key: test-cu13
87+
includes:
88+
- test_python_cu13
6489
py_run:
6590
output: pyproject
6691
pyproject_dir: .
@@ -195,21 +220,22 @@ dependencies:
195220
- &dask_cudf_unsuffixed dask-cudf==26.2.*,>=0.0.0a0
196221
- &distributed_ucxx_unsuffixed distributed-ucxx==0.48.*,>=0.0.0a0
197222
- &kvikio_unsuffixed kvikio==26.2.*,>=0.0.0a0
223+
test_python_cuda:
198224
specific:
199225
- output_types: [requirements, pyproject]
200226
matrices:
201227
- matrix:
202228
cuda: "12.*"
203229
cuda_suffixed: "true"
204-
packages:
230+
packages: &test_python_cu12
205231
- cudf-cu12==26.2.*,>=0.0.0a0
206232
- dask-cudf-cu12==26.2.*,>=0.0.0a0
207233
- distributed-ucxx-cu12==0.48.*,>=0.0.0a0
208234
- kvikio-cu12==26.2.*,>=0.0.0a0
209235
- matrix:
210236
cuda: "13.*"
211237
cuda_suffixed: "true"
212-
packages:
238+
packages: &test_python_cu13
213239
- cudf-cu13==26.2.*,>=0.0.0a0
214240
- dask-cudf-cu13==26.2.*,>=0.0.0a0
215241
- distributed-ucxx-cu13==0.48.*,>=0.0.0a0
@@ -220,6 +246,14 @@ dependencies:
220246
- *dask_cudf_unsuffixed
221247
- *distributed_ucxx_unsuffixed
222248
- *kvikio_unsuffixed
249+
test_python_cu12:
250+
common:
251+
- output_types: [requirements, pyproject]
252+
packages: *test_python_cu12
253+
test_python_cu13:
254+
common:
255+
- output_types: [requirements, pyproject]
256+
packages: *test_python_cu13
223257
depends_on_dask_cuda:
224258
common:
225259
- output_types: conda

pyproject.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,23 @@ cu13 = [
6161
"cuda-core[cu13]==0.3.*",
6262
"numba-cuda[cu13]>=0.19.1,<0.20.0a0",
6363
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
64+
test = [
65+
"pytest",
66+
"pytest-cov",
67+
"pytest-timeout",
68+
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
69+
test-cu12 = [
70+
"cudf-cu12==26.2.*,>=0.0.0a0",
71+
"dask-cudf-cu12==26.2.*,>=0.0.0a0",
72+
"distributed-ucxx-cu12==0.48.*,>=0.0.0a0",
73+
"kvikio-cu12==26.2.*,>=0.0.0a0",
74+
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
75+
test-cu13 = [
76+
"cudf-cu13==26.2.*,>=0.0.0a0",
77+
"dask-cudf-cu13==26.2.*,>=0.0.0a0",
78+
"distributed-ucxx-cu13==0.48.*,>=0.0.0a0",
79+
"kvikio-cu13==26.2.*,>=0.0.0a0",
80+
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
6481

6582
[project.urls]
6683
Homepage = "https://github.com/rapidsai/dask-cuda"

0 commit comments

Comments
 (0)