Skip to content

Commit

Permalink
Merge branch 'branch-24.10' into cudf-spill-aware-serializer
Browse files Browse the repository at this point in the history
  • Loading branch information
@pentschev
pentschev authored Jul 29, 2024
2 parents 5c39bb2 + 14efa4d commit 5600d99
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 54 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ concurrency:
jobs:
conda-python-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -38,7 +38,7 @@ jobs:
if: github.ref_type == 'branch'
needs: [conda-python-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
with:
arch: "amd64"
branch: ${{ inputs.branch }}
Expand All @@ -51,15 +51,15 @@ jobs:
upload-conda:
needs: [conda-python-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.10
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
wheel-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -72,7 +72,7 @@ jobs:
wheel-publish:
needs: wheel-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.10
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,26 @@ jobs:
- docs-build
- wheel-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10
checks:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10
conda-python-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
with:
build_type: pull-request
conda-python-tests:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10
with:
build_type: pull-request
docs-build:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
with:
build_type: pull-request
node_type: "gpu-v100-latest-1"
Expand All @@ -46,7 +46,7 @@ jobs:
run_script: "ci/build_docs.sh"
wheel-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
with:
build_type: pull-request
# Package is pure Python and only ever requires one build.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
conda-python-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10
with:
build_type: nightly
branch: ${{ inputs.branch }}
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.08.00
24.10.00
2 changes: 1 addition & 1 deletion ci/build_docs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ rapids-mamba-retry install \
--channel "${PYTHON_CHANNEL}" \
dask-cuda

export RAPIDS_VERSION_NUMBER="24.08"
export RAPIDS_VERSION_NUMBER="24.10"
export RAPIDS_DOCS_DIR="$(mktemp -d)"

rapids-logger "Build Python docs"
Expand Down
14 changes: 7 additions & 7 deletions conda/environments/all_cuda-114_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ dependencies:
- click >=8.1
- cuda-version=11.4
- cudatoolkit
- cudf==24.8.*,>=0.0.0a0
- dask-cudf==24.8.*,>=0.0.0a0
- distributed-ucxx==0.39.*,>=0.0.0a0
- kvikio==24.8.*,>=0.0.0a0
- cudf==24.10.*,>=0.0.0a0
- dask-cudf==24.10.*,>=0.0.0a0
- distributed-ucxx==0.40.*,>=0.0.0a0
- kvikio==24.10.*,>=0.0.0a0
- numactl-devel-cos7-x86_64
- numba>=0.57
- numpy>=1.23,<2.0a0
Expand All @@ -25,13 +25,13 @@ dependencies:
- pytest-cov
- python>=3.9,<3.12
- rapids-build-backend>=0.3.0,<0.4.0dev0
- rapids-dask-dependency==24.8.*,>=0.0.0a0
- rapids-dask-dependency==24.10.*,>=0.0.0a0
- setuptools>=64.0.0
- sphinx
- sphinx-click>=2.7.1
- sphinx-rtd-theme>=0.5.1
- ucx-proc=*=gpu
- ucx-py==0.39.*,>=0.0.0a0
- ucxx==0.39.*,>=0.0.0a0
- ucx-py==0.40.*,>=0.0.0a0
- ucxx==0.40.*,>=0.0.0a0
- zict>=2.0.0
name: all_cuda-114_arch-x86_64
14 changes: 7 additions & 7 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ dependencies:
- click >=8.1
- cuda-version=11.8
- cudatoolkit
- cudf==24.8.*,>=0.0.0a0
- dask-cudf==24.8.*,>=0.0.0a0
- distributed-ucxx==0.39.*,>=0.0.0a0
- kvikio==24.8.*,>=0.0.0a0
- cudf==24.10.*,>=0.0.0a0
- dask-cudf==24.10.*,>=0.0.0a0
- distributed-ucxx==0.40.*,>=0.0.0a0
- kvikio==24.10.*,>=0.0.0a0
- numactl-devel-cos7-x86_64
- numba>=0.57
- numpy>=1.23,<2.0a0
Expand All @@ -25,13 +25,13 @@ dependencies:
- pytest-cov
- python>=3.9,<3.12
- rapids-build-backend>=0.3.0,<0.4.0dev0
- rapids-dask-dependency==24.8.*,>=0.0.0a0
- rapids-dask-dependency==24.10.*,>=0.0.0a0
- setuptools>=64.0.0
- sphinx
- sphinx-click>=2.7.1
- sphinx-rtd-theme>=0.5.1
- ucx-proc=*=gpu
- ucx-py==0.39.*,>=0.0.0a0
- ucxx==0.39.*,>=0.0.0a0
- ucx-py==0.40.*,>=0.0.0a0
- ucxx==0.40.*,>=0.0.0a0
- zict>=2.0.0
name: all_cuda-118_arch-x86_64
14 changes: 7 additions & 7 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ dependencies:
- cuda-nvcc-impl
- cuda-nvrtc
- cuda-version=12.5
- cudf==24.8.*,>=0.0.0a0
- dask-cudf==24.8.*,>=0.0.0a0
- distributed-ucxx==0.39.*,>=0.0.0a0
- kvikio==24.8.*,>=0.0.0a0
- cudf==24.10.*,>=0.0.0a0
- dask-cudf==24.10.*,>=0.0.0a0
- distributed-ucxx==0.40.*,>=0.0.0a0
- kvikio==24.10.*,>=0.0.0a0
- numactl-devel-cos7-x86_64
- numba>=0.57
- numpy>=1.23,<2.0a0
Expand All @@ -26,13 +26,13 @@ dependencies:
- pytest-cov
- python>=3.9,<3.12
- rapids-build-backend>=0.3.0,<0.4.0dev0
- rapids-dask-dependency==24.8.*,>=0.0.0a0
- rapids-dask-dependency==24.10.*,>=0.0.0a0
- setuptools>=64.0.0
- sphinx
- sphinx-click>=2.7.1
- sphinx-rtd-theme>=0.5.1
- ucx-proc=*=gpu
- ucx-py==0.39.*,>=0.0.0a0
- ucxx==0.39.*,>=0.0.0a0
- ucx-py==0.40.*,>=0.0.0a0
- ucxx==0.40.*,>=0.0.0a0
- zict>=2.0.0
name: all_cuda-125_arch-x86_64
26 changes: 13 additions & 13 deletions dependencies.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ dependencies:
- numpy>=1.23,<2.0a0
- pandas>=1.3
- pynvml>=11.0.0,<11.5
- rapids-dask-dependency==24.8.*,>=0.0.0a0
- rapids-dask-dependency==24.10.*,>=0.0.0a0
- zict>=2.0.0
test_python:
common:
Expand All @@ -168,13 +168,13 @@ dependencies:
- pytest-cov
- output_types: [conda]
packages:
- &cudf_unsuffixed cudf==24.8.*,>=0.0.0a0
- &dask_cudf_unsuffixed dask-cudf==24.8.*,>=0.0.0a0
- distributed-ucxx==0.39.*,>=0.0.0a0
- &kvikio_unsuffixed kvikio==24.8.*,>=0.0.0a0
- &ucx_py_unsuffixed ucx-py==0.39.*,>=0.0.0a0
- &cudf_unsuffixed cudf==24.10.*,>=0.0.0a0
- &dask_cudf_unsuffixed dask-cudf==24.10.*,>=0.0.0a0
- distributed-ucxx==0.40.*,>=0.0.0a0
- &kvikio_unsuffixed kvikio==24.10.*,>=0.0.0a0
- &ucx_py_unsuffixed ucx-py==0.40.*,>=0.0.0a0
- ucx-proc=*=gpu
- ucxx==0.39.*,>=0.0.0a0
- ucxx==0.40.*,>=0.0.0a0
specific:
- output_types: conda
matrices:
Expand All @@ -194,16 +194,16 @@ dependencies:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- cudf-cu12==24.8.*,>=0.0.0a0
- dask-cudf-cu12==24.8.*,>=0.0.0a0
- ucx-py-cu12==0.39.*,>=0.0.0a0
- cudf-cu12==24.10.*,>=0.0.0a0
- dask-cudf-cu12==24.10.*,>=0.0.0a0
- ucx-py-cu12==0.40.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- cudf-cu11==24.8.*,>=0.0.0a0
- dask-cudf-cu11==24.8.*,>=0.0.0a0
- ucx-py-cu11==0.39.*,>=0.0.0a0
- cudf-cu11==24.10.*,>=0.0.0a0
- dask-cudf-cu11==24.10.*,>=0.0.0a0
- ucx-py-cu11==0.40.*,>=0.0.0a0
- matrix:
packages:
- *cudf_unsuffixed
Expand Down
2 changes: 1 addition & 1 deletion docs/source/explicit_comms.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ Usage
In order to use explicit-comms in Dask/Distributed automatically, simply define the environment variable ``DASK_EXPLICIT_COMMS=True`` or setting the ``"explicit-comms"``
key in the `Dask configuration <https://docs.dask.org/en/latest/configuration.html>`_.

It is also possible to use explicit-comms in tasks manually, see the `API <../api/#explicit-comms>`_ and our `implementation of shuffle <https://github.com/rapidsai/dask-cuda/blob/branch-24.08/dask_cuda/explicit_comms/dataframe/shuffle.py>`_ for guidance.
It is also possible to use explicit-comms in tasks manually, see the `API <../api/#explicit-comms>`_ and our `implementation of shuffle <https://github.com/rapidsai/dask-cuda/blob/branch-24.10/dask_cuda/explicit_comms/dataframe/shuffle.py>`_ for guidance.
10 changes: 5 additions & 5 deletions pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies = [
"numpy>=1.23,<2.0a0",
"pandas>=1.3",
"pynvml>=11.0.0,<11.5",
"rapids-dask-dependency==24.8.*,>=0.0.0a0",
"rapids-dask-dependency==24.10.*,>=0.0.0a0",
"zict>=2.0.0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
Expand Down Expand Up @@ -50,12 +50,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`.
test = [
"cudf==24.8.*,>=0.0.0a0",
"dask-cudf==24.8.*,>=0.0.0a0",
"kvikio==24.8.*,>=0.0.0a0",
"cudf==24.10.*,>=0.0.0a0",
"dask-cudf==24.10.*,>=0.0.0a0",
"kvikio==24.10.*,>=0.0.0a0",
"pytest",
"pytest-cov",
"ucx-py==0.39.*,>=0.0.0a0",
"ucx-py==0.40.*,>=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]
Expand Down

0 comments on commit 5600d99

Please sign in to comment.