Use Kokkos::printf unconditionally

aprokop · Apr 9, 2024 · 423b0af · 423b0af
1 parent c24b152
commit 423b0af
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 56 deletions.
diff --git a/benchmarks/dbscan/ArborX_DBSCANVerification.hpp b/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
@@ -45,12 +45,8 @@ 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 >= 40200
-          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));
+          Kokkos::printf("Core point is marked as noise: %d [%d]\n", i,
+                         labels(i));
           update++;
         }
       },
@@ -83,14 +79,10 @@ bool verifyConnectedCorePointsShareIndex(ExecutionSpace const &exec_space,
 
             if (neigh_is_core_point && labels(i) != labels(j))
             {
-#if KOKKOS_VERSION >= 40200
-              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: "
-                     "%d [%d] -> %d [%d]\n",
-                     i, labels(i), j, labels(j));
+              Kokkos::printf(
+                  "Connected cores do not belong to the same cluster: "
+                  "%d [%d] -> %d [%d]\n",
+                  i, labels(i), j, labels(j));
               update++;
             }
           }
@@ -137,24 +129,19 @@ bool verifyBorderAndNoisePoints(ExecutionSpace const &exec_space,
             }
           }
 
-#if KOKKOS_VERSION >= 40200
-          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)
           {
-            printf("Border point does not belong to a cluster: %d [%d]\n", i,
-                   labels(i));
+            Kokkos::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)
           {
-            printf("Noise point does not have index -1: %d [%d]\n", i,
-                   labels(i));
+            Kokkos::printf("Noise point does not have index -1: %d [%d]\n", i,
+                           labels(i));
             update++;
           }
         }

diff --git a/examples/callback/example_callback.cpp b/examples/callback/example_callback.cpp
@@ -56,12 +56,7 @@ struct PrintfCallback
   KOKKOS_FUNCTION void operator()(Predicate, int primitive,
                                   OutputFunctor const &out) const
   {
-#if KOKKOS_VERSION >= 40200
-    using Kokkos::printf;
-#elif defined(__SYCL_DEVICE_ONLY__)
-    using sycl::ext::oneapi::experimental::printf;
-#endif
-    printf("Found %d from functor\n", primitive);
+    Kokkos::printf("Found %d from functor\n", primitive);
     out(primitive);
   }
 };
@@ -97,12 +92,7 @@ int main(int argc, char *argv[])
         bvh, ExecutionSpace{}, FirstOctant{},
         KOKKOS_LAMBDA(auto /*predicate*/, int primitive,
                       auto /*output_functor*/) {
-#if KOKKOS_VERSION >= 40200
-          using Kokkos::printf;
-#elif defined(__SYCL_DEVICE_ONLY__)
-          using sycl::ext::oneapi::experimental::printf;
-#endif
-          printf("Found %d from generic lambda\n", primitive);
+          Kokkos::printf("Found %d from generic lambda\n", primitive);
         },
         values, offsets);
 #endif
@@ -119,12 +109,7 @@ int main(int argc, char *argv[])
         bvh, ExecutionSpace{}, NearestToOrigin{k},
         KOKKOS_LAMBDA(auto /*predicate*/, int primitive,
                       auto /*output_functor*/) {
-#if KOKKOS_VERSION >= 40200
-          using Kokkos::printf;
-#elif defined(__SYCL_DEVICE_ONLY__)
-          using sycl::ext::oneapi::experimental::printf;
-#endif
-          printf("Found %d from generic lambda\n", primitive);
+          Kokkos::printf("Found %d from generic lambda\n", primitive);
         },
         values, offsets);
 #endif
@@ -139,12 +124,7 @@ int main(int argc, char *argv[])
     bvh.query(
         ExecutionSpace{}, FirstOctant{},
         KOKKOS_LAMBDA(auto /*predicate*/, int j) {
-#if KOKKOS_VERSION >= 40200
-          using Kokkos::printf;
-#elif defined(__SYCL_DEVICE_ONLY__)
-          using sycl::ext::oneapi::experimental::printf;
-#endif
-          printf("%d %d %d\n", ++c(), -1, j);
+          Kokkos::printf("%d %d %d\n", ++c(), -1, j);
         });
 #endif
   }

diff --git a/examples/raytracing/example_raytracing.cpp b/examples/raytracing/example_raytracing.cpp
@@ -381,14 +381,9 @@ int main(int argc, char *argv[])
             fabs(energy_intersects(i));
         if (abs_error > rel_tol * fabs(energy_intersects(i)))
         {
-#if KOKKOS_VERSION >= 40200
-          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)));
+          Kokkos::printf("%d: %f != %f, relative error: %f\n", i,
+                         energy_ordered_intersects(i), energy_intersects(i),
+                         abs_error / fabs(energy_intersects(i)));
           ++error;
         }
       },