Skip to content

Commit 72cffc1

Browse files
galipremsagargalipremsagar
authored
Pin dask and distributed for release (#3427)
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
1 parent a4c97b5 commit 72cffc1

9 files changed

Lines changed: 20 additions & 16 deletions

File tree

‎.github/workflows/pr.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ jobs:
121121
build_type: pull-request
122122
package-name: cugraph
123123
# Always want to test against latest dask/distributed.
124-
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.04"
124+
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/dask-cuda.git@branch-23.04"
125125
# Skip dataset downloads on arm to save CI time -- arm only runs smoke tests.
126126
# On arm also need to install cupy from the specific site.
127-
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/dask-cuda.git@branch-23.04"
127+
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/dask-cuda.git@branch-23.04"
128128
test-unittest: "RAPIDS_DATASET_ROOT_DIR=/__w/cugraph/cugraph/datasets pytest -v -m sg ./python/cugraph/cugraph/tests"
129129
test-smoketest: "python ci/wheel_smoke_test_cugraph.py"

‎.github/workflows/test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
sha: ${{ inputs.sha }}
5353
package-name: cugraph
5454
# Always want to test against latest dask/distributed.
55-
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.04"
55+
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/dask-cuda.git@branch-23.04"
5656
# On arm also need to install cupy from the specific webpage.
57-
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/dask-cuda.git@branch-23.04"
57+
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/dask-cuda.git@branch-23.04"
5858
test-unittest: "RAPIDS_DATASET_ROOT_DIR=/__w/cugraph/cugraph/datasets pytest -v -m sg ./python/cugraph/cugraph/tests"

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ dependencies:
1616
- cupy>=9.5.0,<12.0.0a0
1717
- cxx-compiler
1818
- cython>=0.29,<0.30
19+
- dask-core==2023.3.2
1920
- dask-cuda==23.4.*
2021
- dask-cudf==23.4.*
21-
- dask>=2023.1.1
22-
- distributed>=2023.1.1
22+
- dask==2023.3.2
23+
- distributed==2023.3.2.1
2324
- doxygen
2425
- fsspec[http]>=0.6.0
2526
- gcc_linux-64=11.*

‎conda/recipes/cugraph-pyg/meta.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ requirements:
2626
- python x.x
2727
- scikit-build >=0.13.1
2828
run:
29-
- distributed >=2023.1.1
29+
- distributed ==2023.3.2.1
3030
- numba >=0.56.2
3131
- numpy
3232
- pytorch >=2.0

‎conda/recipes/cugraph-service/meta.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ outputs:
5757
- cupy >=9.5.0,<12.0.0a0
5858
- dask-cuda ={{ minor_version }}
5959
- dask-cudf ={{ minor_version }}
60-
- distributed >=2023.1.1
60+
- distributed ==2023.3.2.1
6161
- numpy
6262
- python x.x
6363
- thriftpy2 >=0.4.15

‎conda/recipes/cugraph/meta.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@ requirements:
7272
- cupy >=9.5.0,<12.0.0a0
7373
- dask-cuda ={{ minor_version }}
7474
- dask-cudf ={{ minor_version }}
75-
- dask >=2023.1.1
76-
- distributed >=2023.1.1
75+
- dask ==2023.3.2
76+
- dask-core ==2023.3.2
77+
- distributed ==2023.3.2.1
7778
- libcugraph ={{ version }}
7879
- libraft ={{ minor_version }}
7980
- libraft-headers ={{ minor_version }}

‎dependencies.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ dependencies:
295295
packages:
296296
- cuda-python>=11.7.1,<12.0
297297
- &cudf cudf==23.4.*
298-
- &dask dask>=2023.1.1
299-
- &distributed distributed>=2023.1.1
298+
- &dask dask==2023.3.2
299+
- &distributed distributed==2023.3.2.1
300300
- &dask_cuda dask-cuda==23.4.*
301301
- &dask_cudf dask-cudf==23.4.*
302302
- &numba numba>=0.56.2
@@ -306,6 +306,7 @@ dependencies:
306306
- output_types: conda
307307
packages:
308308
- &cupy cupy>=9.5.0,<12.0.0a0
309+
- &dask-core dask-core==2023.3.2
309310
- libcudf=23.04.*
310311
- nccl>=2.9.9
311312
- ucx-proc=*=gpu
@@ -349,6 +350,7 @@ dependencies:
349350
- output_types: conda
350351
packages:
351352
- *cupy
353+
- *dask-core
352354
- output_types: pyproject
353355
packages:
354356
- *cupy_pip

‎python/cugraph-service/server/pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ dependencies = [
2525
"cupy-cuda11x>=9.5.0,<12.0.0a0",
2626
"dask-cuda==23.4.*",
2727
"dask-cudf==23.4.*",
28-
"dask>=2023.1.1",
29-
"distributed>=2023.1.1",
28+
"dask==2023.3.2",
29+
"distributed==2023.3.2.1",
3030
"numpy>=1.21",
3131
"rmm==23.4.*",
3232
"thriftpy2",

‎python/cugraph/pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ dependencies = [
3434
"cupy-cuda11x>=9.5.0,<12.0.0a0",
3535
"dask-cuda==23.4.*",
3636
"dask-cudf==23.4.*",
37-
"dask>=2023.1.1",
38-
"distributed>=2023.1.1",
37+
"dask==2023.3.2",
38+
"distributed==2023.3.2.1",
3939
"numba>=0.56.2",
4040
"pylibcugraph==23.4.*",
4141
"raft-dask==23.4.*",

0 commit comments

Comments
 (0)