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.

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

Fix concat with different index dtypes in SG PropertyGraph #2804

Merged
merged 4 commits into from
Oct 19, 2022

Conversation

eriknw
Copy link
Contributor

@eriknw eriknw commented Oct 13, 2022

@alexbarghi-nv want to give this a try? I previously made these changes to MG (was there an issue for it?), but not SG.

@eriknw eriknw requested a review from a team as a code owner October 13, 2022 16:38
@alexbarghi-nv alexbarghi-nv added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change Fix labels Oct 13, 2022
@alexbarghi-nv alexbarghi-nv added this to the 22.12 milestone Oct 13, 2022
Copy link
Member

@alexbarghi-nv alexbarghi-nv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes the bug. 👍

@VibhuJawa
Copy link
Member

Sorry missed this, just raised a PR to fix the same. Lets merge this in please.

Copy link
Member

@VibhuJawa VibhuJawa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Can we just add a test like this:

def test_get_num_vertices():
    from cugraph.experimental import PropertyGraph

    pg = PropertyGraph()
    node_df = cudf.DataFrame()
    node_df["node_id"] = cudf.Series([0, 1, 2]).astype("int32")
    pg.add_vertex_data(node_df, "node_id", type_name="_N")

    edge_df = cudf.DataFrame()
    edge_df["src"] = cudf.Series([0, 1, 2]).astype("int32")
    edge_df["dst"] = cudf.Series([0, 1, 2]).astype("int32")
    pg.add_edge_data(edge_df, ["src", "dst"], type_name="_E")

    assert pg.get_num_vertices() == 3

@eriknw
Copy link
Contributor Author

eriknw commented Oct 18, 2022

Thanks for the test @VibhuJawa! Added. Sorry you missed this PR and did duplicate work.

I confirmed your test breaks w/o this PR and passes with this PR.

Copy link
Member

@VibhuJawa VibhuJawa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM to me

@codecov-commenter
Copy link

codecov-commenter commented Oct 19, 2022

Codecov Report

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

Additional details and impacted files
@@               Coverage Diff               @@
##             branch-22.12    #2804   +/-   ##
===============================================
  Coverage                ?   60.48%           
===============================================
  Files                   ?      111           
  Lines                   ?     6526           
  Branches                ?        0           
===============================================
  Hits                    ?     3947           
  Misses                  ?     2579           
  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.

@rlratzel
Copy link
Contributor

rerun tests

reason: timeout as described in #2810 - rerunning for now.

@rlratzel
Copy link
Contributor

@gpucibot merge

@rapids-bot rapids-bot bot merged commit e16ab56 into rapidsai:branch-22.12 Oct 19, 2022
rapids-bot bot pushed a commit that referenced this pull request Oct 27, 2022
Resolves rapidsai/graph_dl#76
Merge after #2804 

This PR defines a remote interface for `Graph` and `PropertyGraph` so they can be easily substituted in a client application that does not use `cugraph` directly.  For `PropertyGraph`, this PR also implements most of the functionality of a native `PropertyGraph`. 

Note: this PR does not include the upcoming "dispatch" updates for running cugraph algorithms or subgraph extraction, which are covered under rapidsai/graph_dl#80

Authors:
  - Alex Barghi (https://github.com/alexbarghi-nv)
  - Erik Welch (https://github.com/eriknw)

Approvers:
  - Joseph Nke (https://github.com/jnke2016)
  - Rick Ratzel (https://github.com/rlratzel)

URL: #2821
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants