Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Add CUB block and device merge sort #322

Merged
merged 1 commit into from
Jul 28, 2021
Merged

Add CUB block and device merge sort #322

merged 1 commit into from
Jul 28, 2021

Conversation

gevtushenko
Copy link
Collaborator

This PR contains a port of thrust merge sort algorithm, which was split into device and block parts.

@gevtushenko gevtushenko force-pushed the main-feature/github/cub_merge_sort branch from 0f8b8cc to ee4f5bb Compare June 15, 2021 14:01
@alliepiper alliepiper linked an issue Jun 15, 2021 that may be closed by this pull request
[RFE] Add merge sort support #283
Closed
@alliepiper alliepiper added this to the 1.14.0 milestone Jun 15, 2021
@gevtushenko gevtushenko force-pushed the main-feature/github/cub_merge_sort branch from ee4f5bb to d5e3402 Compare June 16, 2021 22:45
alliepiper
alliepiper suggested changes Jun 17, 2021
View reviewed changes
Copy link
Collaborator

@alliepiper alliepiper left a comment

Choose a reason for hiding this comment

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

This looks good overall. I have some comments about style and docs mostly -- I think most of the style issues come from the Thrust implementation, but let's clean some of them up while porting.

cub/agent/agent_merge_sort.cuh Outdated Show resolved Hide resolved
cub/agent/agent_merge_sort.cuh Outdated Show resolved Hide resolved
cub/agent/agent_merge_sort.cuh Outdated Show resolved Hide resolved
cub/agent/agent_merge_sort.cuh Outdated Show resolved Hide resolved
cub/agent/agent_merge_sort.cuh Outdated Show resolved Hide resolved
test/test_block_merge_sort.cu Outdated Show resolved Hide resolved
test/test_device_merge_sort.cu Outdated Show resolved Hide resolved
test/test_device_merge_sort.cu Outdated Show resolved Hide resolved
test/test_device_merge_sort.cu Outdated Show resolved Hide resolved
test/test_device_merge_sort.cu Outdated Show resolved Hide resolved
@gevtushenko gevtushenko force-pushed the main-feature/github/cub_merge_sort branch 2 times, most recently from 9ec947c to f175b97 Compare June 24, 2021 14:35
@gevtushenko gevtushenko force-pushed the main-feature/github/cub_merge_sort branch from f175b97 to 334c546 Compare June 29, 2021 15:26
@jrhemstad jrhemstad mentioned this pull request Jun 30, 2021
Open
alliepiper
alliepiper reviewed Jul 2, 2021
View reviewed changes
Copy link
Collaborator

@alliepiper alliepiper left a comment

Choose a reason for hiding this comment

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

The rewritten sections are /much/ easier to follow now, nice job! 👍

A few minor changes to docs/style suggested inline. Once those are addressed this should be ready to test.

cub/agent/agent_merge_sort.cuh Show resolved Hide resolved
cub/block/block_merge_sort.cuh Show resolved Hide resolved
cub/agent/agent_merge_sort.cuh Show resolved Hide resolved
cub/agent/agent_merge_sort.cuh Show resolved Hide resolved
cub/agent/agent_merge_sort.cuh Outdated Show resolved Hide resolved
cub/block/block_merge_sort.cuh Show resolved Hide resolved
cub/block/block_merge_sort.cuh Show resolved Hide resolved
cub/block/block_merge_sort.cuh Show resolved Hide resolved
cub/cub.cuh Show resolved Hide resolved
cub/device/dispatch/dispatch_merge_sort.cuh Show resolved Hide resolved
@alliepiper alliepiper assigned gevtushenko and unassigned alliepiper Jul 2, 2021
@gevtushenko gevtushenko mentioned this pull request Jul 5, 2021
Closed
@gevtushenko gevtushenko force-pushed the main-feature/github/cub_merge_sort branch from 334c546 to 590ddee Compare July 5, 2021 06:06
@jrhemstad jrhemstad mentioned this pull request Jul 6, 2021
Closed
@gevtushenko gevtushenko force-pushed the main-feature/github/cub_merge_sort branch from 590ddee to f6d6db6 Compare July 7, 2021 18:22
gevtushenko added a commit to gevtushenko/thrust that referenced this pull request Jul 7, 2021
@gevtushenko
Do not merge; Test NVIDIA/cub#322
35d6b1d
gevtushenko added a commit to gevtushenko/thrust that referenced this pull request Jul 7, 2021
@gevtushenko
Do not merge; Test NVIDIA/cub#322
c329b41
@gevtushenko gevtushenko force-pushed the main-feature/github/cub_merge_sort branch from f6d6db6 to 764ca4b Compare July 7, 2021 20:25
gevtushenko added a commit to gevtushenko/thrust that referenced this pull request Jul 7, 2021
@gevtushenko
Do not merge; Test NVIDIA/cub#322
5301a5e
@gevtushenko gevtushenko force-pushed the main-feature/github/cub_merge_sort branch from 764ca4b to c4af0d1 Compare July 8, 2021 10:14
gevtushenko added a commit to gevtushenko/thrust that referenced this pull request Jul 8, 2021
@gevtushenko
Do not merge; Test NVIDIA/cub#322
a81567c
@alliepiper alliepiper self-requested a review July 21, 2021 16:18
alliepiper
alliepiper approved these changes Jul 21, 2021
View reviewed changes
Copy link
Collaborator

@alliepiper alliepiper left a comment

Choose a reason for hiding this comment

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

Looks good, approving. This will need to be rebased and updated to use the new CUB_NAMESPACE_BEGIN and CUB_NAMESPACE_END macros, then retested on gpuCI and DVS.

@gevtushenko gevtushenko force-pushed the main-feature/github/cub_merge_sort branch from c4af0d1 to 9631ad6 Compare July 22, 2021 10:27
@alliepiper alliepiper mentioned this pull request Jul 22, 2021
Merged
@gevtushenko
Copy link
Collaborator Author

DVS: 30226396

@gevtushenko gevtushenko force-pushed the main-feature/github/cub_merge_sort branch from 9631ad6 to 267d78f Compare July 28, 2021 18:48
@gevtushenko gevtushenko merged commit e59cff3 into NVIDIA:main Jul 28, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@alliepiper alliepiper alliepiper approved these changes

Assignees

@gevtushenko gevtushenko

Labels
None yet
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.

[RFE] Add merge sort support
2 participants
@gevtushenko @alliepiper