diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index f8b865d3b5..f2c5803ce7 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -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/dask-cuda.git@branch-23.04" + 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.04" # 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/dask-cuda.git@branch-23.04" + 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/dask-cuda.git@branch-23.04" # 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" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 990b8f948a..df659eb33a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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/dask-cuda.git@branch-23.04" + 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.04" # 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/dask-cuda.git@branch-23.04" + 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/dask-cuda.git@branch-23.04" # 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" diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 9fe650c784..4fc8aa3b08 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -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.* diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index 0489842c15..50b8bbc2b6 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -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 }} diff --git a/dependencies.yaml b/dependencies.yaml index 4edcc06348..3dd3e723ae 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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 @@ -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 diff --git a/python/pyproject.toml b/python/pyproject.toml index 054d96486e..e50c123abf 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -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.*",