Update to ArborX 2.0

Author: aprokop

.github/workflows/CI.yml

@@ -162,8 +162,8 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Release'
-            kokkos_ver: '4.3.00'
-            arborx: 'fee3d777c0325a90ab50671fca69f2dc98f2a882'
+            kokkos_ver: '4.6.00'
+            arborx: 'v2.0'
             heffte: 'OFF'
             hypre: 'OFF'
             coverage: 'OFF'
@@ -244,8 +244,8 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Debug'
-            kokkos_ver: '4.3.00'
-            arborx: 'fee3d777c0325a90ab50671fca69f2dc98f2a882'
+            kokkos_ver: '4.5.00'
+            arborx: 'v2.0'
             heffte: 'FFTW'
             hypre: 'HYPRE'
             liball: 'libALL'

core/src/Cabana_Experimental_NeighborList.hpp

@@ -107,7 +107,7 @@ namespace ArborX
 //! Neighbor access trait for Cabana slice and/or Kokkos View.
 template <typename Positions>
 struct AccessTraits<Positions,
-#if ARBORX_VERSION < 10799
+#if ARBORX_VERSION < 20000
                     PrimitivesTag,
 #endif
                     std::enable_if_t<Cabana::is_slice<Positions>{} ||
@@ -133,7 +133,7 @@ struct AccessTraits<Positions,
 //! Neighbor access trait.
 template <typename Positions>
 struct AccessTraits<Cabana::Experimental::Impl::SubPositionsAndRadius<Positions>
-#if ARBORX_VERSION < 10799
+#if ARBORX_VERSION < 20000
                     ,
                     PredicatesTag
 #endif
@@ -156,7 +156,7 @@ struct AccessTraits<Cabana::Experimental::Impl::SubPositionsAndRadius<Positions>
     {
         assert( i < size( x ) );
         auto const point = AccessTraits<typename PositionLike::positions_type
-#if ARBORX_VERSION < 10799
+#if ARBORX_VERSION < 20000
                                         ,
                                         PrimitivesTag
 #endif
@@ -198,7 +198,7 @@ struct CollisionFilter<HalfNeighborTag>
 template <typename Tag>
 struct NeighborDiscriminatorCallback
 {
-#if ARBORX_VERSION >= 10799
+#if ARBORX_VERSION >= 20000
     template <typename Predicate, typename Geometry, typename OutputFunctor>
     KOKKOS_FUNCTION void
     operator()( Predicate const& predicate,
@@ -232,7 +232,7 @@ template <typename Counts, typename Tag>
 struct NeighborDiscriminatorCallback2D_FirstPass
 {
     Counts counts;
-#if ARBORX_VERSION >= 10799
+#if ARBORX_VERSION >= 20000
     template <typename Predicate, typename Geometry>
     KOKKOS_FUNCTION void
     operator()( Predicate const& predicate,
@@ -265,7 +265,7 @@ struct NeighborDiscriminatorCallback2D_FirstPass_BufferOptimization
 {
     Counts counts;
     Neighbors neighbors;
-#if ARBORX_VERSION >= 10799
+#if ARBORX_VERSION >= 20000
     template <typename Predicate, typename Geometry>
     KOKKOS_FUNCTION void
     operator()( Predicate const& predicate,
@@ -316,7 +316,7 @@ struct NeighborDiscriminatorCallback2D_SecondPass
 {
     Counts counts;
     Neighbors neighbors;
-#if ARBORX_VERSION >= 10799
+#if ARBORX_VERSION >= 20000
     template <typename Predicate, typename Geometry>
     KOKKOS_FUNCTION void
     operator()( Predicate const& predicate,
@@ -404,7 +404,7 @@ auto makeNeighborList( ExecutionSpace space, Tag, Positions const& positions,
 
     using memory_space = typename Positions::memory_space;
 
-#if ARBORX_VERSION >= 10799
+#if ARBORX_VERSION >= 20000
     ArborX::BoundingVolumeHierarchy bvh(
         space, ArborX::Experimental::attach_indices<int>( positions ) );
 #else
@@ -534,7 +534,7 @@ auto make2DNeighborList( ExecutionSpace space, Tag, Positions const& positions,
 
     using memory_space = typename Positions::memory_space;
 
-#if ARBORX_VERSION >= 10799
+#if ARBORX_VERSION >= 20000
     ArborX::BoundingVolumeHierarchy bvh(
         space, ArborX::Experimental::attach_indices<int>( positions ) );
 #else
@@ -546,7 +546,7 @@ auto make2DNeighborList( ExecutionSpace space, Tag, Positions const& positions,
 
     auto const n_queries =
         ArborX::AccessTraits<std::remove_const_t<decltype( predicates )>
-#if ARBORX_VERSION < 10799
+#if ARBORX_VERSION < 20000
                              ,
                              ArborX::PredicatesTag
 #endif