From 6d6a7a896c0eca161d13d3c4e6914d2100e74c2a Mon Sep 17 00:00:00 2001
From: Bruno Turcksin <bruno.turcksin@gmail.com>
Date: Fri, 2 Feb 2024 14:47:50 -0500
Subject: [PATCH] Reenable MLS tests on HIP

---
 test/tstInterpDetailsMLSCoefficients.cpp | 22 ----------------------
 test/tstInterpMovingLeastSquares.cpp     | 24 ------------------------
 2 files changed, 46 deletions(-)

diff --git a/test/tstInterpDetailsMLSCoefficients.cpp b/test/tstInterpDetailsMLSCoefficients.cpp
index 3073ee691..d6d07b8c2 100644
--- a/test/tstInterpDetailsMLSCoefficients.cpp
+++ b/test/tstInterpDetailsMLSCoefficients.cpp
@@ -45,17 +45,6 @@ interpolate(ExecutionSpace const &space, SourceValues const &source_values,
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(mls_coefficients, DeviceType, ARBORX_DEVICE_TYPES)
 {
-  // FIXME_HIP: the CI fails with:
-  // fatal error: in "mls_coefficients_edge_cases<Kokkos__Device<Kokkos__HIP_
-  // Kokkos__HIPSpace>>": std::runtime_error: Kokkos::Impl::ParallelFor/Reduce<
-  // HIP > could not find a valid team size.
-  // The error seems similar to https://github.com/kokkos/kokkos/issues/6743
-#ifdef KOKKOS_ENABLE_HIP
-  if (std::is_same_v<typename DeviceType::execution_space, Kokkos::HIP>)
-  {
-    return;
-  }
-#endif
   using ExecutionSpace = typename DeviceType::execution_space;
   using MemorySpace = typename DeviceType::memory_space;
   ExecutionSpace space{};
@@ -137,17 +126,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(mls_coefficients, DeviceType, ARBORX_DEVICE_TYPES)
 BOOST_AUTO_TEST_CASE_TEMPLATE(mls_coefficients_edge_cases, DeviceType,
                               ARBORX_DEVICE_TYPES)
 {
-  // FIXME_HIP: the CI fails with:
-  // fatal error: in "mls_coefficients_edge_cases<Kokkos__Device<Kokkos__HIP_
-  // Kokkos__HIPSpace>>": std::runtime_error: Kokkos::Impl::ParallelFor/Reduce<
-  // HIP > could not find a valid team size.
-  // The error seems similar to https://github.com/kokkos/kokkos/issues/6743
-#ifdef KOKKOS_ENABLE_HIP
-  if (std::is_same_v<typename DeviceType::execution_space, Kokkos::HIP>)
-  {
-    return;
-  }
-#endif
   using ExecutionSpace = typename DeviceType::execution_space;
   using MemorySpace = typename DeviceType::memory_space;
   ExecutionSpace space{};
diff --git a/test/tstInterpMovingLeastSquares.cpp b/test/tstInterpMovingLeastSquares.cpp
index ca413c154..ceee3e7b4 100644
--- a/test/tstInterpMovingLeastSquares.cpp
+++ b/test/tstInterpMovingLeastSquares.cpp
@@ -21,18 +21,6 @@
 BOOST_AUTO_TEST_CASE_TEMPLATE(moving_least_squares, DeviceType,
                               ARBORX_DEVICE_TYPES)
 {
-  // FIXME_HIP: the CI fails with:
-  // fatal error: in "mls_coefficients_edge_cases<Kokkos__Device<Kokkos__HIP_
-  // Kokkos__HIPSpace>>": std::runtime_error: Kokkos::Impl::ParallelFor/Reduce<
-  // HIP > could not find a valid team size.
-  // The error seems similar to https://github.com/kokkos/kokkos/issues/6743
-#ifdef KOKKOS_ENABLE_HIP
-  if (std::is_same_v<typename DeviceType::execution_space, Kokkos::HIP>)
-  {
-    return;
-  }
-#endif
-
   using ExecutionSpace = typename DeviceType::execution_space;
   using MemorySpace = typename DeviceType::memory_space;
   ExecutionSpace space{};
@@ -111,18 +99,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(moving_least_squares, DeviceType,
 BOOST_AUTO_TEST_CASE_TEMPLATE(moving_least_squares_edge_cases, DeviceType,
                               ARBORX_DEVICE_TYPES)
 {
-  // FIXME_HIP: the CI fails with:
-  // fatal error: in "mls_coefficients_edge_cases<Kokkos__Device<Kokkos__HIP_
-  // Kokkos__HIPSpace>>": std::runtime_error: Kokkos::Impl::ParallelFor/Reduce<
-  // HIP > could not find a valid team size.
-  // The error seems similar to https://github.com/kokkos/kokkos/issues/6743
-#ifdef KOKKOS_ENABLE_HIP
-  if (std::is_same_v<typename DeviceType::execution_space, Kokkos::HIP>)
-  {
-    return;
-  }
-#endif
-
   using ExecutionSpace = typename DeviceType::execution_space;
   using MemorySpace = typename DeviceType::memory_space;
   ExecutionSpace space{};