From f2b081075704aabc789603e14ce552eac3fbe692 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Mon, 6 Feb 2023 12:46:06 -0600 Subject: [PATCH] [REVIEW] Pin `dask` and `distributed` for release (#3232) 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: - Brad Rees (https://github.com/BradReesWork) - Jordan Jacobelli (https://github.com/Ethyling) --- .github/workflows/pr.yaml | 4 ++-- .github/workflows/test.yaml | 4 ++-- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/recipes/cugraph-pyg/meta.yaml | 4 ++-- conda/recipes/cugraph-service/meta.yaml | 4 ++-- conda/recipes/cugraph/meta.yaml | 6 +++--- dependencies.yaml | 4 ++-- python/cugraph-service/server/setup.py | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 8a7a0035d66..2711d7b9853 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -106,8 +106,8 @@ jobs: build_type: pull-request package-name: cugraph # Always want to test against latest dask/distributed. - test-before-amd64: "cd ./datasets && bash ./get_test_data.sh && cd - && RAPIDS_PY_WHEEL_NAME=pylibcugraph_cu11 rapids-download-wheels-from-s3 ./local-pylibcugraph-dep && pip install --no-deps ./local-pylibcugraph-dep/*.whl && 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: "cd ./datasets && bash ./get_test_data.sh && cd - && RAPIDS_PY_WHEEL_NAME=pylibcugraph_cu11 rapids-download-wheels-from-s3 ./local-pylibcugraph-dep && pip install --no-deps ./local-pylibcugraph-dep/*.whl && 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 site. - test-before-arm64: "RAPIDS_PY_WHEEL_NAME=pylibcugraph_cu11 rapids-download-wheels-from-s3 ./local-pylibcugraph-dep && pip install --no-deps ./local-pylibcugraph-dep/*.whl && pip install cupy-cuda11x -f https://pip.cupy.dev/aarch64 && 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: "RAPIDS_PY_WHEEL_NAME=pylibcugraph_cu11 rapids-download-wheels-from-s3 ./local-pylibcugraph-dep && pip install --no-deps ./local-pylibcugraph-dep/*.whl && pip install cupy-cuda11x -f https://pip.cupy.dev/aarch64 && 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" test-unittest: "RAPIDS_DATASET_ROOT_DIR=/__w/cugraph/cugraph/datasets pytest -v ./python/cugraph/cugraph/tests --ignore=./python/cugraph/cugraph/tests/mg" test-smoketest: "python ci/wheel_smoke_test_cugraph.py" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 533a2b5ce29..1fbcc5bb2a1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -52,7 +52,7 @@ jobs: sha: ${{ inputs.sha }} package-name: cugraph # Always want to test against latest dask/distributed. - test-before-amd64: "cd ./datasets && bash ./get_test_data.sh && cd - && 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: "cd ./datasets && bash ./get_test_data.sh && cd - && 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. - test-before-arm64: "cd ./datasets && bash ./get_test_data.sh && cd - && pip install cupy-cuda11x -f https://pip.cupy.dev/aarch64 && 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: "cd ./datasets && bash ./get_test_data.sh && cd - && pip install cupy-cuda11x -f https://pip.cupy.dev/aarch64 && 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" test-unittest: "RAPIDS_DATASET_ROOT_DIR=/__w/cugraph/cugraph/datasets pytest -v ./python/cugraph/cugraph/tests --ignore=./python/cugraph/cugraph/tests/mg" diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index d2e31c5c491..6417153d7a6 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -17,8 +17,8 @@ dependencies: - cython>=0.29,<0.30 - dask-cuda=23.02.* - dask-cudf=23.02.* -- dask>=2022.12.0 -- distributed>=2022.12.0 +- dask==2023.1.1 +- distributed==2023.1.1 - doxygen - gcc_linux-64=9.* - gmock=1.10.0 diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml index b7306668ff7..d5af1bffb48 100644 --- a/conda/recipes/cugraph-pyg/meta.yaml +++ b/conda/recipes/cugraph-pyg/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. # Usage: # conda build -c rapidsai -c conda-forge -c nvidia . @@ -30,7 +30,7 @@ requirements: # FIXME: this pin can be removed once we move to the GitHub Actions build process - setuptools <=65.2.0 run: - - distributed >=2022.12.0 + - distributed ==2023.1.1 - numba >=0.56.2 - numpy - pytorch <=1.12.1 diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml index 26e6c3059b3..dc794b866ac 100644 --- a/conda/recipes/cugraph-service/meta.yaml +++ b/conda/recipes/cugraph-service/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2022, NVIDIA CORPORATION. +# Copyright (c) 2018-2023, NVIDIA CORPORATION. # Usage: # conda build -c nvidia -c rapidsai -c conda-forge . @@ -53,7 +53,7 @@ outputs: - cupy >=9.5.0,<12.0.0a0 - dask-cuda ={{ minor_version }} - dask-cudf ={{ minor_version }} - - distributed >=2022.12.0 + - distributed ==2023.1.1 - numpy - python x.x - thriftpy2 >=0.4.15 diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml index f27a203cf59..0727d9fe1d5 100644 --- a/conda/recipes/cugraph/meta.yaml +++ b/conda/recipes/cugraph/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2022, NVIDIA CORPORATION. +# Copyright (c) 2018-2023, NVIDIA CORPORATION. # Usage: # conda build -c rapidsai -c conda-forge -c nvidia . @@ -73,8 +73,8 @@ requirements: - cupy >=9.5.0,<12.0.0a0 - dask-cuda ={{ minor_version }} - dask-cudf ={{ minor_version }} - - dask >=2022.12.0 - - distributed >=2022.12.0 + - dask ==2023.1.1 + - distributed ==2023.1.1 - libcugraph ={{ version }} - libraft-distance ={{ minor_version }} - libraft-headers ={{ minor_version }} diff --git a/dependencies.yaml b/dependencies.yaml index 94489e70116..e7304142f5c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -139,10 +139,10 @@ dependencies: - cuda-python>=11.7.1,<12.0 - cudf=23.02.* - cython>=0.29,<0.30 - - dask>=2022.12.0 + - dask==2023.1.1 - dask-cuda=23.02.* - dask-cudf=23.02.* - - distributed>=2022.12.0 + - distributed==2023.1.1 - libcudf=23.02.* - nccl>=2.9.9 - pylibraft=23.02.* diff --git a/python/cugraph-service/server/setup.py b/python/cugraph-service/server/setup.py index 24abaf70975..08313744a56 100644 --- a/python/cugraph-service/server/setup.py +++ b/python/cugraph-service/server/setup.py @@ -23,7 +23,7 @@ "cupy-cuda11x", "dask-cuda", "dask-cudf", - "distributed >=2022.12.0", + "distributed ==2023.1.1", "numpy", "rmm", "thriftpy2",