Skip to content

Commit

Permalink
Pin dask and distributed for release (#5333)
Browse files Browse the repository at this point in the history
This PR pins `dask` and `distributed` to `2023.3.2` and `2023.3.2.1` respectively for `23.04` release.


xref: rapidsai/cudf#13070

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Ray Douglass (https://github.com/raydouglass)
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: #5333
  • Loading branch information
galipremsagar authored Apr 6, 2023
1 parent 3b9ab5a commit 90fe2d2
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ jobs:
build_type: pull-request
package-name: cuml
# Always want to test against latest dask/distributed.
test-before-amd64: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
test-before-amd64: "pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
# On arm also need to install cupy from the specific webpage and CMake
# because treelite needs to be compiled (no wheels available for arm).
test-before-arm64: "pip install 'cupy-cuda11x<12.0.0' -f https://pip.cupy.dev/aarch64 && pip install cmake && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
test-before-arm64: "pip install 'cupy-cuda11x<12.0.0' -f https://pip.cupy.dev/aarch64 && pip install cmake && pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
# skipped test context: https://github.com/rapidsai/cuml/issues/5025
# parallelization is based on current test memory usage
test-unittest: "pytest -v ./python/cuml/tests -k 'not test_silhouette_score_batched and not test_sparse_pca_inputs' -n 8 --ignore=python/cuml/tests/dask && pytest -v ./python/cuml/tests -k 'test_sparse_pca_inputs' && pytest -v ./python/cuml/tests/dask"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ jobs:
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
package-name: cuml
test-before-amd64: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
test-before-amd64: "pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
# On arm also need to install cupy from the specific webpage and CMake
# because treelite needs to be compiled (no wheels available for arm).
test-before-arm64: "pip install 'cupy-cuda11x<12.0.0' -f https://pip.cupy.dev/aarch64 && pip install cmake && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]"
test-before-arm64: "pip install 'cupy-cuda11x<12.0.0' -f https://pip.cupy.dev/aarch64 && pip install cmake && pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
# skipped test context: https://github.com/rapidsai/cuml/issues/5025
# parallelization is based on current test memory usage
test-unittest: "pytest -v ./python/cuml/tests -k 'not test_silhouette_score_batched and not test_sparse_pca_inputs' -n 8 --ignore=python/cuml/tests/dask && pytest -v ./python/cuml/tests -k 'test_sparse_pca_inputs' && pytest -v ./python/cuml/tests/dask"
5 changes: 3 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ dependencies:
- cupy>=9.5.0,<12.0.0a0
- cxx-compiler
- cython>=0.29,<0.30
- dask-core==2023.3.2
- dask-cuda==23.4.*
- dask-cudf==23.4.*
- dask-ml
- dask>=2023.1.1
- distributed>=2023.1.1
- dask==2023.3.2
- distributed==2023.3.2.1
- doxygen=1.8.20
- faiss-proc=*=cuda
- gcc_linux-64=11.*
Expand Down
5 changes: 3 additions & 2 deletions conda/recipes/cuml/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ requirements:
- cudf ={{ minor_version }}
- cupy >=7.8.0,<12.0.0a0
- dask-cudf ={{ minor_version }}
- dask >=2023.1.1
- distributed >=2023.1.1
- dask ==2023.3.2
- dask-core==2023.3.2
- distributed ==2023.3.2.1
- joblib >=0.11
- libcuml ={{ version }}
- libcumlprims ={{ minor_version }}
Expand Down
7 changes: 5 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- cudf==23.4.*
- dask>=2023.1.1
- dask==2023.3.2
- dask-cuda==23.4.*
- dask-cudf==23.4.*
- distributed>=2023.1.1
- distributed==2023.3.2.1
- joblib>=0.11
- numba
# TODO: Are seaborn and scipy really hard dependencies, or should
Expand All @@ -146,6 +146,9 @@ dependencies:
- output_types: [conda, requirements]
packages:
- cupy>=9.5.0,<12.0.0a0
- output_types: conda
packages:
- dask-core==2023.3.2
- output_types: pyproject
packages:
- &cupy_pip cupy-cuda11x>=9.5.0,<12.0.0a0
Expand Down
4 changes: 2 additions & 2 deletions python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ dependencies = [
"cupy-cuda11x>=9.5.0,<12.0.0a0",
"dask-cuda==23.4.*",
"dask-cudf==23.4.*",
"dask>=2023.1.1",
"distributed>=2023.1.1",
"dask==2023.3.2",
"distributed==2023.3.2.1",
"joblib>=0.11",
"numba",
"raft-dask==23.4.*",
Expand Down

0 comments on commit 90fe2d2

Please sign in to comment.