Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@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-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"
# 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@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-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"
test-extras: test
test-unittest: "RAPIDS_DATASET_ROOT_DIR=`pwd`/datasets pytest -v ./python/cugraph/cugraph/tests"
secrets: inherit
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-115_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dependencies:
- cython>=0.29,<0.30
- dask-cuda=23.02.*
- dask-cudf=23.02.*
- dask>=2022.11.1
- distributed>=2022.11.1
- dask>=2022.12.0
- distributed>=2022.12.0
- doxygen
- gmock=1.10.0
- gtest=1.10.0
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 @@ -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.11.1
- distributed>=2022.12.0
- numba>=0.56.2
- numpy
- pytorch
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 @@ -55,7 +55,7 @@ outputs:
- cupy >=9.5.0,<12.0.0a0
- numpy
- ucx-py {{ ucx_py_version }}
- distributed ==2022.11.1
- distributed >=2022.12.0
- dask-cuda {{ minor_version }}.*
- cudf {{ minor_version }}.*
- dask-cudf {{ minor_version }}.*
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cugraph/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ requirements:
- cupy >=9.5.0,<12.0.0a0
- dask-cudf {{ minor_version }}
- dask-cuda {{ minor_version }}
- dask==2022.11.1
- distributed==2022.11.1
- dask>=2022.12.0
- distributed>=2022.12.0
- ucx-py {{ ucx_py_version }}
- ucx-proc=*=gpu
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ dependencies:
- cuda-python>=11.7.1,<12.0
- cudf=23.02.*
- cython>=0.29,<0.30
- dask>=2022.11.1
- dask>=2022.12.0
- dask-cuda=23.02.*
- dask-cudf=23.02.*
- distributed>=2022.11.1
- distributed>=2022.12.0
- ipython
- libcudf=23.02.*
- nccl>=2.9.9
Expand Down
2 changes: 1 addition & 1 deletion python/cugraph-service/server/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"cupy-cuda11x",
"numpy",
"ucx-py",
"distributed ==2022.11.1",
"distributed >=2022.12.0",
"dask-cuda",
"thriftpy2",
]
Expand Down
12 changes: 8 additions & 4 deletions python/cugraph/cugraph/tests/test_property_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -1750,11 +1750,13 @@ def test_renumber_vertices_by_type(dataset1_PropertyGraph, prev_id_column):
assert df_id_ranges.loc[key, "stop"] == stop
df = pG.get_vertex_data(types=[key])
assert len(df) == stop - start + 1
assert (df["_VERTEX_"] == list(range(start, stop + 1))).all()
assert (
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These pytest fixes were needed because cudf removed the comparison of host & device objects in : rapidsai/cudf#12281, which will return False if performed.

df["_VERTEX_"] == df["_VERTEX_"]._constructor(range(start, stop + 1))
).all()
if prev_id_column is not None:
cur = df[prev_id_column].sort_values()
expected = sorted(x for x, *args in data[key][1])
assert (cur == expected).all()
expected = cur._constructor(sorted(x for x, *args in data[key][1]))
assert (cur.values == expected.values).all()
# Make sure we renumber vertex IDs in edge data too
df = pG.get_edge_data()
assert 0 <= df[pG.src_col_name].min() < df[pG.src_col_name].max() < 9
Expand Down Expand Up @@ -1792,7 +1794,9 @@ def test_renumber_edges_by_type(dataset1_PropertyGraph, prev_id_column):
assert df_id_ranges.loc[key, "stop"] == stop
df = pG.get_edge_data(types=[key])
assert len(df) == stop - start + 1
assert (df[pG.edge_id_col_name] == list(range(start, stop + 1))).all()
actual = df[pG.edge_id_col_name]
expected = actual._constructor(range(start, stop + 1))
assert (actual == expected).all()
if prev_id_column is not None:
assert prev_id_column in df.columns

Expand Down