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

Update cugraph to with newest CMake features, including CPM for dependencies #1585

Merged
merged 56 commits into from
May 25, 2021

Conversation

robertmaynard
Copy link
Contributor

@robertmaynard robertmaynard commented May 7, 2021

This allows the cugraph to be used via CPM either from a system installed version or from a build-directory.

@robertmaynard robertmaynard requested a review from a team as a code owner May 7, 2021 21:14
@robertmaynard robertmaynard requested a review from a team as a code owner May 10, 2021 13:10
Copy link
Member

@ajschmidt8 ajschmidt8 left a comment

Choose a reason for hiding this comment

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

Approving ops-codeowner file changes

@codecov-commenter
Copy link

codecov-commenter commented May 11, 2021

Codecov Report

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

Impacted file tree graph

@@               Coverage Diff               @@
##             branch-21.06    #1585   +/-   ##
===============================================
  Coverage                ?   59.90%           
===============================================
  Files                   ?       79           
  Lines                   ?     3482           
  Branches                ?        0           
===============================================
  Hits                    ?     2086           
  Misses                  ?     1396           
  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 570d811...eb1b8c7. Read the comment docs.

dantegd and others added 2 commits May 11, 2021 11:58
@robertmaynard robertmaynard requested a review from a team as a code owner May 11, 2021 18:54
cpp/CMakeLists.txt Outdated Show resolved Hide resolved
@trxcllnt
Copy link
Collaborator

Thrust 1.12 compile errors should be fixed by rapidsai/raft#231.

@trxcllnt
Copy link
Collaborator

rerun tests

robertmaynard and others added 5 commits May 19, 2021 11:33
The setuputils.py script will try to parse the `PINNED_TAG` arguments
from `get_raft` and will fail if CMake variables are used.
Update setuputils to deduce cugraph minor/major version from cmakelists to allow dynamic pinning of RAFT
@BradReesWork
Copy link
Member

@robertmaynard one minor merge conflct

@robertmaynard
Copy link
Contributor Author

@robertmaynard one minor merge conflct

Resolved the conflict.

@BradReesWork
Copy link
Member

@gpucibot merge

@robertmaynard
Copy link
Contributor Author

rerun tests

@rapids-bot rapids-bot bot merged commit 03dae45 into rapidsai:branch-21.06 May 25, 2021
@robertmaynard robertmaynard deleted the use_rapids_cmake branch May 27, 2021 12:30
rapids-bot bot pushed a commit that referenced this pull request Jun 1, 2021
Similar to rapidsai/cuml#3901. 

After #1491 and #rapids-cmake and #1585, now at install time, the cugraph headers are being nested into `path/to/env/include/cugraph/cugraph` instead of just `path/to/env/include/cugraph/`. This, as far as I'm aware, is unintentional and unlike the rest of RAPIDS projects (cuDF, RMM and cuML). 

cc @trxcllnt @robertmaynard

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

Approvers:
  - Chuck Hastings (https://github.com/ChuckHastings)
  - Robert Maynard (https://github.com/robertmaynard)
  - Seunghwa Kang (https://github.com/seunghwak)
  - Paul Taylor (https://github.com/trxcllnt)
  - Rick Ratzel (https://github.com/rlratzel)

URL: #1630
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.

7 participants