Merge pull request #3240 from galipremsagar/branch-23.04-merge-23.02

[REVIEW] Resolve auto merger

.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/[email protected]"
+      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/[email protected]"
       # 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/[email protected]"
+      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/[email protected]"
       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"

.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/[email protected]"
+      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/[email protected]"
       # 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/[email protected]"
+      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/[email protected]"
       test-unittest: "RAPIDS_DATASET_ROOT_DIR=/__w/cugraph/cugraph/datasets pytest -v ./python/cugraph/cugraph/tests --ignore=./python/cugraph/cugraph/tests/mg"

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -17,8 +17,8 @@ dependencies:
 - cython>=0.29,<0.30
 - dask-cuda=23.04.*
 - dask-cudf=23.04.*
-- 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

conda/recipes/cugraph-pyg/meta.yaml

@@ -29,7 +29,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

conda/recipes/cugraph-service/meta.yaml

@@ -59,7 +59,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

conda/recipes/cugraph/meta.yaml

@@ -72,8 +72,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 }}

dependencies.yaml

@@ -139,10 +139,10 @@ dependencies:
           - cuda-python>=11.7.1,<12.0
           - cudf=23.04.*
           - cython>=0.29,<0.30
-          - dask>=2022.12.0
+          - dask==2023.1.1
+          - distributed==2023.1.1
           - dask-cuda=23.04.*
           - dask-cudf=23.04.*
-          - distributed>=2022.12.0
           - libcudf=23.04.*
           - nccl>=2.9.9
           - pylibraft=23.04.*

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",