From 8abfd64332fb902aff9eb7c9e5b7bf990dc9bbf4 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Sun, 5 Feb 2023 18:19:15 -0600 Subject: [PATCH] Pin `dask` and `distributed` for release (#5198) This PR pins `dask` and `distributed` to `2023.1.1` for `23.02` release. xref: https://github.com/rapidsai/cudf/pull/12695 Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - Mark Sadang (https://github.com/msadang) - Dante Gama Dessavre (https://github.com/dantegd) URL: https://github.com/rapidsai/cuml/pull/5198 --- .github/workflows/pr.yaml | 4 ++-- .github/workflows/test.yaml | 4 ++-- ci/gpu/build.sh | 4 ++-- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/recipes/cuml/meta.yaml | 4 ++-- dependencies.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 3b14503474..f89ed7e331 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -99,10 +99,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.02" + test-before-amd64: "pip install git+https://github.com/dask/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" # 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 -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.02" + test-before-arm64: "pip install cupy-cuda11x -f https://pip.cupy.dev/aarch64 && pip install cmake && pip install git+https://github.com/dask/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" # 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=dask && pytest -v ./python/cuml/tests -k 'test_sparse_pca_inputs' --ignore=dask && pytest -v ./python/cuml/tests/dask" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6e83d37771..134960e30c 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.02" + test-before-amd64: "pip install git+https://github.com/dask/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" # 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 -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.02" + test-before-arm64: "pip install cupy-cuda11x -f https://pip.cupy.dev/aarch64 && pip install cmake && pip install git+https://github.com/dask/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" # 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=dask && pytest -v ./python/cuml/tests -k 'test_sparse_pca_inputs' --ignore=dask && pytest -v ./python/cuml/tests/dask" diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 4720e1a6f1..63e6d64e86 100644 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -43,10 +43,10 @@ unset GIT_DESCRIBE_TAG export NUMBA_THREADING_LAYER=workqueue # Whether to install dask nightly or stable packages -export INSTALL_DASK_MAIN=1 +export INSTALL_DASK_MAIN=0 # Dask version to install when `INSTALL_DASK_MAIN=0` -export DASK_STABLE_VERSION="2022.12.0" +export DASK_STABLE_VERSION="2023.1.1" ################################################################################ # SETUP - Check environment diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 3101cacbe3..13a01febe0 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -18,8 +18,8 @@ dependencies: - dask-cuda=23.02.* - dask-cudf=23.02.* - dask-ml -- dask>=2022.12.0 -- distributed>=2022.12.0 +- dask==2023.1.1 +- distributed==2023.1.1 - doxygen=1.8.20 - faiss-proc=*=cuda - gcc_linux-64=9.* diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index d432b131fc..2f9c771467 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -69,8 +69,8 @@ requirements: - cudf ={{ minor_version }} - cupy >=7.8.0,<12.0.0a0 - dask-cudf ={{ minor_version }} - - dask >=2022.12.0 - - distributed >=2022.12.0 + - dask ==2023.1.1 + - distributed ==2023.1.1 - joblib >=0.11 - libcuml ={{ version }} - libcumlprims ={{ minor_version }} diff --git a/dependencies.yaml b/dependencies.yaml index 795e364e47..beb1436a90 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -109,8 +109,8 @@ dependencies: common: - output_types: [conda, requirements] packages: - - dask>=2022.12.0 - - distributed>=2022.12.0 + - dask==2023.1.1 + - distributed==2023.1.1 - joblib>=0.11 - output_types: conda packages: