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 thrust/RMM deprecated calls #1789

Merged
merged 6 commits into from
Aug 25, 2021

Conversation

dantegd
Copy link
Member

@dantegd dantegd commented Aug 24, 2021

PR essentially backports the fixes in #1707 for the deprecated RMM exec policy, and unpins the RMM nighlty to unblock local builds and CI and local development. Conflicts with the bigger PR should be minimal, and mainly around a single change:

rmm::exec_policy(handle.get_stream())

to

handle.get_thrust_policy()

@dantegd dantegd requested review from a team as code owners August 24, 2021 15:09
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

@ChuckHastings ChuckHastings added 3 - Ready for Review improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Aug 24, 2021
@jakirkham jakirkham mentioned this pull request Aug 24, 2021
@BradReesWork BradReesWork added this to the 21.10 milestone Aug 24, 2021
@BradReesWork
Copy link
Member

rerun tests

@seunghwak
Copy link
Contributor

If #1707 gets merged, do we need rmm::exec_policy(stream)->on(stream) to rmm::exec_policy(stream) changes in this PR?

@ChuckHastings
Copy link
Collaborator

If #1707 gets merged, do we need rmm::exec_policy(stream)->on(stream) to rmm::exec_policy(stream) changes in this PR?

The purpose of this PR is to get merged before #1707, since #1707 is dependent on a series of PRs in other repos getting merged.

If somehow #1707 gets merged first then this PR is obsolete and should be closed without merging.

@ChuckHastings
Copy link
Collaborator

rerun tests

@seunghwak
Copy link
Contributor

seunghwak commented Aug 25, 2021

since #1707 is dependent on a series of PRs in other repos

Yeah... and now #1707 passed the CI, so this doesn't mean those dependencies get resolved?

@seunghwak seunghwak closed this Aug 25, 2021
@seunghwak seunghwak reopened this Aug 25, 2021
@ChuckHastings
Copy link
Collaborator

since #1707 is dependent on a series of PRs in other repos

Yeah... and now #1707 passed the CI, so this doesn't mean those dependencies get resolved?

It passed CI pointing to a custom branch of raft. There will need to be at least 1 more commit to that branch (after some raft PRs get merged) before it can be merged.

@seunghwak
Copy link
Contributor

It passed CI pointing to a custom branch of raft. There will need to be at least 1 more commit to that branch (after some raft PRs get merged) before it can be merged.

I see, and thanks for the clarification. I was just worried about a huge number of merge conflicts between this PR and PR 1707, but it seems like it is unavoidable.

@codecov-commenter
Copy link

codecov-commenter commented Aug 25, 2021

Codecov Report

Merging #1789 (aeb663b) into branch-21.10 (bf64c2c) will decrease coverage by 0.16%.
The diff coverage is n/a.

❗ Current head aeb663b differs from pull request most recent head 46b9b36. Consider uploading reports for the commit 46b9b36 to get more accurate results
Impacted file tree graph

@@               Coverage Diff                @@
##           branch-21.10    #1789      +/-   ##
================================================
- Coverage         59.85%   59.68%   -0.17%     
================================================
  Files                77       77              
  Lines              3547     3567      +20     
================================================
+ Hits               2123     2129       +6     
- Misses             1424     1438      +14     
Impacted Files Coverage Δ
python/cugraph/centrality/katz_centrality.py 89.47% <ø> (ø)
python/cugraph/dask/common/part_utils.py 20.16% <ø> (ø)
python/cugraph/dask/link_analysis/pagerank.py 18.60% <ø> (-1.99%) ⬇️
python/cugraph/layout/force_atlas2.py 55.55% <ø> (+5.55%) ⬆️
python/cugraph/link_analysis/pagerank.py 96.00% <ø> (-4.00%) ⬇️
python/cugraph/utilities/nx_factory.py 86.88% <ø> (+0.92%) ⬆️
python/cugraph/community/__init__.py 70.37% <0.00%> (-18.52%) ⬇️
... and 4 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 fc0aef7...46b9b36. Read the comment docs.

@ChuckHastings
Copy link
Collaborator

@gpucibot merge

@rapids-bot rapids-bot bot merged commit 80a3459 into rapidsai:branch-21.10 Aug 25, 2021
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.

6 participants