Skip to content

Cleanup some old FIXMEs #1333

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

Merged
aprokop merged 3 commits into from
Mar 6, 2026
Merged

Cleanup some old FIXMEs #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
533141c
Remove a workaround in Vector for pre-hyper point
aprokop Mar 5, 2026
944993b
Experimental::SYCL -> SYCL
aprokop Mar 5, 2026
a8b102b
Remove older Intel compiler workaround
aprokop Mar 5, 2026
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
3 changes: 1 addition & 2 deletions benchmarks/bvh_driver/bvh_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ void register_bvh_benchmarks(Spec const &spec)

#ifdef KOKKOS_ENABLE_SYCL
if (spec.backends == "all" || spec.backends == "sycl")
BVHBenchmarkRegistration<Kokkos::Experimental::SYCL>(spec,
"ArborX::BVH<SYCL>");
BVHBenchmarkRegistration<Kokkos::SYCL>(spec, "ArborX::BVH<SYCL>");
#else
if (spec.backends == "sycl")
throw std::runtime_error("SYCL backend not available!");
Expand Down
3 changes: 1 addition & 2 deletions src/kokkos_ext/ArborX_KokkosExtSort.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@ void sortByKey(

#if defined(KOKKOS_ENABLE_SYCL) && defined(ARBORX_ENABLE_ONEDPL)
template <typename Keys, typename Values>
void sortByKey(Kokkos::Experimental::SYCL const &space, Keys &keys,
Values &values)
void sortByKey(Kokkos::SYCL const &space, Keys &keys, Values &values)
{
Kokkos::Profiling::ScopedRegion guard("ArborX::KokkosExt::sortByKey::OneDPL");

Expand Down
11 changes: 3 additions & 8 deletions src/misc/ArborX_Vector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,13 @@ Vector(T, U...) -> Vector<1 + sizeof...(U), T>;

} // namespace ArborX::Details

// FIXME: remove second template argument when ExperimentalHyperGeometry switch
// happens
template <typename Point, typename Point2,
typename Enable =
std::enable_if_t<ArborX::GeometryTraits::is_point_v<Point> &&
ArborX::GeometryTraits::is_point_v<Point2>>>
template <typename Point>
requires(ArborX::GeometryTraits::is_point_v<Point>)
KOKKOS_INLINE_FUNCTION constexpr auto operator-(Point const &end,
Point2 const &begin)
Point const &begin)
{
namespace GT = ArborX::GeometryTraits;
constexpr int DIM = GT::dimension_v<Point>;
static_assert(GT::dimension_v<Point2> == DIM);
ArborX::Details::Vector<DIM, GT::coordinate_type_t<Point>> v;
for (int d = 0; d < DIM; ++d)
v[d] = end[d] - begin[d];
Expand Down
5 changes: 0 additions & 5 deletions test/ArborXTest_LegacyTree.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ class LegacyValues
expand(bounding_volume, Access::get(_primitives, i));
return value_type{bounding_volume, (index_type)i};
}
#if defined(KOKKOS_COMPILER_INTEL) && (KOKKOS_COMPILER_INTEL <= 2021)
// FIXME_INTEL: workaround for spurious "missing return
// statement at end of non-void function" warning
return value_type{};
#endif
}

KOKKOS_FUNCTION
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if(Kokkos_ENABLE_HIP)
list(APPEND ARBORX_DEVICE_TYPES Kokkos::HIPSpace::device_type)
endif()
if(Kokkos_ENABLE_SYCL)
list(APPEND ARBORX_DEVICE_TYPES Kokkos::Experimental::SYCL::device_type)
list(APPEND ARBORX_DEVICE_TYPES Kokkos::SYCL::device_type)
endif()

string(REPLACE ";" "," ARBORX_DEVICE_TYPES "${ARBORX_DEVICE_TYPES}")
Expand Down
2 changes: 1 addition & 1 deletion test/tstMinimumSpanningTreeGoldenTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(minimum_spanning_tree_golden_test, DeviceType,
double tol = 1.e-8;
// FIXME_SYCL
#ifdef KOKKOS_ENABLE_SYCL
if constexpr (std::is_same_v<ExecutionSpace, Kokkos::Experimental::SYCL>)
if constexpr (std::is_same_v<ExecutionSpace, Kokkos::SYCL>)
tol = 1.e-7;
#endif
BOOST_TEST(total_weight[5] == ref_total_weight[5], tt::tolerance(tol));
Expand Down