guard native kernel naming capability

LLNL · Dec 29, 2024 · b58b4c9 · b58b4c9
1 parent 272b8fc
commit b58b4c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/RAJA/policy/cuda/params/kernel_name.hpp b/include/RAJA/policy/cuda/params/kernel_name.hpp
@@ -16,7 +16,7 @@ namespace detail {
   camp::concepts::enable_if< type_traits::is_cuda_policy<EXEC_POL> >
   init(KernelName& kn, const RAJA::cuda::detail::cudaInfo &)
   {
-#if defined(RAJA_ENABLE_NV_TOOLS_EXT)
+#if defined(RAJA_ENABLE_NV_TOOLS_EXT) && !defined(RAJA_ENABLE_CALIPER)
     nvtxRangePush(kn.name);
 #else
     RAJA_UNUSED_VAR(kn);
@@ -34,7 +34,7 @@ namespace detail {
   camp::concepts::enable_if< type_traits::is_cuda_policy<EXEC_POL> >
   resolve(KernelName&, const RAJA::cuda::detail::cudaInfo &)
   {
-#if defined(RAJA_ENABLE_NV_TOOLS_EXT)
+#if defined(RAJA_ENABLE_NV_TOOLS_EXT) && !defined(RAJA_ENABLE_CALIPER)
     nvtxRangePop();
 #endif
   }

diff --git a/include/RAJA/policy/hip/params/kernel_name.hpp b/include/RAJA/policy/hip/params/kernel_name.hpp
@@ -20,7 +20,7 @@ namespace detail {
   camp::concepts::enable_if< type_traits::is_hip_policy<EXEC_POL> >
   init(KernelName& kn, const RAJA::hip::detail::hipInfo &)
   {
-#if defined(RAJA_ENABLE_ROCTX)
+#if defined(RAJA_ENABLE_ROCTX) && !defined(RAJA_ENABLE_CALIPER)
     roctxRangePush(kn.name);
 #else
     RAJA_UNUSED_VAR(kn);
@@ -38,7 +38,7 @@ namespace detail {
   camp::concepts::enable_if< type_traits::is_hip_policy<EXEC_POL> >
   resolve(KernelName&, const RAJA::hip::detail::hipInfo &)
   {
-#if defined(RAJA_ENABLE_ROCTX)
+#if defined(RAJA_ENABLE_ROCTX) && !defined(RAJA_ENABLE_CALIPER)
     roctxRangePop();
 #endif
   }