From 40986acfa48965e469d0d5da02ffc28aac19080f Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 23 Aug 2023 09:05:13 -0500 Subject: [PATCH] Unpin dask and development for 23.10 development (#5557) This PR unpins `dask` and `distributed` to use nightly builds for `23.10` development. xref: https://github.com/rapidsai/cudf/pull/13935 Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - Ray Douglass (https://github.com/raydouglass) - https://github.com/jakirkham - Dante Gama Dessavre (https://github.com/dantegd) - Peter Andreas Entschev (https://github.com/pentschev) --- ci/test_wheel.sh | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 6 +++--- conda/environments/all_cuda-120_arch-x86_64.yaml | 6 +++--- conda/recipes/cuml/meta.yaml | 6 +++--- dependencies.yaml | 6 +++--- python/README.md | 4 ++-- python/pyproject.toml | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh index 52b83ec659..de6144c84b 100755 --- a/ci/test_wheel.sh +++ b/ci/test_wheel.sh @@ -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.7.1 git+https://github.com/dask/distributed.git@2023.7.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.10 +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.10 # echo to expand wildcard before adding `[extra]` requires for pip python -m pip install $(echo ./dist/cuml*.whl)[test] diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 2592bc6969..ea6a55c786 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -16,12 +16,12 @@ dependencies: - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 -- dask-core==2023.7.1 +- dask-core>=2023.7.1 - dask-cuda==23.10.* - dask-cudf==23.10.* - dask-ml -- dask==2023.7.1 -- distributed==2023.7.1 +- dask>=2023.7.1 +- distributed>=2023.7.1 - doxygen=1.8.20 - gcc_linux-64=11.* - gmock>=1.13.0 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 62e9025eed..ced4830f77 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -18,12 +18,12 @@ dependencies: - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 -- dask-core==2023.7.1 +- dask-core>=2023.7.1 - dask-cuda==23.10.* - dask-cudf==23.10.* - dask-ml -- dask==2023.7.1 -- distributed==2023.7.1 +- dask>=2023.7.1 +- distributed>=2023.7.1 - doxygen=1.8.20 - gcc_linux-64=11.* - gmock>=1.13.0 diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index e01cff0430..2f2864f176 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -76,9 +76,9 @@ requirements: - cudf ={{ minor_version }} - cupy >=12.0.0 - dask-cudf ={{ minor_version }} - - dask ==2023.7.1 - - dask-core==2023.7.1 - - distributed ==2023.7.1 + - dask >=2023.7.1 + - dask-core>=2023.7.1 + - distributed >=2023.7.1 - joblib >=0.11 - libcuml ={{ version }} - libcumlprims ={{ minor_version }} diff --git a/dependencies.yaml b/dependencies.yaml index 659743a1e5..66ef637f97 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -175,10 +175,10 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - cudf==23.10.* - - dask==2023.7.1 + - dask>=2023.7.1 - dask-cuda==23.10.* - dask-cudf==23.10.* - - distributed==2023.7.1 + - distributed>=2023.7.1 - joblib>=0.11 - numba>=0.57 # TODO: Is scipy really a hard dependency, or should @@ -192,7 +192,7 @@ dependencies: - cupy>=12.0.0 - output_types: conda packages: - - dask-core==2023.7.1 + - dask-core>=2023.7.1 - output_types: pyproject packages: - *treelite_runtime diff --git a/python/README.md b/python/README.md index 1ed0cdf2f2..bcb2bf6d17 100644 --- a/python/README.md +++ b/python/README.md @@ -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.7.1 -- distributed==2023.7.1 +- dask>=2023.7.1 +- distributed>=2023.7.1 * this can be avoided with `--singlegpu` argument flag. diff --git a/python/pyproject.toml b/python/pyproject.toml index 869196d27f..0a4f8589ff 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -61,8 +61,8 @@ dependencies = [ "cupy-cuda11x>=12.0.0", "dask-cuda==23.10.*", "dask-cudf==23.10.*", - "dask==2023.7.1", - "distributed==2023.7.1", + "dask>=2023.7.1", + "distributed>=2023.7.1", "joblib>=0.11", "numba>=0.57", "raft-dask==23.10.*",