From 1cfbfd799f28cd9ab2129eeff2ca2d9f2e70417a Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 2 Dec 2022 00:22:25 +0530 Subject: [PATCH] Pin `dask` and `distributed` for release (#2940) This PR pins `dask` and `distributed` to `2022.11.1` for `22.12` release. xref: https://github.com/rapidsai/cudf/pull/12165 Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - Ray Douglass (https://github.com/raydouglass) - Brad Rees (https://github.com/BradReesWork) URL: https://github.com/rapidsai/cugraph/pull/2940 --- .github/workflows/wheels.yml | 4 ++-- conda/environments/cugraph_dev_cuda11.2.yml | 4 ++-- conda/environments/cugraph_dev_cuda11.4.yml | 4 ++-- conda/environments/cugraph_dev_cuda11.5.yml | 4 ++-- conda/environments/cugraph_dev_cuda11.6.yml | 4 ++-- conda/recipes/cugraph-pyg/meta.yaml | 2 +- conda/recipes/cugraph-service/meta.yaml | 2 +- conda/recipes/cugraph/meta.yaml | 4 ++-- python/cugraph-service/server/setup.py | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 9733c318d5e..f1a2b7eb409 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -86,9 +86,9 @@ jobs: skbuild-configure-options: "-DDETECT_CONDA_ENV=OFF -DCUGRAPH_BUILD_WHEELS=ON -DCPM_cugraph-ops_SOURCE=/project/cugraph-ops/" # 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-22.12" + test-before-amd64: "pip install git+https://github.com/dask/dask.git@2022.11.1 git+https://github.com/dask/distributed.git@2022.11.1 git+https://github.com/rapidsai/dask-cuda.git@branch-22.12" # On arm also need to install cupy from the specific webpage. - test-before-arm64: "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-22.12" + test-before-arm64: "pip install cupy-cuda11x -f https://pip.cupy.dev/aarch64 && pip install git+https://github.com/dask/dask.git@2022.11.1 git+https://github.com/dask/distributed.git@2022.11.1 git+https://github.com/rapidsai/dask-cuda.git@branch-22.12" test-extras: test test-unittest: "RAPIDS_DATASET_ROOT_DIR=`pwd`/datasets pytest -v ./python/cugraph/cugraph/tests" secrets: inherit diff --git a/conda/environments/cugraph_dev_cuda11.2.yml b/conda/environments/cugraph_dev_cuda11.2.yml index 8c1533e9d55..7f4e810efac 100644 --- a/conda/environments/cugraph_dev_cuda11.2.yml +++ b/conda/environments/cugraph_dev_cuda11.2.yml @@ -19,8 +19,8 @@ dependencies: - cuda-python>=11.7.1,<12.0 - dask-cuda=22.12.* - dask-cudf=22.12.* -- dask>=2022.9.2 -- distributed>=2022.9.2 +- dask==2022.11.1 +- distributed==2022.11.1 - nccl>=2.9.9 - ucx-py=0.29.* - ucx-proc=*=gpu diff --git a/conda/environments/cugraph_dev_cuda11.4.yml b/conda/environments/cugraph_dev_cuda11.4.yml index dbea039de97..ce01b54feb3 100644 --- a/conda/environments/cugraph_dev_cuda11.4.yml +++ b/conda/environments/cugraph_dev_cuda11.4.yml @@ -19,8 +19,8 @@ dependencies: - cuda-python>=11.7.1,<12.0 - dask-cuda=22.12.* - dask-cudf=22.12.* -- dask>=2022.9.2 -- distributed>=2022.9.2 +- dask==2022.11.1 +- distributed==2022.11.1 - nccl>=2.9.9 - ucx-py=0.29.* - ucx-proc=*=gpu diff --git a/conda/environments/cugraph_dev_cuda11.5.yml b/conda/environments/cugraph_dev_cuda11.5.yml index cf83a9c333a..5c05fa7c276 100644 --- a/conda/environments/cugraph_dev_cuda11.5.yml +++ b/conda/environments/cugraph_dev_cuda11.5.yml @@ -19,8 +19,8 @@ dependencies: - cuda-python>=11.7.1,<12.0 - dask-cuda=22.12.* - dask-cudf=22.12.* -- dask>=2022.9.2 -- distributed>=2022.9.2 +- dask==2022.11.1 +- distributed==2022.11.1 - nccl>=2.9.9 - ucx-py=0.29.* - ucx-proc=*=gpu diff --git a/conda/environments/cugraph_dev_cuda11.6.yml b/conda/environments/cugraph_dev_cuda11.6.yml index 8831c5e0a22..c5c6aa830d5 100644 --- a/conda/environments/cugraph_dev_cuda11.6.yml +++ b/conda/environments/cugraph_dev_cuda11.6.yml @@ -21,8 +21,8 @@ dependencies: - cuda-python>=11.7.1,<12.0 - dask-cuda=22.12.* - dask-cudf=22.12.* -- dask>=2022.9.2 -- distributed>=2022.9.2 +- dask==2022.11.1 +- distributed==2022.11.1 - nccl>=2.9.9 - ucx-py=0.29.* - ucx-proc=*=gpu diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml index 5e85bc0f21a..adf5e7aa796 100644 --- a/conda/recipes/cugraph-pyg/meta.yaml +++ b/conda/recipes/cugraph-pyg/meta.yaml @@ -31,7 +31,7 @@ requirements: # FIXME: this pin can be removed once we move to the GitHub Actions build process - setuptools<=65.2.0 run: - - distributed>=2022.9.2 + - distributed==2022.11.1 - numba>=0.56.2 - numpy - pytorch diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml index d8e0e889183..fd38c586df1 100644 --- a/conda/recipes/cugraph-service/meta.yaml +++ b/conda/recipes/cugraph-service/meta.yaml @@ -54,7 +54,7 @@ outputs: - cupy >=9.5.0,<12.0.0a0 - numpy - ucx-py 0.29.* - - distributed >=2022.9.2 + - distributed ==2022.11.1 - dask-cuda {{ minor_version }}.* - cudf {{ minor_version }}.* - dask-cudf {{ minor_version }}.* diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml index 3c07034446e..b4e595444ba 100644 --- a/conda/recipes/cugraph/meta.yaml +++ b/conda/recipes/cugraph/meta.yaml @@ -59,8 +59,8 @@ requirements: - cupy >=9.5.0,<12.0.0a0 - dask-cudf {{ minor_version }} - dask-cuda {{ minor_version }} - - dask>=2022.9.2 - - distributed>=2022.9.2 + - dask==2022.11.1 + - distributed==2022.11.1 - ucx-py {{ ucx_py_version }} - ucx-proc=*=gpu - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} diff --git a/python/cugraph-service/server/setup.py b/python/cugraph-service/server/setup.py index d09f147ce75..f9d33c28ced 100644 --- a/python/cugraph-service/server/setup.py +++ b/python/cugraph-service/server/setup.py @@ -22,7 +22,7 @@ "cupy >=9.5.0,<12.0.0a0", "numpy", "ucx-py", - "distributed >=2022.9.2", + "distributed ==2022.11.1", "dask-cuda", "thriftpy2", ]