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

PropertyGraph set index to vertex and edge ids #2523

Merged
merged 14 commits into from
Sep 30, 2022
Merged

PropertyGraph set index to vertex and edge ids #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2a6c9cf
PropertyGraph set index to vertex and edge ids
eriknw Aug 9, 2022
4c93f77
Update graph_store
eriknw Aug 10, 2022
2631715
flake8
eriknw Aug 10, 2022
ff0f80c
Merge branch 'branch-22.10' into pg_set_index
eriknw Sep 7, 2022
99c2e0e
Set index to vertex or edge IDs in PG for MG
eriknw Sep 14, 2022
1a1e039
Merge branch 'pg_set_index' of https://github.com/eriknw/cugraph into…
alexbarghi-nv Sep 21, 2022
9bbf048
fixes
alexbarghi-nv Sep 21, 2022
6a365ec
Merge branch 'branch-22.10' into pg_set_index
eriknw Sep 22, 2022
674f5ff
Merge branch 'pg_set_index_fixes' into pg_set_index
eriknw Sep 23, 2022
1feb5e8
Add workaround when index dtypes are different in dask_cudf.concat
eriknw Sep 23, 2022
6a7ff4e
Merge branch 'branch-22.10' into pg_set_index
eriknw Sep 23, 2022
21a3b89
flake8
eriknw Sep 23, 2022
aa591b8
Add test to ensure ids are fetch in correct order (and when repeated)
eriknw Sep 30, 2022
5c8a33f
Merge branch 'branch-22.10' into pg_set_index
eriknw Sep 30, 2022
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
171 changes: 115 additions & 56 deletions python/cugraph/cugraph/dask/structure/mg_property_graph.py
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions python/cugraph/cugraph/gnn/graph_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@ def has_multiple_etypes(self):

@property
def ntypes(self):
return list(self.gdata.vertex_types)
return sorted(self.gdata.vertex_types)

@property
def etypes(self):
return list(self.gdata.edge_types)
return sorted(self.gdata.edge_types)

@property
def is_mg(self):
Expand Down Expand Up @@ -275,7 +275,7 @@ def _get_edgeid_type_d(self, edge_ids, etypes):
@cached_property
def extracted_subgraph(self):
edge_list = self.gdata.get_edge_data(
columns=[src_n, dst_n, type_n, eid_n]
columns=[src_n, dst_n, type_n]
)
edge_list = edge_list.reset_index(drop=True)

Expand All @@ -286,7 +286,7 @@ def extracted_subgraph(self):
@cached_property
def extracted_reverse_subgraph(self):
edge_list = self.gdata.get_edge_data(
columns=[src_n, dst_n, type_n, eid_n]
columns=[src_n, dst_n, type_n]
)
return get_subgraph_from_edgelist(
edge_list, self.is_mg, reverse_edges=True
Expand All @@ -297,7 +297,7 @@ def extracted_subgraphs_per_type(self):
sg_d = {}
for etype in self.etypes:
edge_list = self.gdata.get_edge_data(
columns=[src_n, dst_n, type_n, eid_n], types=[etype]
columns=[src_n, dst_n, type_n], types=[etype]
)
sg_d[etype] = get_subgraph_from_edgelist(
edge_list, self.is_mg, reverse_edges=False
Expand All @@ -309,7 +309,7 @@ def extracted_reverse_subgraphs_per_type(self):
sg_d = {}
for etype in self.etypes:
edge_list = self.gdata.get_edge_data(
columns=[src_n, dst_n, type_n, eid_n], types=[etype]
columns=[src_n, dst_n, type_n], types=[etype]
)
sg_d[etype] = get_subgraph_from_edgelist(
edge_list, self.is_mg, reverse_edges=True
Expand Down
17 changes: 9 additions & 8 deletions python/cugraph/cugraph/gnn/pyg_extensions/data/cugraph_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,14 @@ def __init__(self, G, backend='torch'):
srcs = srcs.compute()

dst_types = self.__graph.get_vertex_data(
vertex_ids=dsts,
vertex_ids=dsts.values_host,
columns=[self.__graph.type_col_name]
)[self.__graph.type_col_name].unique()

src_types = self.__graph.get_vertex_data(
vertex_ids=srcs,
columns=['_TYPE_']
)._TYPE_.unique()
vertex_ids=srcs.values_host,
columns=[self.__graph.type_col_name]
)[self.__graph.type_col_name].unique()

if self.is_mg:
dst_types = dst_types.compute()
Expand Down Expand Up @@ -434,8 +434,9 @@ def neighbor_sample(
).unique()

noi = self.__graph.get_vertex_data(
nodes_of_interest.compute() if self.is_mg else nodes_of_interest,
columns=[self.__graph.vertex_col_name, self.__graph.type_col_name]
nodes_of_interest.compute().values_host if self.is_mg
else nodes_of_interest,
columns=[self.__graph.type_col_name]
)

noi_types = noi[self.__graph.type_col_name].unique()
Expand Down Expand Up @@ -595,13 +596,13 @@ def _get_tensor(self, attr):
if len(self.__graph.vertex_types) == 1:
# make sure we don't waste computation if there's only 1 type
df = self.__graph.get_vertex_data(
vertex_ids=idx,
vertex_ids=idx.get(),
types=None,
columns=cols
)
else:
df = self.__graph.get_vertex_data(
vertex_ids=idx,
vertex_ids=idx.get(),
types=[attr.group_name],
columns=cols
)
Expand Down
Loading