Skip to content

Handle non-const operator at merge_sort #64

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.

Sign up for GitHub

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

Merged
saadrahim merged 2 commits into from
May 7, 2019
Merged

Handle non-const operator at merge_sort #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0ebecc
Handle non const operator at merge_sort
neon60 May 7, 2019
b65cfc9
Merge branch 'merge_sort_non_const_op' into 'develop_thrust_stream'
neon60 May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rocprim/include/rocprim/block/detail/block_sort_bitonic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ class block_sort_bitonic
const auto warp_id_is_even = ((flat_tid / ::rocprim::warp_size()) % 2) == 0;
::rocprim::warp_sort<Key, ::rocprim::warp_size(), Value> wsort;
auto compare_function2 =
[compare_function, warp_id_is_even](const Key& a, const Key& b) -> bool
[compare_function, warp_id_is_even](const Key& a, const Key& b) mutable -> bool
{
auto r = compare_function(a, b);
if(warp_id_is_even)
Expand Down
2 changes: 1 addition & 1 deletion rocprim/include/rocprim/device/detail/device_merge_sort.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ void block_sort_kernel_impl(KeysInputIterator keys_input,
);

// Special comparison that preserves relative order of equal keys
auto stable_compare_function = [compare_function](const stable_key_type& a, const stable_key_type& b) -> bool
auto stable_compare_function = [compare_function](const stable_key_type& a, const stable_key_type& b) mutable -> bool
{
const bool ab = compare_function(rocprim::get<0>(a), rocprim::get<0>(b));
const bool ba = compare_function(rocprim::get<0>(b), rocprim::get<0>(a));
Expand Down