Remove requirement on knowing geometry types in IndexableGetter #1211
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
aprokop
commented
Feb 5, 2025
Comment on lines
+37
to
+38
| typename Enable = std::enable_if_t< | ||
| !Details::is_pair_value_index_v<std::decay_t<Geometry>>>> |
There was a problem hiding this comment.
This is needed so that universal reference does not grab PairValueIndex specializations.
dalg24
reviewed
Feb 5, 2025
Co-authored-by: Damien L-G <[email protected]>
aprokop
force-pushed
the
update_indexable_getter
branch
from
3c34dfb to
6ffdcf2
Compare
|
Couple irrelevant build failures (out of space, gpu not picked up). |
dalg24
reviewed
Feb 6, 2025
| @@ -27,29 +27,30 @@ struct DefaultIndexableGetter | |||
| KOKKOS_DEFAULTED_FUNCTION | |||
| DefaultIndexableGetter() = default; | |||
|
|
|||
| template <typename Geometry, typename Enable = std::enable_if_t< | |||
| GeometryTraits::is_valid_geometry<Geometry>>> | |||
| template <typename Geometry> | |||
| KOKKOS_FUNCTION auto const &operator()(Geometry const &geometry) const | |||
There was a problem hiding this comment.
I think this one will never be called
https://godbolt.org/z/64WGdP3n9
There was a problem hiding this comment.
It is. For example, when running ArborX_Test_Clustering.exe, the stack leading to the call is:
frame #5: 0x00000001006cbd24 ArborX_Test_Clustering.exe`auto const& ArborX::Experimental::DefaultIndexableGetter::operator(this=0x000000016fdf7648, geometry=0x0000611000076cc0)<ArborX::Point<3, float>>(ArborX::Point<3, float> const&) const at ArborX_IndexableGetter.hpp:34:5
frame #6: 0x00000001006cbc80 ArborX_Test_Clustering.exe`ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter>::operator()(this=0x000000016fdf7630, i=0) const at ArborX_IndexableGetter.hpp:76:12
frame #7: 0x00000001006cbadc ArborX_Test_Clustering.exe`void ArborX::Details::TreeConstruction::calculateBoundingBoxOfTheScene<Kokkos::Serial, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter>, ArborX::Box<3, float>>(this=0x000000016fdf7630, i=0, update=0x000000016fdf8660)::'lambda'(int, ArborX::Box<3, float>&)::operator()(int, ArborX::Box<3, float>&) const at ArborX_TreeConstruction.hpp:36:24
frame #8: 0x00000001006cb918 ArborX_Test_Clustering.exe`std::__1::enable_if<std::is_void_v<Kokkos::Serial>, void>::type Kokkos::Impl::ParallelReduce<Kokkos::Impl::CombinedFunctorReducer<void ArborX::Details::TreeConstruction::calculateBoundingBoxOfTheScene<Kokkos::Serial, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter>, ArborX::Box<3, float>>(Kokkos::Serial const&, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter> const&, ArborX::Box<3, float>&)::'lambda'(int, ArborX::Box<3, float>&), Kokkos::Impl::FunctorAnalysis<Kokkos::Impl::FunctorPatternInterface::REDUCE, Kokkos::RangePolicy<>, ArborX::Details::GeometryReducer<ArborX::Box<3, float>, Kokkos::HostSpace>, ArborX::Box<3, float>>::Reducer, void>, Kokkos::RangePolicy<>, Kokkos::Serial>::exec<void>(this=0x000000016fdf7630, update=0x000000016fdf8660) const at Kokkos_Serial_Parallel_Range.hpp:91:7
frame #9: 0x00000001006ca040 ArborX_Test_Clustering.exe`Kokkos::Impl::ParallelReduce<Kokkos::Impl::CombinedFunctorReducer<void ArborX::Details::TreeConstruction::calculateBoundingBoxOfTheScene<Kokkos::Serial, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter>, ArborX::Box<3, float>>(Kokkos::Serial const&, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter> const&, ArborX::Box<3, float>&)::'lambda'(int, ArborX::Box<3, float>&), Kokkos::Impl::FunctorAnalysis<Kokkos::Impl::FunctorPatternInterface::REDUCE, Kokkos::RangePolicy<>, ArborX::Details::GeometryReducer<ArborX::Box<3, float>, Kokkos::HostSpace>, ArborX::Box<3, float>>::Reducer, void>, Kokkos::RangePolicy<>, Kokkos::Serial>::execute(this=0x000000016fdf7630) const at Kokkos_Serial_Parallel_Range.hpp:137:20
frame #10: 0x00000001006c8b30 ArborX_Test_Clustering.exe`Kokkos::Impl::ParallelReduceAdaptor<Kokkos::RangePolicy<>, void ArborX::Details::TreeConstruction::calculateBoundingBoxOfTheScene<Kokkos::Serial, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter>, ArborX::Box<3, float>>(Kokkos::Serial const&, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter> const&, ArborX::Box<3, float>&)::'lambda'(int, ArborX::Box<3, float>&), ArborX::Details::GeometryReducer<ArborX::Box<3, float>, Kokkos::HostSpace>>::execute_impl(label="ArborX::TreeConstruction::calculate_bounding_box_of_the_scene", policy=0x000000016fdf7c20, functor=0x000000016fdf7c70, return_value=0x000000016fdf79e0) at Kokkos_Parallel_Reduce.hpp:1539:13
frame #11: 0x00000001006c850c ArborX_Test_Clustering.exe`std::__1::enable_if<!(Kokkos::Impl::ParallelReduceAdaptor<Kokkos::RangePolicy<>, void ArborX::Details::TreeConstruction::calculateBoundingBoxOfTheScene<Kokkos::Serial, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter>, ArborX::Box<3, float>>(Kokkos::Serial const&, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter> const&, ArborX::Box<3, float>&)::'lambda'(int, ArborX::Box<3, float>&), ArborX::Details::GeometryReducer<ArborX::Box<3, float>, Kokkos::HostSpace>>::is_array_reduction && std::is_pointer_v<Kokkos::Serial>), void>::type Kokkos::Impl::ParallelReduceAdaptor<Kokkos::RangePolicy<>, void ArborX::Details::TreeConstruction::calculateBoundingBoxOfTheScene<Kokkos::Serial, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter>, ArborX::Box<3, float>>(Kokkos::Serial const&, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter> const&, ArborX::Box<3, float>&)::'lambda'(int, ArborX::Box<3, float>&), ArborX::Details::GeometryReducer<ArborX::Box<3, float>, Kokkos::HostSpace>>::execute<ArborX::Details::GeometryReducer<ArborX::Box<3, float>, Kokkos::HostSpace>>(label="ArborX::TreeConstruction::calculate_bounding_box_of_the_scene", policy=0x000000016fdf7c20, functor=0x000000016fdf7c70, return_value=0x000000016fdf79e0) at Kokkos_Parallel_Reduce.hpp:1555:5
frame #12: 0x00000001006c7f08 ArborX_Test_Clustering.exe`std::__1::enable_if<Kokkos::is_execution_policy<Kokkos::Serial>::value && (Kokkos::is_view<ArborX::Box<3, float>>::value || Kokkos::is_reducer<ArborX::Box<3, float>>::value || std::is_pointer_v<ArborX::Box<3, float>>), void>::type Kokkos::parallel_reduce<Kokkos::RangePolicy<>, void ArborX::Details::TreeConstruction::calculateBoundingBoxOfTheScene<Kokkos::Serial, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter>, ArborX::Box<3, float>>(Kokkos::Serial const&, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter> const&, ArborX::Box<3, float>&)::'lambda'(int, ArborX::Box<3, float>&), ArborX::Details::GeometryReducer<ArborX::Box<3, float>, Kokkos::HostSpace>>(label="ArborX::TreeConstruction::calculate_bounding_box_of_the_scene", policy=0x000000016fdf7c20, functor=0x000000016fdf7c70, return_value=0x000000016fdf7cb0) at Kokkos_Parallel_Reduce.hpp:1774:3
frame #13: 0x00000001006a5f50 ArborX_Test_Clustering.exe`void ArborX::Details::TreeConstruction::calculateBoundingBoxOfTheScene<Kokkos::Serial, ArborX::Details::Indexables<ArborX::Details::AccessValuesI<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>>, ArborX::Experimental::DefaultIndexableGetter>, ArborX::Box<3, float>>(space=0x000000016fdfa300, indexables=0x000000016fdf86a0, scene_bounding_box=0x000000016fdf8660) at ArborX_TreeConstruction.hpp:31:3
frame #14: 0x000000010045637c ArborX_Test_Clustering.exe`Kokkos::View<int*, ArborX::AccessTraits<HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>, void>::memory_space> ArborX::dbscan<Kokkos::Serial, HiddenView<Kokkos::View<ArborX::Point<3, float>*, Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>>>, float>(exec_space=0x000000016fdfa300, primitives=0x000000016fdfa950, eps=1.66068161, core_min_size=2, parameters=0x000000016fdfa360) at ArborX_DBSCAN.hpp:311:5
In your code, if you introduce an intermediary function goo that it goes through, it will use const& variant: https://godbolt.org/z/Krrdv39PP
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.
In the current iteration, if a user has a custom geometry type that they try to build hierarchy on, it has to be tagged with one of the ArborX tags, which would call ArborX routines. This patch relaxes this requirement. Now, a user only needs to specify dimension and coordinate type.
I added a compile-only test that shows the requirements.