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

[skip-ci] Resolve conflicts for merge from branch-22.06 to branch-22.08 #2334

Merged
merged 14 commits into from
Jun 3, 2022

Conversation

rlratzel
Copy link
Contributor

@rlratzel rlratzel commented Jun 3, 2022

Resolve conflicts for merge from branch-22.06 to branch-22.08

galipremsagar and others added 14 commits May 25, 2022 17:40
Pinnings to be inline with: rapidsai/cudf#10965

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: rapidsai#2312
rapidsai#2305)

@alexbarghi-nv discovered issue with creating graphs through the C API with double weights.

Added CAPI SSSP test which demonstrates the error.  Added fix to the error in the graph creation logic (both SG and MG).

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

Approvers:
  - Alex Barghi (https://github.com/alexbarghi-nv)
  - Seunghwa Kang (https://github.com/seunghwak)

URL: rapidsai#2305
This PR:

1.  Adds Eigenvector Centrality to the pylibcugraph and cugraph software stacks, which started from rapidsai#2180 and is followed up by future PRs in order to close rapidsai#2146  
2. Minor improvements to pylibcugraph Katz Centrality
3. Added functionality to `test_doctests.py` so that certain docstrings can be skipped on different architecture configs (such as ktruss in CUDA 11.4) 
4. Added undirected/directed versions of graph example used in C tests in `datasets`
5. Removed cugraph copy of warning wrapper from pylibcugraph and have it call the pylibcugraph version
6. Testing for both Python eigenvector centrality wrappers

This PR is identical to rapidsai#2243, just that the name of the branch is different

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

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

URL: rapidsai#2255
Corrects the BFS docstring by clarifying that multiple start vertices are accepted as long as they are from different components, and that passing start vertices from the same component will result in undefined behavior.

Authors:
  - Alex Barghi (https://github.com/alexbarghi-nv)
  - Chuck Hastings (https://github.com/ChuckHastings)

Approvers:
  - https://github.com/betochimas
  - Joseph Nke (https://github.com/jnke2016)
  - Brad Rees (https://github.com/BradReesWork)

URL: rapidsai#2318
This PR add python bindings for triangle counting.
`cuGraph` and `pylibcuGraph` tests completed

Fails when sampling some vertices from the graph that will be used as parameter (`start_list`) for the MG implementation

The SG implementation works with and without `start_list`

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

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

URL: rapidsai#2273
This PR:
1. Refactors SG `hits` with the updated pylibcugraph implementation
2. Refactors MG `katz_centrality` with the updated pylibcugraph implementation, adding support for multiple arguments 
3. Improves support within `test_doctests.py` to ignore certain docstring examples based on the build architecture (such as ktruss in CUDA 11.4)
4. Passing MG `katz_centrality` testing

This PR also closes rapidsai#2025.

Authors:
  - https://github.com/betochimas

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

URL: rapidsai#2276
Uses the pylibcugraph C API to make these calls instead of the wrapper functions.  Removes wrapper functions from the code.

Authors:
  - Alex Barghi (https://github.com/alexbarghi-nv)
  - Chuck Hastings (https://github.com/ChuckHastings)

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

URL: rapidsai#2295
Bug was discovered in how the sampling code is looking up DCSR offset.

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

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

URL: rapidsai#2321
…#2285)

A new implementation of neighborhood sampling meeting the new C API was merged.

This PR
1. Moves the old implementation to the dir `proto`
2. Refactor MG neighborhood sampling bindings based on the new implementation
3. Add bindings for SG neighborhood sampling
4. Refactor tests

DO NOT MERGE YET: PENDING fix for missing vertices in `start_list`
closes rapidsai#2272

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

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

URL: rapidsai#2285
This PR fixes the `comms` import in the API docs.

Authors:

Approvers:
   - AJ Schmidt (https://github.com/ajschmidt8)
   - Brad Rees (https://github.com/BradReesWork)
@rlratzel rlratzel requested review from a team as code owners June 3, 2022 15:12
@rlratzel rlratzel changed the title Resolve conflicts for merge from branch-22.06 to branch-22.08 [skip-ci] Resolve conflicts for merge from branch-22.06 to branch-22.08 Jun 3, 2022
@rlratzel rlratzel added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Jun 3, 2022
@ajschmidt8 ajschmidt8 merged commit 5ae30cc into rapidsai:branch-22.08 Jun 3, 2022
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.

8 participants