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

Branch 22.06 merge 22.04 #2190

Merged
merged 8 commits into from
Apr 5, 2022

Conversation

rlratzel
Copy link
Contributor

@rlratzel rlratzel commented Apr 5, 2022

Fixes merge conflict in #2172

BradReesWork and others added 8 commits March 29, 2022 15:24
Provide the implementation for the C API for neighborhood sampling.

Currently needs some debugging.

merge after 2150

Authors:
  - Chuck Hastings (https://github.com/ChuckHastings)

Approvers:
  - Seunghwa Kang (https://github.com/seunghwak)

URL: rapidsai#2156
This PR wraps the MG C++ implementation of HITS following the pylibcugraph API
Awaiting MG support to the C API

closes rapidsai#2026

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

Approvers:
  - Don Acosta (https://github.com/acostadon)
  - Chuck Hastings (https://github.com/ChuckHastings)
  - Rick Ratzel (https://github.com/rlratzel)

URL: rapidsai#2088
…lgos (rapidsai#2099)

Code to inherit all of networkx graph then call cugraph pagerank with just an import change. 
This was originally going to do bfs first but pargerank was considered a more useful first algorithm.

Authors:
  - Don Acosta (https://github.com/acostadon)

Approvers:
  - Brad Rees (https://github.com/BradReesWork)

URL: rapidsai#2099
…sting coverage (rapidsai#2120)

This PR was initially created because of two issues:
1. The pylibcugraph and cugraphs APIs differed from C++ and C because a compress flag was reinterpreted into a padding flag
2. Because of a renumbering bug, edges and vertices are not being renumbered correctly, causing multiple vertices and edges to be potentially identified as the same
3. Because of a type mismatching bug, `start_vertices` would yield garbage values and capture only half of the paths when using int64 values for vertices (this was initially thought to be a padding bug)

What this PR does to address each:
1. Renamed the `use_padding` flag to `compress_result` to be inline with libcugraph. If a user desires to enforce padding to keep track of paths via formula, one would set `compress_result=False` (use_padding=True)
2. `random_walks.cpp` now unrenumbers local vertex ids for use with pylibcugraph and cugraph
3. node2vec now works with the requirement of using `int32` only for graph vertices. Future plans include adding support to `int64` and other types.

Testing has been adapted from the C level, and further testing has been added to ensure invalid inputs are caught and results are expected with the new changes

Authors:
  - https://github.com/betochimas
  - Rick Ratzel (https://github.com/rlratzel)

Approvers:
  - Seunghwa Kang (https://github.com/seunghwak)
  - Chuck Hastings (https://github.com/ChuckHastings)
  - Rick Ratzel (https://github.com/rlratzel)

URL: rapidsai#2120
CMake 3.23 has a bug that breaks our conda-build based builds in CI, this avoids that issue.

Authors:
  - Dante Gama Dessavre (https://github.com/dantegd)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: rapidsai#2176
…#2118)

Closes rapidsai#2108 when merged. Requires both rapidsai#2088 and rapidsai#2156 to be merged before, the former because this uses MGGraph, and the later because of the C implementation of neighborhood sampling.

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

Approvers:
  - Don Acosta (https://github.com/acostadon)
  - Rick Ratzel (https://github.com/rlratzel)
  - Joseph Nke (https://github.com/jnke2016)
  - Chuck Hastings (https://github.com/ChuckHastings)
  - Jordan Jacobelli (https://github.com/Ethyling)

URL: rapidsai#2118
@rlratzel rlratzel requested review from a team as code owners April 5, 2022 17:18
@rlratzel rlratzel added bug Something isn't working non-breaking Non-breaking change labels Apr 5, 2022
@codecov-commenter
Copy link

codecov-commenter commented Apr 5, 2022

Codecov Report

Merging #2190 (b259a87) into branch-22.06 (017baab) will decrease coverage by 3.00%.
The diff coverage is 61.25%.

@@               Coverage Diff                @@
##           branch-22.06    #2190      +/-   ##
================================================
- Coverage         72.41%   69.40%   -3.01%     
================================================
  Files               157      170      +13     
  Lines             10496    11036     +540     
================================================
+ Hits               7601     7660      +59     
- Misses             2895     3376     +481     
Impacted Files Coverage Δ
...aph/cugraph/dask/sampling/neighborhood_sampling.py 0.00% <0.00%> (ø)
.../cugraph/cugraph/experimental/compat/nx/DiGraph.py 0.00% <0.00%> (ø)
...on/cugraph/cugraph/experimental/compat/nx/Graph.py 0.00% <0.00%> (ø)
...thon/cugraph/cugraph/experimental/dask/__init__.py 0.00% <0.00%> (ø)
python/cugraph/cugraph/tests/dask/test_mg_hits.py 0.00% <0.00%> (ø)
...ugraph/tests/dask/test_mg_neighborhood_sampling.py 0.00% <0.00%> (ø)
.../cugraph/cugraph/tests/dask/test_mg_replication.py 0.00% <0.00%> (-33.34%) ⬇️
python/cugraph/cugraph/dask/link_analysis/hits.py 18.36% <18.36%> (ø)
...h/pylibcugraph/tests/test_neighborhood_sampling.py 20.83% <20.83%> (ø)
python/cugraph/cugraph/sampling/node2vec.py 81.81% <69.23%> (-9.30%) ⬇️
... and 28 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 017baab...b259a87. Read the comment docs.

@sevagh sevagh merged commit 3fd4f41 into rapidsai:branch-22.06 Apr 5, 2022
@BradReesWork BradReesWork added this to the 22.06 milestone Apr 5, 2022
@rlratzel rlratzel deleted the branch-22.06-merge-22.04 branch June 17, 2022 00:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants