diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 3d09884d21..97bc4a2acc 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -101,9 +101,9 @@ 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@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.08" + 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/dask-cuda.git@branch-23.08" # On arm also need to install CMake because treelite needs to be compiled (no wheels available for arm). - test-before-arm64: "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/dask-cuda.git@branch-23.08" + test-before-arm64: "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/dask-cuda.git@branch-23.08" # parallelization is based on current test memory usage test-unittest: "python -m pytest ./python/cuml/tests -k 'not test_sparse_pca_inputs' -n 8 --ignore=python/cuml/tests/dask && python -m pytest ./python/cuml/tests -k 'test_sparse_pca_inputs' && python -m pytest ./python/cuml/tests/dask" test-smoketest: "python ci/wheel_smoke_test_cuml.py" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2ad5212702..86c415f619 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -49,8 +49,8 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} package-name: cuml - 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/dask-cuda.git@branch-23.08" + 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/dask-cuda.git@branch-23.08" # On arm also need to install CMake because treelite needs to be compiled (no wheels available for arm). - test-before-arm64: "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/dask-cuda.git@branch-23.08" + test-before-arm64: "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/dask-cuda.git@branch-23.08" # parallelization is based on current test memory usage test-unittest: "pytest ./python/cuml/tests -k 'not test_sparse_pca_inputs' -n 8 --ignore=python/cuml/tests/dask && pytest ./python/cuml/tests -k 'test_sparse_pca_inputs' && pytest ./python/cuml/tests/dask" diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index a804817ec1..70de17ae33 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -15,12 +15,12 @@ dependencies: - cupy>=12.0.0 - cxx-compiler - cython>=0.29,<0.30 -- dask-core==2023.3.2 +- dask-core>=2023.5.1 - dask-cuda==23.8.* - dask-cudf==23.8.* - dask-ml -- dask==2023.3.2 -- distributed==2023.3.2.1 +- dask>=2023.5.1 +- distributed>=2023.5.1 - doxygen=1.8.20 - gcc_linux-64=11.* - graphviz diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index 049c6c5c5f..96095485c8 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -70,9 +70,9 @@ requirements: - cudf ={{ minor_version }} - cupy >=12.0.0 - dask-cudf ={{ minor_version }} - - dask ==2023.3.2 - - dask-core==2023.3.2 - - distributed ==2023.3.2.1 + - dask >=2023.5.1 + - dask-core>=2023.5.1 + - distributed >=2023.5.1 - joblib >=0.11 - libcuml ={{ version }} - libcumlprims ={{ minor_version }} diff --git a/dependencies.yaml b/dependencies.yaml index ed06647ae3..fb1e186f87 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -128,10 +128,10 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - cudf==23.8.* - - dask==2023.3.2 + - dask>=2023.5.1 - dask-cuda==23.8.* - dask-cudf==23.8.* - - distributed==2023.3.2.1 + - distributed>=2023.5.1 - joblib>=0.11 - numba>=0.57 # TODO: Is scipy really a hard dependency, or should @@ -145,7 +145,7 @@ dependencies: - cupy>=12.0.0 - output_types: conda packages: - - dask-core==2023.3.2 + - dask-core>=2023.5.1 - output_types: pyproject packages: - *treelite_runtime diff --git a/python/README.md b/python/README.md index b20d615117..e39a8d3949 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>=2.12.0 -- distributed>=2.12.0 +- dask>=2023.5.1 +- distributed>=2023.5.1 * this can be avoided with `--singlegpu` argument flag. diff --git a/python/pyproject.toml b/python/pyproject.toml index 9396420a2c..e3cc89dadd 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -61,8 +61,8 @@ dependencies = [ "cupy-cuda11x>=12.0.0", "dask-cuda==23.8.*", "dask-cudf==23.8.*", - "dask==2023.3.2", - "distributed==2023.3.2.1", + "dask>=2023.5.1", + "distributed>=2023.5.1", "joblib>=0.11", "numba>=0.57", "raft-dask==23.8.*",