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 forward-merge conflicts for #1370 [skip-ci] #1377

Merged
merged 12 commits into from
Feb 8, 2021
Merged

Fix forward-merge conflicts for #1370 [skip-ci] #1377

merged 12 commits into from
Feb 8, 2021

Conversation

ajschmidt8
Copy link
Member

This PR fixes the forward-merger conflicts for #1370.

ajschmidt8 and others added 5 commits February 1, 2021 13:26
This PR prepares the changelog to be automatically updated during releases.

Authors:
  - AJ Schmidt (@ajschmidt8)

Approvers:
  - Rick Ratzel (@rlratzel)

URL: rapidsai/cuml#1368
Close #1313 #1331 #1330

Authors:
  - @Iroy30

Approvers:
  - Brad Rees (@BradReesWork)
  - Rick Ratzel (@rlratzel)
  - Alex Fender (@afender)

URL: #1332
This PR adds the GitHub action [PR Labeler](https://github.com/actions/labeler) to auto-label PRs based on their content. 

Labeling is managed with a configuration file `.github/labeler.yml` using the following [options](https://github.com/actions/labeler#usage).

Authors:
  - Joseph (@jolorunyomi)

Approvers:
  - AJ Schmidt (@ajschmidt8)
  - Rick Ratzel (@rlratzel)

URL: #1358
added the coverage plugin option by default
added pytest-cov package

Authors:
  - @jnke2016

Approvers:
  - AJ Schmidt (@ajschmidt8)
  - Brad Rees (@BradReesWork)

URL: #1352
Bug fixes for MNMG coarsen_graph, renumber_edgelist, relabel

Authors:
  - Seunghwa Kang (@seunghwak)

Approvers:
  - Andrei Schaffer (@aschaffer)
  - Rick Ratzel (@rlratzel)
  - Chuck Hastings (@ChuckHastings)
  - Alex Fender (@afender)

URL: #1364
@ajschmidt8 ajschmidt8 added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Feb 3, 2021
@ajschmidt8 ajschmidt8 requested review from a team as code owners February 3, 2021 16:51
@ajschmidt8 ajschmidt8 changed the base branch from branch-0.18 to branch-0.19 February 3, 2021 16:52
@ajschmidt8 ajschmidt8 requested review from a team as code owners February 3, 2021 16:52
@ajschmidt8
Copy link
Member Author

rerun tests

Copy link
Contributor

@rlratzel rlratzel left a comment

Choose a reason for hiding this comment

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

doc-related merges look okay.

updated the conda environments to have cmake 3.18 and update the README file

Authors:
  - Brad Rees (@BradReesWork)

Approvers:
  - AJ Schmidt (@ajschmidt8)
  - Rick Ratzel (@rlratzel)
  - Alex Fender (@afender)

URL: #1369
aschaffer and others added 2 commits February 3, 2021 21:51
This exposes to cython / python newly added C++ functions `sort_and_shuffle_values()` and `renumber_edgelist()` in order to perform MNMG renumbering.

Authors:
  - Andrei Schaffer (@aschaffer)

Approvers:
  - Chuck Hastings (@ChuckHastings)
  - Seunghwa Kang (@seunghwak)
  - Alex Fender (@afender)

URL: #1355
…t cugraph as an external project and other tech debt removal (#1367)

This PR makes cuGraph's cmake files more consistent with other RAPIDS libs by matching the minimum required cmake version, adding `project()` statements to cugraph's thirdparty modules, and using `CMAKE_CURRENT_SOURCE_DIR` appropriately so paths are relative to the CMakeLists.txt file rather than the top-level cmake dir of the project (since that may not be the cugraph cpp dir in the case of cugraph being used as an external project by another application).

This also adds a `CUDA_ARCHITECTURES=OFF` setting to suppress the warning printed for each test target. This setting may be replaced/changed once the findcudatoolkit feature is used in a future cmake version.

This also removes the Arrow and GTest cmake files since Arrow is not a direct dependency and those files were not being used, and GTest is now a build requirement in the conda dev environment and does not need to be built from source (the conda dev env files have been updated accordingly).

This PR also addresses much of #1075 , but not completely since gunrock is still using `ExternalProject` due to (I think) updates that need to be made to their cmake files to support this.

This was tested by observing a successful clean build, however it was **not** tested by creating a separate cmake application to simulate cugraph being used as a 3rd party package.

Note: the changes in this PR were modeled after rapidsai/rmm#541

closes #1137 
closes #1266

Authors:
  - Rick Ratzel (@rlratzel)

Approvers:
  - Chuck Hastings (@ChuckHastings)
  - AJ Schmidt (@ajschmidt8)
  - Brad Rees (@BradReesWork)

URL: #1367
@ajschmidt8
Copy link
Member Author

rerun tests

@BradReesWork BradReesWork added this to the 0.19 milestone Feb 4, 2021
@codecov-io
Copy link

codecov-io commented Feb 4, 2021

Codecov Report

❗ No coverage uploaded for pull request base (branch-0.19@acd35c5). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff               @@
##             branch-0.19    #1377   +/-   ##
==============================================
  Coverage               ?   60.39%           
==============================================
  Files                  ?       67           
  Lines                  ?     3060           
  Branches               ?        0           
==============================================
  Hits                   ?     1848           
  Misses                 ?     1212           
  Partials               ?        0           

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 acd35c5...e68be9c. Read the comment docs.

afender and others added 4 commits February 4, 2021 21:14
### Description
Let the egonet graph of a node x be the subgraph that includes the neighborhood of x and all edges between them. Here is a basic description (1-hop, single seed) :
- Add center node x to the graph.
- Go through all the neighbors y of this center node x, add edge (x, y) to the graph. 
- For each neighbor y of center node x, go through all the neighbors z of center node x, if there is an edge between y and z in the original graph, add edge (y, z) to our new graph. 

### Proposed solution
Rather than doing custom one/two hops features, we propose a generic k-hops solution leveraging BFS with cutoff to identify neighbors within a given radius. 

In addition to the single source version (matching what's available in Nx), we propose to handle multiple sources (seeds) at once which allows better performances.

This PR also enables a path in the experimental stack for returning multiple graphs (edge list format) from CUDA prims to python without using the legacy classes.

As future work, we want to enable concurrency for the cutoff BFS for each seed. This is dependent of #957 

Close #475

Authors:
  - Alex Fender (@afender)
  - @Iroy30

Approvers:
  - @Iroy30
  - Brad Rees (@BradReesWork)

URL: #1365
Authors:
  - @Iroy30

Approvers:
  - Brad Rees (@BradReesWork)
  - Alex Fender (@afender)

URL: #1378
Preparing for MNMG Leiden and ECG identified an area for code cleanup.

The original cuGraph implementation of Louvain would flatten the hierarchical clustering as it was computed, filling (and returning) the final clustering.  This adds an awkward step in the middle of the Louvain computation.  Additionally, since Louvain (and Leiden and ECG which derive from it) is actually a hierarchical clustering algorithm it would be nice to generate the actual Dendrogram.

This PR implements a Dendrogram class, a function for flattening the Dendrogram, and modifies Louvain, Leiden and ECG to use the Dendrogram class.

It was suggested that the Dendrogram class could be moved to raft, decided to defer that until later, it's easy enough to move.

Authors:
  - Chuck Hastings (@ChuckHastings)

Approvers:
  - Alex Fender (@afender)
  - Brad Rees (@BradReesWork)
  - Andrei Schaffer (@aschaffer)
  - Rick Ratzel (@rlratzel)
  - AJ Schmidt (@ajschmidt8)

URL: #1359
@ajschmidt8 ajschmidt8 changed the title Fix forward-merge conflicts for #1370 Fix forward-merge conflicts for #1370 [skip-ci] Feb 5, 2021
@ajschmidt8 ajschmidt8 merged commit 1021507 into rapidsai:branch-0.19 Feb 8, 2021
@ajschmidt8 ajschmidt8 deleted the branch-0.19-merge-0.18 branch February 8, 2021 15:24
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.