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

Use CUB 1.15.0's new segmented sort #1977

Merged
merged 16 commits into from
Jan 13, 2022

Conversation

seunghwak
Copy link
Contributor

@seunghwak seunghwak commented Dec 3, 2021

  • Update neighbor sort to use the new segmented sort.
  • Update copy_v_transform_reduce_key_aggregated_out_nbr to use the new segmented sort (instead of a global sort) for the data already sorted by major vertices (e.g. previously segmented sort was slower than the global sort).

@seunghwak seunghwak requested a review from a team as a code owner December 3, 2021 01:31
@seunghwak seunghwak self-assigned this Dec 3, 2021
@seunghwak seunghwak added 2 - In Progress improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Dec 3, 2021
@seunghwak seunghwak added this to the 22.02 milestone Dec 3, 2021
@seunghwak seunghwak added the DO NOT MERGE Hold off on merging; see PR for details label Dec 3, 2021
Copy link
Collaborator

@ChuckHastings ChuckHastings left a comment

Choose a reason for hiding this comment

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

LGTM - still waiting on the rapids-make change.

@seunghwak
Copy link
Contributor Author

LGTM - still waiting on the rapids-make change.

Thanks for a quick review but this PR is still a work-in-progress :-)

I will also experiment with this in copy_v_key_aggregated_out_nbr to see whether I can make the primitive faster.
https://github.com/rapidsai/cugraph/blob/branch-22.02/cpp/include/cugraph/prims/copy_v_transform_reduce_key_aggregated_out_nbr.cuh#L352

This pulls updates from #1976, so that PR may better be reviewed & merged first :-)

@seunghwak seunghwak changed the title [WIP][skip-ci] Use CUB 1.15.0's new segmented sort [skip-ci] Use CUB 1.15.0's new segmented sort Dec 7, 2021
@ChuckHastings
Copy link
Collaborator

rapidsai/rapids-cmake#138 tracks the work to upgrade thrust/cub to version 1.15.0

@robertmaynard
Copy link
Contributor

The rapids-cmake PR has been merged.

I believe you can also remove the following workaround: https://github.com/rapidsai/cugraph/blob/branch-22.02/cpp/cmake/thirdparty/get_thrust.cmake#L21

@seunghwak seunghwak changed the title [skip-ci] Use CUB 1.15.0's new segmented sort Use CUB 1.15.0's new segmented sort Jan 11, 2022
@seunghwak seunghwak removed the DO NOT MERGE Hold off on merging; see PR for details label Jan 11, 2022
@seunghwak seunghwak requested a review from a team as a code owner January 11, 2022 17:21
@codecov-commenter
Copy link

codecov-commenter commented Jan 12, 2022

Codecov Report

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

Impacted file tree graph

@@               Coverage Diff               @@
##             branch-22.02    #1977   +/-   ##
===============================================
  Coverage                ?   70.75%           
===============================================
  Files                   ?      142           
  Lines                   ?     8860           
  Branches                ?        0           
===============================================
  Hits                    ?     6269           
  Misses                  ?     2591           
  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 14074b8...21ff240. Read the comment docs.

@ChuckHastings
Copy link
Collaborator

@gpucibot merge

@rapids-bot rapids-bot bot merged commit c92087b into rapidsai:branch-22.02 Jan 13, 2022
@seunghwak seunghwak deleted the enh_segmented_sort branch January 27, 2022 20:02
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.

5 participants