Skip to content
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

Use Kokkos::printf for Kokkos >= 4.2.00 #958

Merged
merged 2 commits into from
Oct 14, 2023
Merged

Use Kokkos::printf for Kokkos >= 4.2.00 #958

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e3655f
Use Kokkos::printf for Kokkos >= 4.1.99
masterleinad Oct 12, 2023
b64a608
Rather guard for Kokkos 4.2.0
masterleinad Oct 12, 2023
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
20 changes: 12 additions & 8 deletions benchmarks/dbscan/ArborX_DBSCANVerification.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ 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)
{
#ifdef __SYCL_DEVICE_ONLY__
#if KOKKOS_VERSION >= 40199
dalg24 marked this conversation as resolved.
Show resolved Hide resolved
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
#endif
printf("Core point is marked as noise: %d [%d]\n", i, labels(i));
Expand Down Expand Up @@ -82,7 +84,9 @@ bool verifyConnectedCorePointsShareIndex(ExecutionSpace const &exec_space,

if (neigh_is_core_point && labels(i) != labels(j))
{
#ifdef __SYCL_DEVICE_ONLY__
#if KOKKOS_VERSION >= 40199
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
#endif
printf("Connected cores do not belong to the same cluster: "
Expand Down Expand Up @@ -134,22 +138,22 @@ bool verifyBorderAndNoisePoints(ExecutionSpace const &exec_space,
}
}

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

// Border point must be connected to a core point
if (is_border && !have_shared_core)
{
#ifdef __SYCL_DEVICE_ONLY__
using sycl::ext::oneapi::experimental::printf;
#endif
printf("Border point does not belong to a cluster: %d [%d]\n", i,
labels(i));
update++;
}
// Noise points must have index -1
if (!is_border && labels(i) != -1)
{
#ifdef __SYCL_DEVICE_ONLY__
using sycl::ext::oneapi::experimental::printf;
#endif
printf("Noise point does not have index -1: %d [%d]\n", i,
labels(i));
update++;
Expand Down
16 changes: 12 additions & 4 deletions examples/callback/example_callback.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ struct PrintfCallback
KOKKOS_FUNCTION void operator()(Predicate, int primitive,
OutputFunctor const &out) const
{
#ifdef __SYCL_DEVICE_ONLY__
#if KOKKOS_VERSION >= 40199
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
#endif
printf("Found %d from functor\n", primitive);
Expand Down Expand Up @@ -95,7 +97,9 @@ int main(int argc, char *argv[])
bvh, ExecutionSpace{}, FirstOctant{},
KOKKOS_LAMBDA(auto /*predicate*/, int primitive,
auto /*output_functor*/) {
#ifdef __SYCL_DEVICE_ONLY__
#if KOKKOS_VERSION >= 40199
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
#endif
printf("Found %d from generic lambda\n", primitive);
Expand All @@ -115,7 +119,9 @@ int main(int argc, char *argv[])
bvh, ExecutionSpace{}, NearestToOrigin{k},
KOKKOS_LAMBDA(auto /*predicate*/, int primitive,
auto /*output_functor*/) {
#ifdef __SYCL_DEVICE_ONLY__
#if KOKKOS_VERSION >= 40199
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
#endif
printf("Found %d from generic lambda\n", primitive);
Expand All @@ -133,7 +139,9 @@ int main(int argc, char *argv[])
bvh.query(
ExecutionSpace{}, FirstOctant{},
KOKKOS_LAMBDA(auto /*predicate*/, int j) {
#ifdef __SYCL_DEVICE_ONLY__
#if KOKKOS_VERSION >= 40199
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
#endif
printf("%d %d %d\n", ++c(), -1, j);
Expand Down
7 changes: 5 additions & 2 deletions examples/raytracing/example_raytracing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,11 +406,14 @@ int main(int argc, char *argv[])
fabs(energy_intersects(i));
if (abs_error > rel_tol * fabs(energy_intersects(i)))
{
#ifndef KOKKOS_ENABLE_SYCL
#if KOKKOS_VERSION >= 40199
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
#endif
printf("%d: %f != %f, relative error: %f\n", i,
energy_ordered_intersects(i), energy_intersects(i),
abs_error / fabs(energy_intersects(i)));
#endif
++error;
}
},
Expand Down
11 changes: 5 additions & 6 deletions examples/triangle_intersection/triangle_intersection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,12 +345,14 @@ int main()
KOKKOS_LAMBDA(int i, bool &update) {
constexpr float eps = 1.e-3;

#if KOKKOS_VERSION >= 40199
using Kokkos::printf;
#elif defined(__SYCL_DEVICE_ONLY__)
using sycl::ext::oneapi::experimental::printf;
#endif
if (offsets(i) != i)
{
// FIXME_SYCL doesn't support printf
#ifndef KOKKOS_ENABLE_SYCL
printf("Offsets are wrong for query %d.\n", i);
#endif
update = false;
}
auto const &c = coefficients(i);
Expand All @@ -361,10 +363,7 @@ int main()
if ((Kokkos::abs(p[0] - p_ref[0]) > eps) ||
Kokkos::abs(p[1] - p_ref[1]) > eps)
{
// FIXME_SYCL doesn't support printf
#ifndef KOKKOS_ENABLE_SYCL
printf("Coefficients are wrong for query %d.\n", i);
#endif
update = false;
}
},
Expand Down