Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update tree query to take execution space argument #250

Merged
merged 11 commits into from
Mar 27, 2020

Conversation

dalg24
Copy link
Contributor

@dalg24 dalg24 commented Mar 27, 2020

No description provided.

@dalg24
Copy link
Contributor Author

dalg24 commented Mar 27, 2020

I dropped commits that were getting rid of the DeviceType template argument for Details:: BatchedQueries because we run into the same issue where we need overloads that cast the views to const the data type (see #244 (comment))

We can revisit later.

@@ -90,6 +88,8 @@ sortObjects(ViewType &view)
bin_sort(view, CompType(n / 2, result.min_val, result.max_val), true);
bin_sort.create_permute_vector();
bin_sort.sort(view);
// FIXME Kokkos::BinSort is currently missing overloads that an execution
// space as argument
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Need to report that on the Kokkos side and fix

Copy link
Contributor

Choose a reason for hiding this comment

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

Please link it here when you open the issue there.

Copy link
Contributor

@aprokop aprokop left a comment

Choose a reason for hiding this comment

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

Pretty straightforward.


auto permute_ptr = thrust::device_ptr<size_t>(permute.data());
auto begin_ptr = thrust::device_ptr<ValueType>(view.data());
auto end_ptr = thrust::device_ptr<ValueType>(view.data() + n);
thrust::sort_by_key(begin_ptr, end_ptr, permute_ptr);
thrust::sort_by_key(execution_policy, begin_ptr, end_ptr, permute_ptr);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Making sure you see saw that

@aprokop aprokop merged commit b00057e into arborx:master Mar 27, 2020
@aprokop aprokop deleted the query_execution_space branch March 27, 2020 19:21
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants