Deprecate/remove += in boxes, deprecate reduction_identity

arborx · May 4, 2024 · a1ba239 · a1ba239
1 parent fa35339
commit a1ba239
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 35 deletions.
diff --git a/src/geometry/ArborX_Box.hpp b/src/geometry/ArborX_Box.hpp
@@ -59,7 +59,8 @@ struct Box
        Details::KokkosExt::ArithmeticTraits::finite_min<float>::value,
        Details::KokkosExt::ArithmeticTraits::finite_min<float>::value}};
 
-  KOKKOS_FUNCTION Box &operator+=(Box const &other)
+  [[deprecated("Use expand(Box, Box) instead.")]] KOKKOS_FUNCTION Box &
+  operator+=(Box const &other)
   {
     using Details::KokkosExt::max;
     using Details::KokkosExt::min;
@@ -72,7 +73,8 @@ struct Box
     return *this;
   }
 
-  KOKKOS_FUNCTION Box &operator+=(Point const &point)
+  [[deprecated("Use expand(Box, Point) instead.")]] KOKKOS_FUNCTION Box &
+  operator+=(Point const &point)
   {
     using Details::KokkosExt::max;
     using Details::KokkosExt::min;
@@ -88,7 +90,7 @@ struct Box
 // FIXME Temporary workaround until we clarify requirements on the Kokkos side.
 #if defined(KOKKOS_ENABLE_OPENMPTARGET) || defined(KOKKOS_ENABLE_SYCL)
 private:
-  friend KOKKOS_FUNCTION Box operator+(Box box, Box const &other)
+  [[deprecated]] friend KOKKOS_FUNCTION Box operator+(Box box, Box const &other)
   {
     return box += other;
   }
@@ -114,7 +116,7 @@ struct ArborX::GeometryTraits::coordinate_type<ArborX::Box>
 } // namespace ArborX
 
 template <>
-struct Kokkos::reduction_identity<ArborX::Box>
+struct [[deprecated]] Kokkos::reduction_identity<ArborX::Box>
 {
   KOKKOS_FUNCTION static ArborX::Box sum() { return {}; }
 };

diff --git a/src/geometry/ArborX_HyperBox.hpp b/src/geometry/ArborX_HyperBox.hpp
@@ -63,36 +63,6 @@ struct Box
 
   Point<DIM, Coordinate> _min_corner;
   Point<DIM, Coordinate> _max_corner;
-
-  template <typename OtherBox,
-            std::enable_if_t<GeometryTraits::is_box<OtherBox>{}> * = nullptr>
-  KOKKOS_FUNCTION auto &operator+=(OtherBox const &other)
-  {
-    using Details::KokkosExt::max;
-    using Details::KokkosExt::min;
-
-    for (int d = 0; d < DIM; ++d)
-    {
-      minCorner()[d] = min(minCorner()[d], other.minCorner()[d]);
-      maxCorner()[d] = max(maxCorner()[d], other.maxCorner()[d]);
-    }
-    return *this;
-  }
-
-  template <typename Point,
-            std::enable_if_t<GeometryTraits::is_point_v<Point>> * = nullptr>
-  KOKKOS_FUNCTION auto &operator+=(Point const &point)
-  {
-    using Details::KokkosExt::max;
-    using Details::KokkosExt::min;
-
-    for (int d = 0; d < DIM; ++d)
-    {
-      minCorner()[d] = min(minCorner()[d], point[d]);
-      maxCorner()[d] = max(maxCorner()[d], point[d]);
-    }
-    return *this;
-  }
 };
 
 } // namespace ArborX::ExperimentalHyperGeometry
@@ -117,7 +87,7 @@ struct ArborX::GeometryTraits::coordinate_type<
 };
 
 template <int DIM, typename Coordinate>
-struct Kokkos::reduction_identity<
+struct [[deprecated]] Kokkos::reduction_identity<
     ArborX::ExperimentalHyperGeometry::Box<DIM, Coordinate>>
 {
   KOKKOS_FUNCTION static ArborX::ExperimentalHyperGeometry::Box<DIM, Coordinate>