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

Remove Deprecated Sampling Options #3816

Merged
merged 12 commits into from
Sep 1, 2023
Merged

Remove Deprecated Sampling Options #3816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f63a290
remove deprecated sampling options, support other sequence types
alexbarghi-nv Aug 22, 2023
bc2d372
add deprecation warning for with_edge_properties
alexbarghi-nv Aug 22, 2023
6cac762
fix style
alexbarghi-nv Aug 22, 2023
ac3d0d0
fix pytests
alexbarghi-nv Aug 23, 2023
c39cc86
Merge branch 'branch-23.10' into remove-deprecated-sampling
alexbarghi-nv Aug 23, 2023
567ea66
add with_batch_ids option
alexbarghi-nv Aug 23, 2023
622348e
Merge branch 'remove-deprecated-sampling' of https://github.com/alexb…
alexbarghi-nv Aug 23, 2023
b540997
fix style
alexbarghi-nv Aug 23, 2023
47c3e4b
add whitespace
alexbarghi-nv Aug 24, 2023
ceb408a
Merge branch 'branch-23.10' into remove-deprecated-sampling
alexbarghi-nv Aug 24, 2023
84ce3c9
fix style
alexbarghi-nv Aug 24, 2023
ca17e85
Merge branch 'branch-23.10' into remove-deprecated-sampling
alexbarghi-nv Aug 30, 2023
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
1 change: 1 addition & 0 deletions python/cugraph-pyg/cugraph_pyg/data/cugraph_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ def __construct_graph(
-------
A newly-constructed directed cugraph.MultiGraph object.
"""

# Ensure the original dict is not modified.
edge_info_cg = {}

Expand Down
22 changes: 18 additions & 4 deletions python/cugraph-pyg/cugraph_pyg/tests/mg/test_mg_cugraph_sampler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,21 @@ def test_neighbor_sample(dask_client, basic_graph_1):
F, G, N = basic_graph_1
cugraph_store = CuGraphStore(F, G, N, multi_gpu=True)

batches = cudf.DataFrame(
{
"start": cudf.Series([0, 1, 2, 3, 4], dtype="int64"),
"batch": cudf.Series(cupy.zeros(5, dtype="int32")),
}
)

sampling_results = (
uniform_neighbor_sample(
cugraph_store._subgraph(),
cudf.Series([0, 1, 2, 3, 4], dtype="int64"),
batches,
with_batch_ids=True,
fanout_vals=[-1],
with_replacement=False,
with_edge_properties=True,
batch_id_list=cudf.Series(cupy.zeros(5, dtype="int32")),
random_state=62,
return_offsets=False,
return_hops=True,
Expand Down Expand Up @@ -90,16 +97,23 @@ def test_neighbor_sample_multi_vertex(dask_client, multi_edge_multi_vertex_graph
F, G, N = multi_edge_multi_vertex_graph_1
cugraph_store = CuGraphStore(F, G, N, multi_gpu=True)

batches = cudf.DataFrame(
{
"start": cudf.Series([0, 1, 2, 3, 4], dtype="int64"),
"batches": cudf.Series(cupy.zeros(5, dtype="int32")),
}
)

sampling_results = (
uniform_neighbor_sample(
cugraph_store._subgraph(),
cudf.Series([0, 1, 2, 3, 4], dtype="int64"),
batches,
fanout_vals=[-1],
with_replacement=False,
with_edge_properties=True,
batch_id_list=cudf.Series(cupy.zeros(5, dtype="int32")),
random_state=62,
return_offsets=False,
with_batch_ids=True,
)
.sort_values(by=["sources", "destinations"])
.compute()
Expand Down
22 changes: 18 additions & 4 deletions python/cugraph-pyg/cugraph_pyg/tests/test_cugraph_sampler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,20 @@ def test_neighbor_sample(basic_graph_1):
F, G, N = basic_graph_1
cugraph_store = CuGraphStore(F, G, N)

batches = cudf.DataFrame(
{
"start": cudf.Series([0, 1, 2, 3, 4], dtype="int64"),
"batch": cudf.Series(cupy.zeros(5, dtype="int32")),
}
)

sampling_results = uniform_neighbor_sample(
cugraph_store._subgraph(),
cudf.Series([0, 1, 2, 3, 4], dtype="int64"),
batches,
fanout_vals=[-1],
with_replacement=False,
with_edge_properties=True,
batch_id_list=cudf.Series(cupy.zeros(5, dtype="int32")),
with_batch_ids=True,
random_state=62,
return_offsets=False,
).sort_values(by=["sources", "destinations"])
Expand Down Expand Up @@ -82,15 +89,22 @@ def test_neighbor_sample_multi_vertex(multi_edge_multi_vertex_graph_1):
F, G, N = multi_edge_multi_vertex_graph_1
cugraph_store = CuGraphStore(F, G, N)

batches = cudf.DataFrame(
{
"start": cudf.Series([0, 1, 2, 3, 4], dtype="int64"),
"batch": cudf.Series(cupy.zeros(5, dtype="int32")),
}
)

sampling_results = uniform_neighbor_sample(
cugraph_store._subgraph(),
cudf.Series([0, 1, 2, 3, 4], dtype="int64"),
batches,
fanout_vals=[-1],
with_replacement=False,
with_edge_properties=True,
batch_id_list=cudf.Series(cupy.zeros(5, dtype="int32")),
random_state=62,
return_offsets=False,
with_batch_ids=True,
).sort_values(by=["sources", "destinations"])

out = _sampler_output_from_sampling_results(
Expand Down
Loading