Program against explicitly versioned NVTX API

The explicit API is always available. Fixes: #1750
NVIDIA · May 16, 2024 · 06de31f · 06de31f
1 parent 1064352
commit 06de31f
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/cub/cub/detail/nvtx.cuh b/cub/cub/detail/nvtx.cuh
@@ -70,14 +70,15 @@ CUB_NAMESPACE_END
 // nothing in device code.
 // The optional is needed to defer the construction of an NVTX range (host-only code) and message string registration
 // into a dispatch region running only on the host, while preserving the semantic scope where the range is declared.
-#  define CUB_DETAIL_NVTX_RANGE_SCOPE_IF(condition, name)                                                               \
-    CUB_DETAIL_BEFORE_NVTX_RANGE_SCOPE(name)                                                                            \
-    ::cuda::std::optional<::nvtx3::scoped_range_in<CUB_NS_QUALIFIER::detail::NVTXCCCLDomain>> __cub_nvtx3_range;        \
-    NV_IF_TARGET(                                                                                                       \
-      NV_IS_HOST,                                                                                                       \
-      static const ::nvtx3::registered_string_in<CUB_NS_QUALIFIER::detail::NVTXCCCLDomain> __cub_nvtx3_func_name{name}; \
-      static const ::nvtx3::event_attributes __cub_nvtx3_func_attr{__cub_nvtx3_func_name};                              \
-      if (condition) __cub_nvtx3_range.emplace(__cub_nvtx3_func_attr);                                                  \
+#  define CUB_DETAIL_NVTX_RANGE_SCOPE_IF(condition, name)                                                             \
+    CUB_DETAIL_BEFORE_NVTX_RANGE_SCOPE(name)                                                                          \
+    ::cuda::std::optional<::nvtx3::v1::scoped_range_in<CUB_NS_QUALIFIER::detail::NVTXCCCLDomain>> __cub_nvtx3_range;  \
+    NV_IF_TARGET(                                                                                                     \
+      NV_IS_HOST,                                                                                                     \
+      static const ::nvtx3::v1::registered_string_in<CUB_NS_QUALIFIER::detail::NVTXCCCLDomain> __cub_nvtx3_func_name{ \
+        name};                                                                                                        \
+      static const ::nvtx3::v1::event_attributes __cub_nvtx3_func_attr{__cub_nvtx3_func_name};                        \
+      if (condition) __cub_nvtx3_range.emplace(__cub_nvtx3_func_attr);                                                \
       (void) __cub_nvtx3_range;)
 
 #  define CUB_DETAIL_NVTX_RANGE_SCOPE(name) CUB_DETAIL_NVTX_RANGE_SCOPE_IF(true, name)