Skip to content

Commit

Permalink
Pin dask and distributed for release (#3427)
Browse files Browse the repository at this point in the history
This PR pins `dask` and `distributed` to `2023.3.2` and `2023.3.2.1` respectively for `23.04` release.

xref: rapidsai/cudf#13070

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Rick Ratzel (https://github.com/rlratzel)
  - Joseph (https://github.com/jolorunyomi)

URL: #3427
  • Loading branch information
galipremsagar authored Apr 6, 2023
1 parent a4c97b5 commit 72cffc1
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ 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.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/[email protected]"
# Skip dataset downloads on arm to save CI time -- arm only runs smoke tests.
# 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<12.0.0' -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<12.0.0' -f https://pip.cupy.dev/aarch64 && 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/[email protected]"
test-unittest: "RAPIDS_DATASET_ROOT_DIR=/__w/cugraph/cugraph/datasets pytest -v -m sg ./python/cugraph/cugraph/tests"
test-smoketest: "python ci/wheel_smoke_test_cugraph.py"
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.2 git+https://github.com/dask/distributed.git@2023.3.2.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<12.0.0' -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<12.0.0' -f https://pip.cupy.dev/aarch64 && 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/[email protected]"
test-unittest: "RAPIDS_DATASET_ROOT_DIR=/__w/cugraph/cugraph/datasets pytest -v -m sg ./python/cugraph/cugraph/tests"
5 changes: 3 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ 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>=2023.1.1
- distributed>=2023.1.1
- dask==2023.3.2
- distributed==2023.3.2.1
- doxygen
- fsspec[http]>=0.6.0
- gcc_linux-64=11.*
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cugraph-pyg/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ requirements:
- python x.x
- scikit-build >=0.13.1
run:
- distributed >=2023.1.1
- distributed ==2023.3.2.1
- numba >=0.56.2
- numpy
- pytorch >=2.0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cugraph-service/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ outputs:
- cupy >=9.5.0,<12.0.0a0
- dask-cuda ={{ minor_version }}
- dask-cudf ={{ minor_version }}
- distributed >=2023.1.1
- distributed ==2023.3.2.1
- numpy
- python x.x
- thriftpy2 >=0.4.15
Expand Down
5 changes: 3 additions & 2 deletions conda/recipes/cugraph/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ requirements:
- cupy >=9.5.0,<12.0.0a0
- dask-cuda ={{ minor_version }}
- 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
- libcugraph ={{ version }}
- libraft ={{ minor_version }}
- libraft-headers ={{ minor_version }}
Expand Down
6 changes: 4 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,8 @@ dependencies:
packages:
- cuda-python>=11.7.1,<12.0
- &cudf cudf==23.4.*
- &dask dask>=2023.1.1
- &distributed distributed>=2023.1.1
- &dask dask==2023.3.2
- &distributed distributed==2023.3.2.1
- &dask_cuda dask-cuda==23.4.*
- &dask_cudf dask-cudf==23.4.*
- &numba numba>=0.56.2
Expand All @@ -306,6 +306,7 @@ dependencies:
- output_types: conda
packages:
- &cupy cupy>=9.5.0,<12.0.0a0
- &dask-core dask-core==2023.3.2
- libcudf=23.04.*
- nccl>=2.9.9
- ucx-proc=*=gpu
Expand Down Expand Up @@ -349,6 +350,7 @@ dependencies:
- output_types: conda
packages:
- *cupy
- *dask-core
- output_types: pyproject
packages:
- *cupy_pip
Expand Down
4 changes: 2 additions & 2 deletions python/cugraph-service/server/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,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",
"numpy>=1.21",
"rmm==23.4.*",
"thriftpy2",
Expand Down
4 changes: 2 additions & 2 deletions python/cugraph/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,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",
"numba>=0.56.2",
"pylibcugraph==23.4.*",
"raft-dask==23.4.*",
Expand Down

0 comments on commit 72cffc1

Please sign in to comment.