Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust deprecated cugraph.subgraph usage in Python tests #4386

Merged
merged 6 commits into from
May 11, 2024
Merged

Adjust deprecated cugraph.subgraph usage in Python tests #4386

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb8a869
Add indexing
mroeschke May 3, 2024
69a4c20
Merge remote-tracking branch 'upstream/branch-24.06' into warnings/su…
mroeschke May 6, 2024
5953973
index into tuple
mroeschke May 6, 2024
aa0c9f4
Merge branch 'branch-24.06' into warnings/subgraph
mroeschke May 8, 2024
3372eb8
Merge branch 'branch-24.06' into warnings/subgraph
mroeschke May 9, 2024
0a754af
Merge branch 'branch-24.06' into warnings/subgraph
mroeschke May 11, 2024
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
24 changes: 12 additions & 12 deletions python/cugraph/cugraph/tests/community/test_subgraph_extraction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2019-2023, NVIDIA CORPORATION.
# Copyright (c) 2019-2024, NVIDIA CORPORATION.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
Expand Down Expand Up @@ -51,7 +51,7 @@ def cugraph_call(M, verts, directed=True):
G.from_cudf_edgelist(cu_M, source="0", destination="1", edge_attr="weight")

cu_verts = cudf.Series(verts)
return cugraph.subgraph(G, cu_verts)
return cugraph.induced_subgraph(G, cu_verts)


def nx_call(M, verts, directed=True):
Expand All @@ -74,7 +74,7 @@ def test_subgraph_extraction_DiGraph(graph_file):
verts[0] = 0
verts[1] = 1
verts[2] = 17
cu_sg = cugraph_call(M, verts, True)
cu_sg = cugraph_call(M, verts, True)[0]
nx_sg = nx_call(M, verts, True)
assert compare_edges(cu_sg, nx_sg)

Expand All @@ -88,7 +88,7 @@ def test_subgraph_extraction_Graph(graph_file):
verts[0] = 0
verts[1] = 1
verts[2] = 17
cu_sg = cugraph_call(M, verts, False)
cu_sg = cugraph_call(M, verts, False)[0]
nx_sg = nx_call(M, verts, False)
assert compare_edges(cu_sg, nx_sg)

Expand Down Expand Up @@ -116,7 +116,7 @@ def test_subgraph_extraction_Graph_nx(graph_file):
nx_sub = nx.subgraph(G, verts)

cu_verts = cudf.Series(verts)
cu_sub = cugraph.subgraph(G, cu_verts)
cu_sub = cugraph.induced_subgraph(G, cu_verts)[0]

for (u, v) in cu_sub.edges():
assert nx_sub.has_edge(u, v)
Expand Down Expand Up @@ -147,19 +147,19 @@ def test_subgraph_extraction_multi_column(graph_file):
verts_G1["v_0"] = verts
verts_G1["v_1"] = verts + 1000

sG1 = cugraph.subgraph(G1, verts_G1)
sG1 = cugraph.induced_subgraph(G1, verts_G1)

G2 = cugraph.Graph()
G2.from_cudf_edgelist(cu_M, source="src_0", destination="dst_0", edge_attr="weight")

sG2 = cugraph.subgraph(G2, verts)
sG2 = cugraph.induced_subgraph(G2, verts)

# FIXME: Replace with multi-column view_edge_list()
edgelist_df = sG1.edgelist.edgelist_df
edgelist_df_res = sG1.unrenumber(edgelist_df, "src")
edgelist_df_res = sG1.unrenumber(edgelist_df_res, "dst")
edgelist_df = sG1[0].edgelist.edgelist_df
edgelist_df_res = sG1[0].unrenumber(edgelist_df, "src")
edgelist_df_res = sG1[0].unrenumber(edgelist_df_res, "dst")
for i in range(len(edgelist_df_res)):
assert sG2.has_edge(
assert sG2[0].has_edge(
edgelist_df_res["0_src"].iloc[i], edgelist_df_res["0_dst"].iloc[i]
)

Expand All @@ -180,7 +180,7 @@ def test_subgraph_extraction_graph_not_renumbered():
G.from_cudf_edgelist(
gdf, source="src", destination="dst", edge_attr="wgt", renumber=False
)
Sg = cugraph.subgraph(G, sverts)
Sg = cugraph.induced_subgraph(G, sverts)

assert Sg.number_of_vertices() == 3
assert Sg.number_of_edges() == 3
Loading