Skip to content
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

Jump to bottom

Implement Impl::max_reduce since ArborX::max has been deprecated #729

Merged
merged 3 commits into from
Jan 4, 2024
Merged

Implement Impl::max_reduce since ArborX::max has been deprecated #729

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fa71f2
Implement Impl::max_reduce since ArborX::max has been deprecated
dalg24 Jan 3, 2024
cf5593d
Fixup View::rank() was added in Kokkos 4.1 which exceeds the current …
dalg24 Jan 3, 2024
e4c7d1f
Fixup it doesnt seem like I am allowed to use is_execution_space_v
dalg24 Jan 3, 2024
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
26 changes: 25 additions & 1 deletion core/src/Cabana_Experimental_NeighborList.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include <Cabana_NeighborList.hpp>
#include <Cabana_Slice.hpp>
#include <Cabana_Types.hpp> // is_accessible_from

#include <ArborX.hpp>

Expand Down Expand Up @@ -69,6 +70,29 @@ auto makePredicates(
return Impl::SubsliceAndRadius<stdcxx20::remove_cvref_t<Slice>>{
std::forward<Slice>( slice ), first, last, radius };
}

template <typename ExecutionSpace, typename D, typename... P>
typename Kokkos::View<D, P...>::non_const_value_type
max_reduce( ExecutionSpace const& space, Kokkos::View<D, P...> const& v )
{
using V = Kokkos::View<D, P...>;
static_assert( V::rank == 1 );
static_assert( Kokkos::is_execution_space<ExecutionSpace>::value );
static_assert(
is_accessible_from<typename V::memory_space, ExecutionSpace>::value );
using Ret = typename Kokkos::View<D, P...>::non_const_value_type;
Ret max_val;
Kokkos::parallel_reduce(
Kokkos::RangePolicy<ExecutionSpace>( space, 0, v.extent( 0 ) ),
KOKKOS_LAMBDA( int i, Ret& partial_max ) {
if ( v( i ) > partial_max )
{
partial_max = v( i );
}
},
Kokkos::Max<Ret>( max_val ) );
return max_val;
}
//! \endcond
} // namespace Impl
} // namespace Experimental
Expand Down Expand Up @@ -437,7 +461,7 @@ auto make2DNeighborList( ExecutionSpace space, Tag,
Tag>{ counts } );
}

auto const max_neighbors = ArborX::max( space, counts );
auto const max_neighbors = Impl::max_reduce( space, counts );
if ( max_neighbors <= buffer_size )
{
// NOTE We do not bother shrinking to eliminate the excess allocation.
Expand Down
Loading