Skip to content

Commit

Permalink
Fix MNMG failures in mg_dgl_extensions (#2786)
Browse files Browse the repository at this point in the history
This PR fixes the below errors that have popped up in MNMG testing. 
- [x] fix_out of index keys on MNMG graphs
- [x] fix loc/get_node_storage error  on MNMG graphs 
(Work around  rapidsai/cudf#11877)
- [x] Clear Cached Properties when they become invalid
- [x] Remove  6 pytest skipping as both these PRs have landed 
- #2751
- #2523
- [x] Change `vertex_col_names` to  `node_col_names`  to match DGL 
- [x] Ensure MNMG tests pass 
- [x] Work around the PG bug and also prevent redundant conversion to lists

Authors:
  - Vibhu Jawa (https://github.com/VibhuJawa)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)
  - Erik Welch (https://github.com/eriknw)

URL: #2786
  • Loading branch information
VibhuJawa committed Oct 11, 2022
1 parent af47c0c commit 9ee03f2
Show file tree
Hide file tree
Showing 5 changed files with 356 additions and 101 deletions.
8 changes: 5 additions & 3 deletions python/cugraph/cugraph/dask/structure/mg_property_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# limitations under the License.

import cudf

import numpy as np
import cugraph
import dask_cudf
import cugraph.dask as dcg
Expand Down Expand Up @@ -488,7 +488,8 @@ def get_vertex_data(self, vertex_ids=None, types=None, columns=None):
if isinstance(vertex_ids, int):
vertex_ids = [vertex_ids]
elif not isinstance(vertex_ids,
(list, slice, self.__series_type)):
(list, slice, np.ndarray,
self.__series_type)):
vertex_ids = list(vertex_ids)
df = df.loc[vertex_ids]

Expand Down Expand Up @@ -724,7 +725,8 @@ def get_edge_data(self, edge_ids=None, types=None, columns=None):
if isinstance(edge_ids, int):
edge_ids = [edge_ids]
elif not isinstance(edge_ids,
(list, slice, self.__series_type)):
(list, slice, np.ndarray,
self.__series_type)):
edge_ids = list(edge_ids)
df = df.loc[edge_ids]

Expand Down
Loading

0 comments on commit 9ee03f2

Please sign in to comment.