From 2fbe13ad2cc6c0485d19600234982925e3650fb9 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 19 Aug 2025 10:20:47 -0500 Subject: [PATCH 01/10] Build and test with CUDA 13.0.0 --- .github/workflows/build-ucxx.yaml | 2 +- .github/workflows/build.yaml | 10 +++++----- .github/workflows/pr.yaml | 14 +++++++------- .github/workflows/test-ucxx.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- .../workflows/trigger-breaking-change-alert.yaml | 2 +- dependencies.yaml | 6 +++++- docs/source/install.rst | 2 +- 8 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-ucxx.yaml b/.github/workflows/build-ucxx.yaml index 6070740c..a69d5428 100644 --- a/.github/workflows/build-ucxx.yaml +++ b/.github/workflows/build-ucxx.yaml @@ -54,7 +54,7 @@ concurrency: jobs: conda-python-build: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda13.0 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a82e2498..4b04bbb9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -34,7 +34,7 @@ concurrency: jobs: conda-python-build: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda13.0 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -45,7 +45,7 @@ jobs: if: github.ref_type == 'branch' needs: [conda-python-build] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda13.0 with: arch: "amd64" branch: ${{ inputs.branch }} @@ -58,7 +58,7 @@ jobs: upload-conda: needs: [conda-python-build] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@cuda13.0 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -66,7 +66,7 @@ jobs: sha: ${{ inputs.sha }} wheel-build: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda13.0 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -83,7 +83,7 @@ jobs: wheel-publish: needs: wheel-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda13.0 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b3008cb9..730723df 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,7 +17,7 @@ jobs: - wheel-tests - telemetry-setup secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@cuda13.0 with: needs: ${{ toJSON(needs) }} telemetry-setup: @@ -34,27 +34,27 @@ jobs: checks: secrets: inherit needs: telemetry-setup - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@cuda13.0 with: ignored_pr_jobs: telemetry-summarize conda-python-build: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda13.0 with: build_type: pull-request script: ci/build_python.sh conda-python-tests: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda13.0 with: build_type: pull-request script: ci/test_python.sh docs-build: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda13.0 with: build_type: pull-request node_type: "gpu-l4-latest-1" @@ -64,7 +64,7 @@ jobs: wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda13.0 with: build_type: pull-request # Package is pure Python and only ever requires one build. @@ -78,7 +78,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda13.0 with: build_type: pull-request script: "ci/test_wheel.sh" diff --git a/.github/workflows/test-ucxx.yaml b/.github/workflows/test-ucxx.yaml index 7092afc9..fe566806 100644 --- a/.github/workflows/test-ucxx.yaml +++ b/.github/workflows/test-ucxx.yaml @@ -45,7 +45,7 @@ on: jobs: conda-python-ucxx-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda13.0 with: build_type: ${{ inputs.build_type }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index da13bb9a..6dffc31e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,7 +25,7 @@ on: jobs: conda-python-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda13.0 with: build_type: ${{ inputs.build_type }} branch: ${{ inputs.branch }} @@ -34,7 +34,7 @@ jobs: sha: ${{ inputs.sha }} wheel-tests: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda13.0 with: build_type: ${{ inputs.build_type }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/trigger-breaking-change-alert.yaml b/.github/workflows/trigger-breaking-change-alert.yaml index 48bf37af..72751d07 100644 --- a/.github/workflows/trigger-breaking-change-alert.yaml +++ b/.github/workflows/trigger-breaking-change-alert.yaml @@ -12,7 +12,7 @@ jobs: trigger-notifier: if: contains(github.event.pull_request.labels.*.name, 'breaking') secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-25.10 + uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@cuda13.0 with: sender_login: ${{ github.event.sender.login }} sender_avatar: ${{ github.event.sender.avatar_url }} diff --git a/dependencies.yaml b/dependencies.yaml index 43bafe11..18373754 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ files: all: output: conda matrix: - cuda: ["12.9"] + cuda: ["12.9", "13.0"] arch: [x86_64, aarch64] includes: - build_python @@ -92,6 +92,10 @@ dependencies: cuda: "12.9" packages: - cuda-version=12.9 + - matrix: + cuda: "13.0" + packages: + - cuda-version=13.0 cuda: specific: - output_types: conda diff --git a/docs/source/install.rst b/docs/source/install.rst index b665bd88..64cefb8e 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -16,7 +16,7 @@ To install the latest version of Dask-CUDA along with the CUDA Toolkit: .. code-block:: bash - conda install -c rapidsai -c conda-forge -c nvidia dask-cuda cuda-version=12.9 + conda install -c rapidsai -c conda-forge -c nvidia dask-cuda cuda-version=13.0 Pip --- From 25d028ccf559e7f6b7272e79817355dcb4bfe7de Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 19 Aug 2025 11:59:08 -0500 Subject: [PATCH 02/10] update dependencies.yaml --- .../all_cuda-130_arch-aarch64.yaml | 37 +++++++++++++++++++ .../all_cuda-130_arch-x86_64.yaml | 37 +++++++++++++++++++ dependencies.yaml | 27 +++++++++----- pyproject.toml | 2 +- 4 files changed, 93 insertions(+), 10 deletions(-) create mode 100644 conda/environments/all_cuda-130_arch-aarch64.yaml create mode 100644 conda/environments/all_cuda-130_arch-x86_64.yaml diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml new file mode 100644 index 00000000..15b14ed4 --- /dev/null +++ b/conda/environments/all_cuda-130_arch-aarch64.yaml @@ -0,0 +1,37 @@ +# This file is generated by `rapids-dependency-file-generator`. +# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. +channels: +- rapidsai +- rapidsai-nightly +- conda-forge +dependencies: +- click >=8.1 +- cuda-nvcc-impl +- cuda-nvrtc +- cuda-version=13.0 +- cudf==25.10.*,>=0.0.0a0 +- dask-cudf==25.10.*,>=0.0.0a0 +- distributed-ucxx==0.46.*,>=0.0.0a0 +- kvikio==25.10.*,>=0.0.0a0 +- numactl-devel-cos7-aarch64 +- numba-cuda>=0.19.0,<0.20.0a0 +- numba>=0.60.0,<0.62.0a0 +- numpy>=1.23,<3.0a0 +- numpydoc>=1.1.0 +- pandas>=1.3 +- pre-commit +- pynvml>=12.0.0,<13.0.0a0 +- pytest +- pytest-cov +- pytest-timeout +- python>=3.10,<3.14 +- rapids-build-backend>=0.4.0,<0.5.0dev0 +- rapids-dask-dependency==25.10.*,>=0.0.0a0 +- setuptools>=64.0.0 +- sphinx +- sphinx-click>=2.7.1 +- sphinx-rtd-theme>=0.5.1 +- ucx-py==0.46.*,>=0.0.0a0 +- ucxx==0.46.*,>=0.0.0a0 +- zict>=2.0.0 +name: all_cuda-130_arch-aarch64 diff --git a/conda/environments/all_cuda-130_arch-x86_64.yaml b/conda/environments/all_cuda-130_arch-x86_64.yaml new file mode 100644 index 00000000..02632591 --- /dev/null +++ b/conda/environments/all_cuda-130_arch-x86_64.yaml @@ -0,0 +1,37 @@ +# This file is generated by `rapids-dependency-file-generator`. +# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. +channels: +- rapidsai +- rapidsai-nightly +- conda-forge +dependencies: +- click >=8.1 +- cuda-nvcc-impl +- cuda-nvrtc +- cuda-version=13.0 +- cudf==25.10.*,>=0.0.0a0 +- dask-cudf==25.10.*,>=0.0.0a0 +- distributed-ucxx==0.46.*,>=0.0.0a0 +- kvikio==25.10.*,>=0.0.0a0 +- numactl-devel-cos7-x86_64 +- numba-cuda>=0.19.0,<0.20.0a0 +- numba>=0.60.0,<0.62.0a0 +- numpy>=1.23,<3.0a0 +- numpydoc>=1.1.0 +- pandas>=1.3 +- pre-commit +- pynvml>=12.0.0,<13.0.0a0 +- pytest +- pytest-cov +- pytest-timeout +- python>=3.10,<3.14 +- rapids-build-backend>=0.4.0,<0.5.0dev0 +- rapids-dask-dependency==25.10.*,>=0.0.0a0 +- setuptools>=64.0.0 +- sphinx +- sphinx-click>=2.7.1 +- sphinx-rtd-theme>=0.5.1 +- ucx-py==0.46.*,>=0.0.0a0 +- ucxx==0.46.*,>=0.0.0a0 +- zict>=2.0.0 +name: all_cuda-130_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index 18373754..2d60e5d4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -97,14 +97,11 @@ dependencies: packages: - cuda-version=13.0 cuda: - specific: + common: - output_types: conda - matrices: - - matrix: - cuda: "12.*" - packages: - - cuda-nvcc-impl - - cuda-nvrtc + packages: + - cuda-nvcc-impl + - cuda-nvrtc develop: common: - output_types: [conda, requirements] @@ -160,10 +157,13 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - &numba_cuda_cu12 numba-cuda[cu12]>=0.19.0,<0.20.0a0 + - numba-cuda[cu12]>=0.19.0,<0.20.0a0 + - matrix: {cuda: "13.*"} + packages: + - &numba_cuda_cu13 numba-cuda[cu13]>=0.19.0,<0.20.0a0 - matrix: # Fallback for no matrix packages: - - *numba_cuda_cu12 + - *numba_cuda_cu13 test_python: common: - output_types: [conda, requirements, pyproject] @@ -201,6 +201,15 @@ dependencies: - distributed-ucxx-cu12==0.46.*,>=0.0.0a0 - kvikio-cu12==25.10.*,>=0.0.0a0 - ucx-py-cu12==0.46.*,>=0.0.0a0 + - matrix: + cuda: "13.*" + cuda_suffixed: "true" + packages: + - cudf-cu13==25.10.*,>=0.0.0a0 + - dask-cudf-cu13==25.10.*,>=0.0.0a0 + - distributed-ucxx-cu13==0.46.*,>=0.0.0a0 + - kvikio-cu13==25.10.*,>=0.0.0a0 + - ucx-py-cu13==0.46.*,>=0.0.0a0 - matrix: packages: - *cudf_unsuffixed diff --git a/pyproject.toml b/pyproject.toml index 4d1bfb46..f3c0ac3c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ license = { text = "Apache-2.0" } requires-python = ">=3.10" dependencies = [ "click >=8.1", - "numba-cuda[cu12]>=0.19.0,<0.20.0a0", + "numba-cuda[cu13]>=0.19.0,<0.20.0a0", "numba>=0.60.0,<0.62.0a0", "numpy>=1.23,<3.0a0", "pandas>=1.3", From 1824e35480e99c19ff998d40542febe29f279033 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 20 Aug 2025 14:07:16 -0500 Subject: [PATCH 03/10] empty commit to fully re-build and re-test with moved numba-cuda pins From caf5b436ceeef64bfbb6f05213e71ce2cbfe9f19 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 22 Aug 2025 14:48:43 -0500 Subject: [PATCH 04/10] merge main --- dependencies.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 85a286cf..9e1a27aa 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -188,7 +188,7 @@ dependencies: - distributed-ucxx-cu12==0.46.*,>=0.0.0a0 - kvikio-cu12==25.10.*,>=0.0.0a0 - ucx-py-cu12==0.46.*,>=0.0.0a0 - - &numba_cuda_cu12 numba-cuda[cu12]>=0.19.0,<0.20.0a0 + - numba-cuda[cu12]>=0.19.0,<0.20.0a0 - matrix: cuda: "13.*" cuda_suffixed: "true" @@ -198,6 +198,7 @@ dependencies: - distributed-ucxx-cu13==0.46.*,>=0.0.0a0 - kvikio-cu13==25.10.*,>=0.0.0a0 - ucx-py-cu13==0.46.*,>=0.0.0a0 + - &numba_cuda_cu13 numba-cuda[cu13]>=0.19.0,<0.20.0a0 - matrix: packages: - *cudf_unsuffixed @@ -205,7 +206,7 @@ dependencies: - *distributed_ucxx_unsuffixed - *kvikio_unsuffixed - *ucx_py_unsuffixed - - *numba_cuda_cu12 + - *numba_cuda_cu13 depends_on_dask_cuda: common: - output_types: conda From 08d5a8478e5ea2a3a5f22dc33425bacb3832a68f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 25 Aug 2025 09:28:27 -0500 Subject: [PATCH 05/10] introduce [cu12] and [cu13] extras --- ci/test_wheel.sh | 9 ++- .../all_cuda-129_arch-aarch64.yaml | 5 +- .../all_cuda-129_arch-x86_64.yaml | 5 +- .../all_cuda-130_arch-aarch64.yaml | 5 +- .../all_cuda-130_arch-x86_64.yaml | 5 +- conda/recipes/dask-cuda/recipe.yaml | 2 +- dependencies.yaml | 80 ++++++++++--------- pyproject.toml | 16 ++++ 8 files changed, 75 insertions(+), 52 deletions(-) diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh index d4bc26f7..e51691ce 100755 --- a/ci/test_wheel.sh +++ b/ci/test_wheel.sh @@ -5,6 +5,9 @@ set -eou pipefail source rapids-init-pip +RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}" +export RAPIDS_CUDA_MAJOR + DASK_CUDA_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="dask-cuda" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-github python) # Install cuda-suffixed dependencies b/c while `dask-cuda` has no cuda suffix, the test dependencies do @@ -16,7 +19,11 @@ rapids-dependency-file-generator \ rapids-logger "Installing test dependencies" # echo to expand wildcard -rapids-pip-retry install -v --prefer-binary -r /tmp/requirements-test.txt "$(echo "${DASK_CUDA_WHEELHOUSE}"/dask_cuda*.whl)" +rapids-pip-retry install \ + -v \ + --prefer-binary \ + -r /tmp/requirements-test.txt \ + "$(echo "${DASK_CUDA_WHEELHOUSE}"/dask_cuda*.whl)[cu${RAPIDS_CUDA_MAJOR}]" EXITCODE=0 # shellcheck disable=SC2317 diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index 5556d926..68727245 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -13,9 +13,9 @@ dependencies: - cudf==25.10.*,>=0.0.0a0 - dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 -- kvikio==25.10.*,>=0.0.0a0 +- kvikio=25.10.*,>=0.0.0a0 - numactl-devel-cos7-aarch64 -- numba-cuda>=0.19.0,<0.20.0a0 +- numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 - numpydoc>=1.1.0 - pandas>=1.3 @@ -32,6 +32,5 @@ dependencies: - sphinx-click>=2.7.1 - sphinx-rtd-theme>=0.5.1 - ucx-py==0.46.*,>=0.0.0a0 -- ucxx==0.46.*,>=0.0.0a0 - zict>=2.0.0 name: all_cuda-129_arch-aarch64 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index 2567ea4f..2fe03723 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -13,9 +13,9 @@ dependencies: - cudf==25.10.*,>=0.0.0a0 - dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 -- kvikio==25.10.*,>=0.0.0a0 +- kvikio=25.10.*,>=0.0.0a0 - numactl-devel-cos7-x86_64 -- numba-cuda>=0.19.0,<0.20.0a0 +- numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 - numpydoc>=1.1.0 - pandas>=1.3 @@ -32,6 +32,5 @@ dependencies: - sphinx-click>=2.7.1 - sphinx-rtd-theme>=0.5.1 - ucx-py==0.46.*,>=0.0.0a0 -- ucxx==0.46.*,>=0.0.0a0 - zict>=2.0.0 name: all_cuda-129_arch-x86_64 diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml index 890f035c..ed663af5 100644 --- a/conda/environments/all_cuda-130_arch-aarch64.yaml +++ b/conda/environments/all_cuda-130_arch-aarch64.yaml @@ -13,9 +13,9 @@ dependencies: - cudf==25.10.*,>=0.0.0a0 - dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 -- kvikio==25.10.*,>=0.0.0a0 +- kvikio=25.10.*,>=0.0.0a0 - numactl-devel-cos7-aarch64 -- numba-cuda>=0.19.0,<0.20.0a0 +- numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 - numpydoc>=1.1.0 - pandas>=1.3 @@ -32,6 +32,5 @@ dependencies: - sphinx-click>=2.7.1 - sphinx-rtd-theme>=0.5.1 - ucx-py==0.46.*,>=0.0.0a0 -- ucxx==0.46.*,>=0.0.0a0 - zict>=2.0.0 name: all_cuda-130_arch-aarch64 diff --git a/conda/environments/all_cuda-130_arch-x86_64.yaml b/conda/environments/all_cuda-130_arch-x86_64.yaml index 48acd1dd..2ff1dce8 100644 --- a/conda/environments/all_cuda-130_arch-x86_64.yaml +++ b/conda/environments/all_cuda-130_arch-x86_64.yaml @@ -13,9 +13,9 @@ dependencies: - cudf==25.10.*,>=0.0.0a0 - dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 -- kvikio==25.10.*,>=0.0.0a0 +- kvikio=25.10.*,>=0.0.0a0 - numactl-devel-cos7-x86_64 -- numba-cuda>=0.19.0,<0.20.0a0 +- numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 - numpydoc>=1.1.0 - pandas>=1.3 @@ -32,6 +32,5 @@ dependencies: - sphinx-click>=2.7.1 - sphinx-rtd-theme>=0.5.1 - ucx-py==0.46.*,>=0.0.0a0 -- ucxx==0.46.*,>=0.0.0a0 - zict>=2.0.0 name: all_cuda-130_arch-x86_64 diff --git a/conda/recipes/dask-cuda/recipe.yaml b/conda/recipes/dask-cuda/recipe.yaml index 9225837e..6e158e71 100644 --- a/conda/recipes/dask-cuda/recipe.yaml +++ b/conda/recipes/dask-cuda/recipe.yaml @@ -37,7 +37,7 @@ requirements: - python - click >=8.1 - numba >=0.60.0,<0.62.0a0 - - numba-cuda >=0.19.0,<0.20.0a0 + - numba-cuda >=0.19.1,<0.20.0a0 - numpy >=1.23,<3.0a0 - pandas >=1.3 - pynvml >=12.0.0,<13.0.0a0 diff --git a/dependencies.yaml b/dependencies.yaml index 9e1a27aa..4cf49511 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -42,6 +42,22 @@ files: table: build-system includes: - build_python + py_cu12: + output: pyproject + pyproject_dir: . + extras: + table: project.optional-dependencies + key: cu12 + includes: + - extra_cu12 + py_cu13: + output: pyproject + pyproject_dir: . + extras: + table: project.optional-dependencies + key: cu13 + includes: + - extra_cu13 py_run: output: pyproject pyproject_dir: . @@ -149,6 +165,26 @@ dependencies: - pynvml>=12.0.0,<13.0.0a0 - rapids-dask-dependency==25.10.*,>=0.0.0a0 - zict>=2.0.0 + extra_cu12: + common: + - output_types: [pyproject] + packages: + - cudf-cu12==25.10.*,>=0.0.0a0 + - dask-cudf-cu12==25.10.*,>=0.0.0a0 + - distributed-ucxx-cu12==0.46.*,>=0.0.0a0 + - kvikio-cu12==25.10.*,>=0.0.0a0 + - ucx-py-cu12==0.46.*,>=0.0.0a0 + - numba-cuda[cu12]>=0.19.1,<0.20.0a0 + extra_cu13: + common: + - output_types: [pyproject] + packages: + - cudf-cu13==25.10.*,>=0.0.0a0 + - dask-cudf-cu13==25.10.*,>=0.0.0a0 + - distributed-ucxx-cu13==0.46.*,>=0.0.0a0 + - kvikio-cu13==25.10.*,>=0.0.0a0 + - ucx-py-cu13==0.46.*,>=0.0.0a0 + - numba-cuda[cu13]>=0.19.1,<0.20.0a0 test_python: common: - output_types: [conda, requirements, pyproject] @@ -158,14 +194,12 @@ dependencies: - pytest-timeout - output_types: [conda] packages: - - &cudf_unsuffixed cudf==25.10.*,>=0.0.0a0 - - &dask_cudf_unsuffixed dask-cudf==25.10.*,>=0.0.0a0 - - &distributed_ucxx_unsuffixed distributed-ucxx==0.46.*,>=0.0.0a0 - - &kvikio_unsuffixed kvikio==25.10.*,>=0.0.0a0 - - &ucx_py_unsuffixed ucx-py==0.46.*,>=0.0.0a0 - - ucxx==0.46.*,>=0.0.0a0 - - &numba_cuda numba-cuda>=0.19.0,<0.20.0a0 - + - cudf==25.10.*,>=0.0.0a0 + - dask-cudf==25.10.*,>=0.0.0a0 + - distributed-ucxx==0.46.*,>=0.0.0a0 + - kvikio=25.10.*,>=0.0.0a0 + - ucx-py==0.46.*,>=0.0.0a0 + - numba-cuda>=0.19.1,<0.20.0a0 specific: - output_types: conda matrices: @@ -177,36 +211,6 @@ dependencies: arch: aarch64 packages: - numactl-devel-cos7-aarch64 - - output_types: [requirements, pyproject] - matrices: - - matrix: - cuda: "12.*" - cuda_suffixed: "true" - packages: - - cudf-cu12==25.10.*,>=0.0.0a0 - - dask-cudf-cu12==25.10.*,>=0.0.0a0 - - distributed-ucxx-cu12==0.46.*,>=0.0.0a0 - - kvikio-cu12==25.10.*,>=0.0.0a0 - - ucx-py-cu12==0.46.*,>=0.0.0a0 - - numba-cuda[cu12]>=0.19.0,<0.20.0a0 - - matrix: - cuda: "13.*" - cuda_suffixed: "true" - packages: - - cudf-cu13==25.10.*,>=0.0.0a0 - - dask-cudf-cu13==25.10.*,>=0.0.0a0 - - distributed-ucxx-cu13==0.46.*,>=0.0.0a0 - - kvikio-cu13==25.10.*,>=0.0.0a0 - - ucx-py-cu13==0.46.*,>=0.0.0a0 - - &numba_cuda_cu13 numba-cuda[cu13]>=0.19.0,<0.20.0a0 - - matrix: - packages: - - *cudf_unsuffixed - - *dask_cudf_unsuffixed - - *distributed_ucxx_unsuffixed - - *kvikio_unsuffixed - - *ucx_py_unsuffixed - - *numba_cuda_cu13 depends_on_dask_cuda: common: - output_types: conda diff --git a/pyproject.toml b/pyproject.toml index cad84bfd..6ebd852c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,6 +51,22 @@ docs = [ "sphinx-click>=2.7.1", "sphinx-rtd-theme>=0.5.1", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`. +cu12 = [ + "cudf-cu12==25.10.*,>=0.0.0a0", + "dask-cudf-cu12==25.10.*,>=0.0.0a0", + "distributed-ucxx-cu12==0.46.*,>=0.0.0a0", + "kvikio-cu12==25.10.*,>=0.0.0a0", + "numba-cuda[cu12]>=0.19.1,<0.20.0a0", + "ucx-py-cu12==0.46.*,>=0.0.0a0", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`. +cu13 = [ + "cudf-cu13==25.10.*,>=0.0.0a0", + "dask-cudf-cu13==25.10.*,>=0.0.0a0", + "distributed-ucxx-cu13==0.46.*,>=0.0.0a0", + "kvikio-cu13==25.10.*,>=0.0.0a0", + "numba-cuda[cu13]>=0.19.1,<0.20.0a0", + "ucx-py-cu13==0.46.*,>=0.0.0a0", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`. [project.urls] Homepage = "https://github.com/rapidsai/dask-cuda" From 041fab093d1638b25458e8a049d83d30d4199e51 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 25 Aug 2025 10:27:26 -0500 Subject: [PATCH 06/10] try to make 'cudf' and 'dask_cudf' optional for tests --- ci/run_benchmarks.sh | 7 +++++++ .../all_cuda-129_arch-aarch64.yaml | 2 -- .../environments/all_cuda-129_arch-x86_64.yaml | 2 -- .../all_cuda-130_arch-aarch64.yaml | 2 -- .../environments/all_cuda-130_arch-x86_64.yaml | 2 -- dask_cuda/tests/test_cudf_builtin_spilling.py | 4 +++- dask_cuda/tests/test_spill.py | 6 +++--- dependencies.yaml | 18 ++++++++++++------ docs/source/install.rst | 12 ++++++++++++ pyproject.toml | 4 ---- 10 files changed, 37 insertions(+), 22 deletions(-) diff --git a/ci/run_benchmarks.sh b/ci/run_benchmarks.sh index b2c8dd36..37ac6bdf 100755 --- a/ci/run_benchmarks.sh +++ b/ci/run_benchmarks.sh @@ -6,6 +6,13 @@ set -euo pipefail # Support invoking run_benchmarks.sh outside the script directory cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../dask_cuda +# TODO: run cudf benchmarks unconditionally once there are CUDA 13 cudf packages +# ref: https://github.com/rapidsai/dask-cuda/pull/1536#issuecomment-321247489 +if [[ ! $(python -c "import cudf") ]]; then + echo "skipping benchmarks: cudf packages not available" + exit 0 +fi + python benchmarks/local_cudf_shuffle.py \ --partition-size="1 KiB" \ -d 0 \ diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index 68727245..2d18c806 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -10,8 +10,6 @@ dependencies: - cuda-nvcc-impl - cuda-nvrtc - cuda-version=12.9 -- cudf==25.10.*,>=0.0.0a0 -- dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio=25.10.*,>=0.0.0a0 - numactl-devel-cos7-aarch64 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index 2fe03723..1f070184 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -10,8 +10,6 @@ dependencies: - cuda-nvcc-impl - cuda-nvrtc - cuda-version=12.9 -- cudf==25.10.*,>=0.0.0a0 -- dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio=25.10.*,>=0.0.0a0 - numactl-devel-cos7-x86_64 diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml index ed663af5..5d26a876 100644 --- a/conda/environments/all_cuda-130_arch-aarch64.yaml +++ b/conda/environments/all_cuda-130_arch-aarch64.yaml @@ -10,8 +10,6 @@ dependencies: - cuda-nvcc-impl - cuda-nvrtc - cuda-version=13.0 -- cudf==25.10.*,>=0.0.0a0 -- dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio=25.10.*,>=0.0.0a0 - numactl-devel-cos7-aarch64 diff --git a/conda/environments/all_cuda-130_arch-x86_64.yaml b/conda/environments/all_cuda-130_arch-x86_64.yaml index 2ff1dce8..aeeca7fb 100644 --- a/conda/environments/all_cuda-130_arch-x86_64.yaml +++ b/conda/environments/all_cuda-130_arch-x86_64.yaml @@ -10,8 +10,6 @@ dependencies: - cuda-nvcc-impl - cuda-nvrtc - cuda-version=13.0 -- cudf==25.10.*,>=0.0.0a0 -- dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio=25.10.*,>=0.0.0a0 - numactl-devel-cos7-x86_64 diff --git a/dask_cuda/tests/test_cudf_builtin_spilling.py b/dask_cuda/tests/test_cudf_builtin_spilling.py index 80b1d482..e7a4e474 100644 --- a/dask_cuda/tests/test_cudf_builtin_spilling.py +++ b/dask_cuda/tests/test_cudf_builtin_spilling.py @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. +# SPDX-License-Identifier: Apache-2.0 import pytest from distributed.sizeof import safe_sizeof @@ -6,6 +8,7 @@ from dask_cuda.is_spillable_object import is_spillable_object from dask_cuda.proxify_host_file import ProxifyHostFile +cudf = pytest.importorskip("cudf") cupy = pytest.importorskip("cupy") pandas = pytest.importorskip("pandas") @@ -14,7 +17,6 @@ reason="Current version of cudf doesn't support built-in spilling", ) -import cudf # noqa: E402 from cudf.core.buffer.spill_manager import ( # noqa: E402 SpillManager, get_global_manager, diff --git a/dask_cuda/tests/test_spill.py b/dask_cuda/tests/test_spill.py index daa4c5bc..ff4b1e65 100644 --- a/dask_cuda/tests/test_spill.py +++ b/dask_cuda/tests/test_spill.py @@ -15,10 +15,10 @@ from distributed.utils import Deadline from distributed.utils_test import gen_cluster, gen_test, loop # noqa: F401 -import dask_cudf +dask_cudf = pytest.importorskip("dask_cudf") -from dask_cuda import LocalCUDACluster, utils -from dask_cuda.utils_test import IncreasedCloseTimeoutNanny +from dask_cuda import LocalCUDACluster, utils # noqa: F402 +from dask_cuda.utils_test import IncreasedCloseTimeoutNanny # noqa: F402 if not utils.has_device_memory_resource(): pytest.skip( diff --git a/dependencies.yaml b/dependencies.yaml index 4cf49511..ebe195f4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -169,8 +169,10 @@ dependencies: common: - output_types: [pyproject] packages: - - cudf-cu12==25.10.*,>=0.0.0a0 - - dask-cudf-cu12==25.10.*,>=0.0.0a0 + # TODO: add 'cudf' and 'dask-cudf' back to this 'dev' dependency list once there are CUDA 13 packages for those + # ref: https://github.com/rapidsai/dask-cuda/pull/1536#issuecomment-3212474898 + # - cudf-cu12==25.10.*,>=0.0.0a0 + # - dask-cudf-cu12==25.10.*,>=0.0.0a0 - distributed-ucxx-cu12==0.46.*,>=0.0.0a0 - kvikio-cu12==25.10.*,>=0.0.0a0 - ucx-py-cu12==0.46.*,>=0.0.0a0 @@ -179,8 +181,10 @@ dependencies: common: - output_types: [pyproject] packages: - - cudf-cu13==25.10.*,>=0.0.0a0 - - dask-cudf-cu13==25.10.*,>=0.0.0a0 + # TODO: add 'cudf' and 'dask-cudf' back to this 'dev' dependency list once there are CUDA 13 packages for those + # ref: https://github.com/rapidsai/dask-cuda/pull/1536#issuecomment-3212474898 + # - cudf-cu13==25.10.*,>=0.0.0a0 + # - dask-cudf-cu13==25.10.*,>=0.0.0a0 - distributed-ucxx-cu13==0.46.*,>=0.0.0a0 - kvikio-cu13==25.10.*,>=0.0.0a0 - ucx-py-cu13==0.46.*,>=0.0.0a0 @@ -194,8 +198,10 @@ dependencies: - pytest-timeout - output_types: [conda] packages: - - cudf==25.10.*,>=0.0.0a0 - - dask-cudf==25.10.*,>=0.0.0a0 + # TODO: add 'cudf' and 'dask-cudf' back to this 'dev' dependency list once there are CUDA 13 packages for those + # ref: https://github.com/rapidsai/dask-cuda/pull/1536#issuecomment-3212474898 + #- cudf==25.10.*,>=0.0.0a0 + #- dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio=25.10.*,>=0.0.0a0 - ucx-py==0.46.*,>=0.0.0a0 diff --git a/docs/source/install.rst b/docs/source/install.rst index 64cefb8e..8f647353 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -28,6 +28,18 @@ To install the latest version of Dask-CUDA: python -m pip install dask-cuda +`dask-cuda` also provides extras to ensure a consistent set of optional dependencies are installed based on the CUDA version you're using. + +.. code-block:: bash + + # CUDA 13 + python -m pip install 'dask-cuda[cu13]' + +.. code-block:: bash + + # CUDA 12 + python -m pip install 'dask-cuda[cu12]' + Source ------ diff --git a/pyproject.toml b/pyproject.toml index 6ebd852c..ebc3f94e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,16 +52,12 @@ docs = [ "sphinx-rtd-theme>=0.5.1", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`. cu12 = [ - "cudf-cu12==25.10.*,>=0.0.0a0", - "dask-cudf-cu12==25.10.*,>=0.0.0a0", "distributed-ucxx-cu12==0.46.*,>=0.0.0a0", "kvikio-cu12==25.10.*,>=0.0.0a0", "numba-cuda[cu12]>=0.19.1,<0.20.0a0", "ucx-py-cu12==0.46.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`. cu13 = [ - "cudf-cu13==25.10.*,>=0.0.0a0", - "dask-cudf-cu13==25.10.*,>=0.0.0a0", "distributed-ucxx-cu13==0.46.*,>=0.0.0a0", "kvikio-cu13==25.10.*,>=0.0.0a0", "numba-cuda[cu13]>=0.19.1,<0.20.0a0", From 4a7e4db4611e9c27a702a29b9c9da9bb4a5dafc9 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 25 Aug 2025 10:30:16 -0500 Subject: [PATCH 07/10] add cudf back to Python 3.12 environment --- .../all_cuda-129_arch-aarch64.yaml | 2 ++ .../all_cuda-129_arch-x86_64.yaml | 2 ++ dask_cuda/tests/test_spill.py | 4 ++-- dependencies.yaml | 19 +++++++++++++------ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index 2d18c806..68727245 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -10,6 +10,8 @@ dependencies: - cuda-nvcc-impl - cuda-nvrtc - cuda-version=12.9 +- cudf==25.10.*,>=0.0.0a0 +- dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio=25.10.*,>=0.0.0a0 - numactl-devel-cos7-aarch64 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index 1f070184..2fe03723 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -10,6 +10,8 @@ dependencies: - cuda-nvcc-impl - cuda-nvrtc - cuda-version=12.9 +- cudf==25.10.*,>=0.0.0a0 +- dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio=25.10.*,>=0.0.0a0 - numactl-devel-cos7-x86_64 diff --git a/dask_cuda/tests/test_spill.py b/dask_cuda/tests/test_spill.py index ff4b1e65..8169d852 100644 --- a/dask_cuda/tests/test_spill.py +++ b/dask_cuda/tests/test_spill.py @@ -17,8 +17,8 @@ dask_cudf = pytest.importorskip("dask_cudf") -from dask_cuda import LocalCUDACluster, utils # noqa: F402 -from dask_cuda.utils_test import IncreasedCloseTimeoutNanny # noqa: F402 +from dask_cuda import LocalCUDACluster, utils # noqa: E402 +from dask_cuda.utils_test import IncreasedCloseTimeoutNanny # noqa: E402 if not utils.has_device_memory_resource(): pytest.skip( diff --git a/dependencies.yaml b/dependencies.yaml index ebe195f4..73e780b1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -169,7 +169,7 @@ dependencies: common: - output_types: [pyproject] packages: - # TODO: add 'cudf' and 'dask-cudf' back to this 'dev' dependency list once there are CUDA 13 packages for those + # TODO: add 'cudf' and 'dask-cudf' back to this dependency list once there are CUDA 13 packages for those # ref: https://github.com/rapidsai/dask-cuda/pull/1536#issuecomment-3212474898 # - cudf-cu12==25.10.*,>=0.0.0a0 # - dask-cudf-cu12==25.10.*,>=0.0.0a0 @@ -181,7 +181,7 @@ dependencies: common: - output_types: [pyproject] packages: - # TODO: add 'cudf' and 'dask-cudf' back to this 'dev' dependency list once there are CUDA 13 packages for those + # TODO: add 'cudf' and 'dask-cudf' back to this dependency list once there are CUDA 13 packages for those # ref: https://github.com/rapidsai/dask-cuda/pull/1536#issuecomment-3212474898 # - cudf-cu13==25.10.*,>=0.0.0a0 # - dask-cudf-cu13==25.10.*,>=0.0.0a0 @@ -198,15 +198,22 @@ dependencies: - pytest-timeout - output_types: [conda] packages: - # TODO: add 'cudf' and 'dask-cudf' back to this 'dev' dependency list once there are CUDA 13 packages for those - # ref: https://github.com/rapidsai/dask-cuda/pull/1536#issuecomment-3212474898 - #- cudf==25.10.*,>=0.0.0a0 - #- dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio=25.10.*,>=0.0.0a0 - ucx-py==0.46.*,>=0.0.0a0 - numba-cuda>=0.19.1,<0.20.0a0 specific: + - output_types: [conda] + matrices: + - matrix: + cuda: "12.*" + packages: + # TODO: add 'cudf' and 'dask-cudf' back to the 'common' list above once there are CUDA 13 packages for those + # ref: https://github.com/rapidsai/dask-cuda/pull/1536#issuecomment-3212474898 + - cudf==25.10.*,>=0.0.0a0 + - dask-cudf==25.10.*,>=0.0.0a0 + - matrix: + packages: - output_types: conda matrices: - matrix: From c457f1fd9daefb60a6034e15cf9ad7a277d0066a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 25 Aug 2025 12:03:03 -0500 Subject: [PATCH 08/10] add dask[dataframe] to wheel testing dependencies --- dependencies.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dependencies.yaml b/dependencies.yaml index 73e780b1..38cc28d2 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -196,6 +196,11 @@ dependencies: - pytest - pytest-cov - pytest-timeout + - output_types: [requirements, pyproject] + packages: + # ensure dependencies of 'dask.dataframe' are available + # ref: https://github.com/rapidsai/dask-cuda/pull/1536#discussion_r2298528510 + - 'dask[dataframe]' - output_types: [conda] packages: - distributed-ucxx==0.46.*,>=0.0.0a0 From 97f2bfb6c268941654fd28fe73b57117007e5a27 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 25 Aug 2025 12:36:41 -0500 Subject: [PATCH 09/10] restore cudf and dask-cudf on CUDA 12, update comment, fix == for kvikio --- conda/environments/all_cuda-129_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-129_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-130_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-130_arch-x86_64.yaml | 2 +- dependencies.yaml | 9 ++++----- pyproject.toml | 2 ++ 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index 68727245..75955111 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -13,7 +13,7 @@ dependencies: - cudf==25.10.*,>=0.0.0a0 - dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 -- kvikio=25.10.*,>=0.0.0a0 +- kvikio==25.10.*,>=0.0.0a0 - numactl-devel-cos7-aarch64 - numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index 2fe03723..d239db96 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -13,7 +13,7 @@ dependencies: - cudf==25.10.*,>=0.0.0a0 - dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 -- kvikio=25.10.*,>=0.0.0a0 +- kvikio==25.10.*,>=0.0.0a0 - numactl-devel-cos7-x86_64 - numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml index 5d26a876..ba602ee8 100644 --- a/conda/environments/all_cuda-130_arch-aarch64.yaml +++ b/conda/environments/all_cuda-130_arch-aarch64.yaml @@ -11,7 +11,7 @@ dependencies: - cuda-nvrtc - cuda-version=13.0 - distributed-ucxx==0.46.*,>=0.0.0a0 -- kvikio=25.10.*,>=0.0.0a0 +- kvikio==25.10.*,>=0.0.0a0 - numactl-devel-cos7-aarch64 - numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 diff --git a/conda/environments/all_cuda-130_arch-x86_64.yaml b/conda/environments/all_cuda-130_arch-x86_64.yaml index aeeca7fb..0dae526f 100644 --- a/conda/environments/all_cuda-130_arch-x86_64.yaml +++ b/conda/environments/all_cuda-130_arch-x86_64.yaml @@ -11,7 +11,7 @@ dependencies: - cuda-nvrtc - cuda-version=13.0 - distributed-ucxx==0.46.*,>=0.0.0a0 -- kvikio=25.10.*,>=0.0.0a0 +- kvikio==25.10.*,>=0.0.0a0 - numactl-devel-cos7-x86_64 - numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 diff --git a/dependencies.yaml b/dependencies.yaml index 38cc28d2..e819d686 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -169,10 +169,8 @@ dependencies: common: - output_types: [pyproject] packages: - # TODO: add 'cudf' and 'dask-cudf' back to this dependency list once there are CUDA 13 packages for those - # ref: https://github.com/rapidsai/dask-cuda/pull/1536#issuecomment-3212474898 - # - cudf-cu12==25.10.*,>=0.0.0a0 - # - dask-cudf-cu12==25.10.*,>=0.0.0a0 + - cudf-cu12==25.10.*,>=0.0.0a0 + - dask-cudf-cu12==25.10.*,>=0.0.0a0 - distributed-ucxx-cu12==0.46.*,>=0.0.0a0 - kvikio-cu12==25.10.*,>=0.0.0a0 - ucx-py-cu12==0.46.*,>=0.0.0a0 @@ -200,11 +198,12 @@ dependencies: packages: # ensure dependencies of 'dask.dataframe' are available # ref: https://github.com/rapidsai/dask-cuda/pull/1536#discussion_r2298528510 + # TODO: remove this once there are CUDA 13 'dask-cudf' packages - 'dask[dataframe]' - output_types: [conda] packages: - distributed-ucxx==0.46.*,>=0.0.0a0 - - kvikio=25.10.*,>=0.0.0a0 + - kvikio==25.10.*,>=0.0.0a0 - ucx-py==0.46.*,>=0.0.0a0 - numba-cuda>=0.19.1,<0.20.0a0 specific: diff --git a/pyproject.toml b/pyproject.toml index ebc3f94e..48dfa08d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,6 +52,8 @@ docs = [ "sphinx-rtd-theme>=0.5.1", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`. cu12 = [ + "cudf-cu12==25.10.*,>=0.0.0a0", + "dask-cudf-cu12==25.10.*,>=0.0.0a0", "distributed-ucxx-cu12==0.46.*,>=0.0.0a0", "kvikio-cu12==25.10.*,>=0.0.0a0", "numba-cuda[cu12]>=0.19.1,<0.20.0a0", From 087d1fe2d5f26ff5fe1a660d56968397f4ee323a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 25 Aug 2025 14:29:02 -0500 Subject: [PATCH 10/10] remove numactl --- conda/environments/all_cuda-129_arch-aarch64.yaml | 1 - conda/environments/all_cuda-129_arch-x86_64.yaml | 1 - conda/environments/all_cuda-130_arch-aarch64.yaml | 1 - conda/environments/all_cuda-130_arch-x86_64.yaml | 1 - dependencies.yaml | 10 ---------- 5 files changed, 14 deletions(-) diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index 75955111..036544fa 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -14,7 +14,6 @@ dependencies: - dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio==25.10.*,>=0.0.0a0 -- numactl-devel-cos7-aarch64 - numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 - numpydoc>=1.1.0 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index d239db96..cbe4f090 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -14,7 +14,6 @@ dependencies: - dask-cudf==25.10.*,>=0.0.0a0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio==25.10.*,>=0.0.0a0 -- numactl-devel-cos7-x86_64 - numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 - numpydoc>=1.1.0 diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml index ba602ee8..e6b70cff 100644 --- a/conda/environments/all_cuda-130_arch-aarch64.yaml +++ b/conda/environments/all_cuda-130_arch-aarch64.yaml @@ -12,7 +12,6 @@ dependencies: - cuda-version=13.0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio==25.10.*,>=0.0.0a0 -- numactl-devel-cos7-aarch64 - numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 - numpydoc>=1.1.0 diff --git a/conda/environments/all_cuda-130_arch-x86_64.yaml b/conda/environments/all_cuda-130_arch-x86_64.yaml index 0dae526f..5cb15cc6 100644 --- a/conda/environments/all_cuda-130_arch-x86_64.yaml +++ b/conda/environments/all_cuda-130_arch-x86_64.yaml @@ -12,7 +12,6 @@ dependencies: - cuda-version=13.0 - distributed-ucxx==0.46.*,>=0.0.0a0 - kvikio==25.10.*,>=0.0.0a0 -- numactl-devel-cos7-x86_64 - numba-cuda>=0.19.1,<0.20.0a0 - numpy>=1.23,<3.0a0 - numpydoc>=1.1.0 diff --git a/dependencies.yaml b/dependencies.yaml index e819d686..886f54d3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -218,16 +218,6 @@ dependencies: - dask-cudf==25.10.*,>=0.0.0a0 - matrix: packages: - - output_types: conda - matrices: - - matrix: - arch: x86_64 - packages: - - numactl-devel-cos7-x86_64 - - matrix: - arch: aarch64 - packages: - - numactl-devel-cos7-aarch64 depends_on_dask_cuda: common: - output_types: conda