Skip to content

Commit

Permalink
Rather guard for Kokkos 4.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
masterleinad committed Oct 12, 2023
1 parent 3e3655f commit b64a608
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions benchmarks/dbscan/ArborX_DBSCANVerification.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ bool verifyCorePointsNonnegativeIndex(ExecutionSpace const &exec_space,
bool self_is_core_point = (offset(i + 1) - offset(i) >= core_min_size);
if (self_is_core_point && labels(i) < 0)
{
#if KOKKOS_VERSION >= 40199
#if KOKKOS_VERSION >= 40200
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
Expand Down Expand Up @@ -84,7 +84,7 @@ bool verifyConnectedCorePointsShareIndex(ExecutionSpace const &exec_space,

if (neigh_is_core_point && labels(i) != labels(j))
{
#if KOKKOS_VERSION >= 40199
#if KOKKOS_VERSION >= 40200
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
Expand Down Expand Up @@ -138,7 +138,7 @@ bool verifyBorderAndNoisePoints(ExecutionSpace const &exec_space,
}
}

#if KOKKOS_VERSION >= 40199
#if KOKKOS_VERSION >= 40200
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
Expand Down
8 changes: 4 additions & 4 deletions examples/callback/example_callback.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct PrintfCallback
KOKKOS_FUNCTION void operator()(Predicate, int primitive,
OutputFunctor const &out) const
{
#if KOKKOS_VERSION >= 40199
#if KOKKOS_VERSION >= 40200
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
Expand Down Expand Up @@ -97,7 +97,7 @@ int main(int argc, char *argv[])
bvh, ExecutionSpace{}, FirstOctant{},
KOKKOS_LAMBDA(auto /*predicate*/, int primitive,
auto /*output_functor*/) {
#if KOKKOS_VERSION >= 40199
#if KOKKOS_VERSION >= 40200
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
Expand All @@ -119,7 +119,7 @@ int main(int argc, char *argv[])
bvh, ExecutionSpace{}, NearestToOrigin{k},
KOKKOS_LAMBDA(auto /*predicate*/, int primitive,
auto /*output_functor*/) {
#if KOKKOS_VERSION >= 40199
#if KOKKOS_VERSION >= 40200
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
Expand All @@ -139,7 +139,7 @@ int main(int argc, char *argv[])
bvh.query(
ExecutionSpace{}, FirstOctant{},
KOKKOS_LAMBDA(auto /*predicate*/, int j) {
#if KOKKOS_VERSION >= 40199
#if KOKKOS_VERSION >= 40200
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
Expand Down
2 changes: 1 addition & 1 deletion examples/raytracing/example_raytracing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ int main(int argc, char *argv[])
fabs(energy_intersects(i));
if (abs_error > rel_tol * fabs(energy_intersects(i)))
{
#if KOKKOS_VERSION >= 40199
#if KOKKOS_VERSION >= 40200
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
Expand Down
2 changes: 1 addition & 1 deletion examples/triangle_intersection/triangle_intersection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ int main()
KOKKOS_LAMBDA(int i, bool &update) {
constexpr float eps = 1.e-3;

#if KOKKOS_VERSION >= 40199
#if KOKKOS_VERSION >= 40200
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
Expand Down

0 comments on commit b64a608

Please sign in to comment.