Skip to content

Commit b5becc5

Browse files
galipremsagargalipremsagar
authored
Unpin dask and distributed for development (#3036)
This PR unpins `dask` and `distributed` to `2022.12.0+` for `23.02` development. xref: rapidsai/cudf#12302 Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - Ray Douglass (https://github.com/raydouglass) - Rick Ratzel (https://github.com/rlratzel) URL: #3036
1 parent 017f0cc commit b5becc5

File tree

8 files changed

+19
-15
lines changed

8 files changed

+19
-15
lines changed

‎.github/workflows/wheels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ jobs:
8686
skbuild-configure-options: "-DDETECT_CONDA_ENV=OFF -DCUGRAPH_BUILD_WHEELS=ON -DCPM_cugraph-ops_SOURCE=/project/cugraph-ops/"
8787

8888
# Always want to test against latest dask/distributed.
89-
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"
89+
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-23.02"
9090
# On arm also need to install cupy from the specific webpage.
91-
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"
91+
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-23.02"
9292
test-extras: test
9393
test-unittest: "RAPIDS_DATASET_ROOT_DIR=`pwd`/datasets pytest -v ./python/cugraph/cugraph/tests"
9494
secrets: inherit

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ dependencies:
1616
- cython>=0.29,<0.30
1717
- dask-cuda=23.02.*
1818
- dask-cudf=23.02.*
19-
- dask>=2022.11.1
20-
- distributed>=2022.11.1
19+
- dask>=2022.12.0
20+
- distributed>=2022.12.0
2121
- doxygen
2222
- gmock=1.10.0
2323
- gtest=1.10.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ requirements:
3131
# FIXME: this pin can be removed once we move to the GitHub Actions build process
3232
- setuptools<=65.2.0
3333
run:
34-
- distributed==2022.11.1
34+
- distributed>=2022.12.0
3535
- numba>=0.56.2
3636
- numpy
3737
- pytorch

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ outputs:
5555
- cupy >=9.5.0,<12.0.0a0
5656
- numpy
5757
- ucx-py {{ ucx_py_version }}
58-
- distributed ==2022.11.1
58+
- distributed >=2022.12.0
5959
- dask-cuda {{ minor_version }}.*
6060
- cudf {{ minor_version }}.*
6161
- dask-cudf {{ minor_version }}.*

‎conda/recipes/cugraph/meta.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ requirements:
5959
- cupy >=9.5.0,<12.0.0a0
6060
- dask-cudf {{ minor_version }}
6161
- dask-cuda {{ minor_version }}
62-
- dask==2022.11.1
63-
- distributed==2022.11.1
62+
- dask>=2022.12.0
63+
- distributed>=2022.12.0
6464
- ucx-py {{ ucx_py_version }}
6565
- ucx-proc=*=gpu
6666
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}

‎dependencies.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ dependencies:
8888
- cuda-python>=11.7.1,<12.0
8989
- cudf=23.02.*
9090
- cython>=0.29,<0.30
91-
- dask>=2022.11.1
91+
- dask>=2022.12.0
9292
- dask-cuda=23.02.*
9393
- dask-cudf=23.02.*
94-
- distributed>=2022.11.1
94+
- distributed>=2022.12.0
9595
- ipython
9696
- libcudf=23.02.*
9797
- nccl>=2.9.9

‎python/cugraph-service/server/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"cupy-cuda11x",
2323
"numpy",
2424
"ucx-py",
25-
"distributed ==2022.11.1",
25+
"distributed >=2022.12.0",
2626
"dask-cuda",
2727
"thriftpy2",
2828
]

‎python/cugraph/cugraph/tests/test_property_graph.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,11 +1750,13 @@ def test_renumber_vertices_by_type(dataset1_PropertyGraph, prev_id_column):
17501750
assert df_id_ranges.loc[key, "stop"] == stop
17511751
df = pG.get_vertex_data(types=[key])
17521752
assert len(df) == stop - start + 1
1753-
assert (df["_VERTEX_"] == list(range(start, stop + 1))).all()
1753+
assert (
1754+
df["_VERTEX_"] == df["_VERTEX_"]._constructor(range(start, stop + 1))
1755+
).all()
17541756
if prev_id_column is not None:
17551757
cur = df[prev_id_column].sort_values()
1756-
expected = sorted(x for x, *args in data[key][1])
1757-
assert (cur == expected).all()
1758+
expected = cur._constructor(sorted(x for x, *args in data[key][1]))
1759+
assert (cur.values == expected.values).all()
17581760
# Make sure we renumber vertex IDs in edge data too
17591761
df = pG.get_edge_data()
17601762
assert 0 <= df[pG.src_col_name].min() < df[pG.src_col_name].max() < 9
@@ -1792,7 +1794,9 @@ def test_renumber_edges_by_type(dataset1_PropertyGraph, prev_id_column):
17921794
assert df_id_ranges.loc[key, "stop"] == stop
17931795
df = pG.get_edge_data(types=[key])
17941796
assert len(df) == stop - start + 1
1795-
assert (df[pG.edge_id_col_name] == list(range(start, stop + 1))).all()
1797+
actual = df[pG.edge_id_col_name]
1798+
expected = actual._constructor(range(start, stop + 1))
1799+
assert (actual == expected).all()
17961800
if prev_id_column is not None:
17971801
assert prev_id_column in df.columns
17981802

0 commit comments

Comments
 (0)