Fix device declarations for HIP compilation and use DETRAY_NO_DEVICE consistently #951
+9
−12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stephenswat
requested changes
Mar 13, 2025
| @@ -23,8 +23,7 @@ template <std::random_access_iterator rand_iter_t, | |||
| std::sentinel_for<rand_iter_t> sentinel_t> | |||
| DETRAY_HOST_DEVICE inline void sequential_sort(rand_iter_t first, | |||
| sentinel_t last) { | |||
| #if defined(__CUDACC__) || defined(CL_SYCL_LANGUAGE_VERSION) || \ | |||
| defined(SYCL_LANGUAGE_VERSION) | |||
| #if !defined(DETRAY_NO_DEVICE) | |||
There was a problem hiding this comment.
Nitpick, but for readability could we do the following?
#ifdef DETRAY_NO_DEVICE
std::ranges::sort(first, last);
#else
detray::detail::selection_sort(first, last);
#endif
|
stephenswat
approved these changes
Mar 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Missing some
if defined(__HIP__): since DETRAY_NO_DEVICE defines these, use it consistently instead.