Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unpin dask and distributed for 23.12 development #5627

Merged
merged 7 commits into from
Oct 30, 2023
Merged

Unpin dask and distributed for 23.12 development #5627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a3cd51
Unpin dask and distributed for 23.12 development
galipremsagar Oct 23, 2023
304072e
Merge branch 'branch-23.12' into unpin_dask
galipremsagar Oct 26, 2023
35a3375
Merge branch 'branch-23.12' into unpin_dask
csadorf Oct 26, 2023
f49bdef
Update test_wheel.sh
galipremsagar Oct 27, 2023
c8a3cf2
Update test_wheel.sh
galipremsagar Oct 27, 2023
4050ac5
Apply suggestions from code review
galipremsagar Oct 30, 2023
a81a946
Apply suggestions from code review
galipremsagar Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/test_wheel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [[ "$(arch)" == "aarch64" ]]; then
fi

# Always install latest dask for testing
python -m pip install git+https://github.com/dask/dask.git@2023.9.2 git+https://github.com/dask/distributed.git@2023.9.2 git+https://github.com/rapidsai/dask-cuda.git@branch-23.12
python -m pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.12

galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
# echo to expand wildcard before adding `[extra]` requires for pip
python -m pip install $(echo ./dist/cuml*.whl)[test]
Expand Down
6 changes: 3 additions & 3 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ dependencies:
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- dask-core==2023.9.2
- dask-core>=2023.9.2
- dask-cuda==23.12.*
- dask-cudf==23.12.*
- dask-ml
- dask==2023.9.2
- distributed==2023.9.2
- dask>=2023.9.2
- distributed>=2023.9.2
- doxygen=1.9.1
- gcc_linux-64=11.*
- gmock>=1.13.0
Expand Down
6 changes: 3 additions & 3 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ dependencies:
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- dask-core==2023.9.2
- dask-core>=2023.9.2
- dask-cuda==23.12.*
- dask-cudf==23.12.*
- dask-ml
- dask==2023.9.2
- distributed==2023.9.2
- dask>=2023.9.2
- distributed>=2023.9.2
- doxygen=1.9.1
- gcc_linux-64=11.*
- gmock>=1.13.0
Expand Down
6 changes: 3 additions & 3 deletions conda/recipes/cuml/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ requirements:
- cudf ={{ minor_version }}
- cupy >=12.0.0
- dask-cudf ={{ minor_version }}
- dask ==2023.9.2
- dask-core==2023.9.2
- distributed ==2023.9.2
- dask >=2023.9.2
- dask-core>=2023.9.2
- distributed >=2023.9.2
- joblib >=0.11
- libcuml ={{ version }}
- libcumlprims ={{ minor_version }}
Expand Down
6 changes: 3 additions & 3 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- cudf==23.12.*
- dask==2023.9.2
- dask>=2023.9.2
- dask-cuda==23.12.*
- dask-cudf==23.12.*
- distributed==2023.9.2
- distributed>=2023.9.2
- joblib>=0.11
- numba>=0.57
# TODO: Is scipy really a hard dependency, or should
Expand All @@ -192,7 +192,7 @@ dependencies:
- cupy>=12.0.0
- output_types: conda
packages:
- dask-core==2023.9.2
- dask-core>=2023.9.2
- output_types: pyproject
packages:
- *treelite_runtime
Expand Down
4 changes: 2 additions & 2 deletions python/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ Packages required for multigpu algorithms*:
- ucx-py version matching the cuML version
- dask-cudf version matching the cuML version
- nccl>=2.5
- dask==2023.9.2
- distributed==2023.9.2
- dask>=2023.9.2
- distributed>=2023.9.2

* this can be avoided with `--singlegpu` argument flag.

Expand Down
4 changes: 2 additions & 2 deletions python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ dependencies = [
"cupy-cuda11x>=12.0.0",
"dask-cuda==23.12.*",
"dask-cudf==23.12.*",
"dask==2023.9.2",
"distributed==2023.9.2",
"dask>=2023.9.2",
"distributed>=2023.9.2",
"joblib>=0.11",
"numba>=0.57",
"raft-dask==23.12.*",
Expand Down