[REVIEW] Fix MNMG failures in mg_dgl_extensions by VibhuJawa · Pull Request #2786 · rapidsai/cugraph

VibhuJawa · 2022-10-07T18:11:31Z

This PR fixes the below errors that have popped up in MNMG testing.

fix_out of index keys on MNMG graphs
fix loc/get_node_storage error on MNMG graphs
(Work around [BUG] dask_cudf loc operation fails with cudf Series and cupy array fails cudf#11877)
Clear Cached Properties when they become invalid
Remove 6 pytest skipping as both these PRs have landed
Use new sampling primitives #2751
PropertyGraph set index to vertex and edge ids #2523
Change vertex_col_names to node_col_names to match DGL
Ensure MNMG tests pass
Work around the PG bug and also prevent redundant conversion to lists

codecov-commenter · 2022-10-07T20:21:41Z

Codecov Report

❗ No coverage uploaded for pull request base (branch-22.12@4d020cb). Click here to learn what that means.
Patch has no changes to coverable lines.

Additional details and impacted files

@@               Coverage Diff               @@
##             branch-22.12    #2786   +/-   ##
===============================================
  Coverage                ?   60.45%           
===============================================
  Files                   ?      111           
  Lines                   ?     6514           
  Branches                ?        0           
===============================================
  Hits                    ?     3938           
  Misses                  ?     2576           
  Partials                ?        0

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

VibhuJawa · 2022-10-07T23:16:08Z

python/cugraph/cugraph/dask/structure/mg_property_graph.py

-                if isinstance(vertex_ids, int):
-                    vertex_ids = [vertex_ids]
-                elif not isinstance(vertex_ids,
-                                    (list, slice, self.__series_type)):
-                    vertex_ids = list(vertex_ids)


I think we should let the underlying library handle it rather than limiting location to these types.

Also, this fails with GPU objects like cupy , cudf.Series , for numpy arrays we pay a cost.

python/cugraph/cugraph/dask/structure/mg_property_graph.py

python/cugraph/cugraph/structure/property_graph.py

into fix_MNMG_failures

rlratzel

Thanks for adding the extra test coverage. Just had a few minor suggestions/fixes/typos

python/cugraph/cugraph/gnn/graph_store.py

Co-authored-by: Rick Ratzel <3039903+rlratzel@users.noreply.github.com>

VibhuJawa · 2022-10-11T17:32:10Z

Thanks for adding the extra test coverage. Just had a few minor suggestions/fixes/typos

Thanks for the review Rick, Addressed all of your comments so should be ready for another round of reviews.

into fix_MNMG_failures

rlratzel · 2022-10-11T19:30:23Z

@gpucibot merge

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 - rapidsai/cugraph#2751 - rapidsai/cugraph#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: rapidsai/cugraph#2786

Fix frontier includes out-of-range keys error

0d2e396

VibhuJawa self-assigned this Oct 7, 2022

VibhuJawa added bug Something isn't working non-breaking Non-breaking change labels Oct 7, 2022

Working MNMG tests

47ca47b

VibhuJawa changed the title ~~[WIP] Fix frontier includes out-of-range keys error~~ [WIP] Fix MNMG failures in mg_dgl_extensions Oct 7, 2022

VibhuJawa added 2 commits October 7, 2022 16:09

fix loc errors

d477ad5

Removing conversion to lists to let the underlying dataframe handle it

56bfbf2

VibhuJawa commented Oct 7, 2022

View reviewed changes

VibhuJawa added 4 commits October 7, 2022 16:57

Reverting a change and letting through numpy arrays

90547dd

Adding clear cache tests

970aa43

Added tests for scaler,vector features

79fa51f

Merge branch 'branch-22.12' into fix_MNMG_failures

504b2e8

VibhuJawa changed the title ~~[WIP] Fix MNMG failures in mg_dgl_extensions~~ [REVIEW] Fix MNMG failures in mg_dgl_extensions Oct 8, 2022

VibhuJawa marked this pull request as ready for review October 8, 2022 01:28

VibhuJawa requested a review from a team as a code owner October 8, 2022 01:28

VibhuJawa added 3 commits October 9, 2022 14:21

Added graph_store.py

0cc6a58

Verify working on OBGN-MAG

2c30a2c

Merge branch 'fix_MNMG_failures' of https://github.com/VibhuJawa/cugraph

e622fb2

into fix_MNMG_failures

BradReesWork added this to the 22.12 milestone Oct 10, 2022

BradReesWork requested review from BradReesWork, eriknw and rlratzel October 10, 2022 13:43

rlratzel requested changes Oct 11, 2022

View reviewed changes

python/cugraph/cugraph/gnn/graph_store.py Outdated Show resolved Hide resolved

python/cugraph/cugraph/gnn/graph_store.py Show resolved Hide resolved

python/cugraph/cugraph/gnn/graph_store.py Show resolved Hide resolved

python/cugraph/cugraph/gnn/graph_store.py Outdated Show resolved Hide resolved

VibhuJawa and others added 2 commits October 11, 2022 10:29

Update python/cugraph/cugraph/gnn/graph_store.py

56b088a

Co-authored-by: Rick Ratzel <3039903+rlratzel@users.noreply.github.com>

Update python/cugraph/cugraph/gnn/graph_store.py

49e42aa

Co-authored-by: Rick Ratzel <3039903+rlratzel@users.noreply.github.com>

VibhuJawa added 2 commits October 11, 2022 10:39

add more detailed docstrings

0733a30

Merge branch 'fix_MNMG_failures' of https://github.com/VibhuJawa/cugraph

d74cf87

into fix_MNMG_failures

rlratzel approved these changes Oct 11, 2022

View reviewed changes

eriknw approved these changes Oct 11, 2022

View reviewed changes

rapids-bot bot merged commit 9ee03f2 into rapidsai:branch-22.12 Oct 11, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[REVIEW] Fix MNMG failures in mg_dgl_extensions #2786

[REVIEW] Fix MNMG failures in mg_dgl_extensions #2786
rapids-bot[bot] merged 15 commits intorapidsai:branch-22.12from
VibhuJawa:fix_MNMG_failures

VibhuJawa commented Oct 7, 2022 •

edited

Loading

Uh oh!

codecov-commenter commented Oct 7, 2022 •

edited

Loading

Uh oh!

VibhuJawa Oct 7, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rlratzel left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

VibhuJawa commented Oct 11, 2022

Uh oh!

rlratzel commented Oct 11, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

VibhuJawa commented Oct 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Oct 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

VibhuJawa Oct 7, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rlratzel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

VibhuJawa commented Oct 11, 2022

Uh oh!

rlratzel commented Oct 11, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

VibhuJawa commented Oct 7, 2022 •

edited

Loading

codecov-commenter commented Oct 7, 2022 •

edited

Loading