Merge pull request kokkos#290 from uliegecsm/nvtx3

update(`nvtx-connector`): use `nvtx3`

Author: dalg24

.github/workflows/build-with-kokkos.yml

@@ -16,7 +16,7 @@ jobs:
           - image: nvidia/cuda:12.1.0-devel-ubuntu22.04
             preset: Cuda
             compiler: default
-          - image: nvidia/cuda:12.2.0-devel-ubuntu22.04
+          - image: nvidia/cuda:12.9.0-devel-ubuntu22.04
             preset: Cuda
             compiler: {cpp: g++-12, c: gcc-12}
           - image: rocm/dev-ubuntu-22.04:5.4

profiling/nvtx-connector/CMakeLists.txt

@@ -1,4 +1,11 @@
 find_package(CUDAToolkit REQUIRED)
 kp_add_library(kp_nvtx_connector kp_nvtx_connector.cpp)
 
-target_link_libraries(kp_nvtx_connector CUDA::nvToolsExt)
+# Fallback since the imported target CUDA::nvtx3 is defined only as of CMake 3.25.
+if(NOT TARGET CUDA::nvtx3)
+    add_library(CUDA::nvtx3 INTERFACE IMPORTED)
+    target_include_directories(CUDA::nvtx3 INTERFACE "${CUDAToolkit_INCLUDE_DIRS}")
+    target_link_libraries(CUDA::nvtx3 INTERFACE ${CMAKE_DL_LIBS})
+endif()
+
+target_link_libraries(kp_nvtx_connector CUDA::nvtx3)

profiling/nvtx-connector/kp_nvtx_connector.cpp

@@ -22,7 +22,7 @@
 
 #include <pthread.h>
 
-#include "nvToolsExt.h"
+#include "nvtx3/nvToolsExt.h"
 
 #include "kp_core.hpp"
 

profiling/nvtx-focused-connector/CMakeLists.txt

@@ -1,4 +1,11 @@
 find_package(CUDAToolkit REQUIRED)
 kp_add_library(kp_nvtx_focused_connector kp_nvtx_focused_connector.cpp)
 
-target_link_libraries(kp_nvtx_focused_connector CUDA::nvToolsExt)
+# Fallback since the imported target CUDA::nvtx3 is defined only as of CMake 3.25.
+if(NOT TARGET CUDA::nvtx3)
+    add_library(CUDA::nvtx3 INTERFACE IMPORTED)
+    target_include_directories(CUDA::nvtx3 INTERFACE "${CUDAToolkit_INCLUDE_DIRS}")
+    target_link_libraries(CUDA::nvtx3 INTERFACE ${CMAKE_DL_LIBS})
+endif()
+
+target_link_libraries(kp_nvtx_focused_connector CUDA::nvtx3)

profiling/nvtx-focused-connector/kp_nvtx_focused_connector.cpp

@@ -27,7 +27,7 @@
 
 #include "kp_nvtx_focused_connector_domain.h"
 
-#include "nvToolsExt.h"
+#include "nvtx3/nvToolsExt.h"
 
 #include "kp_core.hpp"
 

profiling/nvtx-focused-connector/kp_nvtx_focused_connector_domain.h

@@ -21,7 +21,7 @@
 #include <sys/time.h>
 #include <cstring>
 
-#include "nvToolsExt.h"
+#include "nvtx3/nvToolsExt.h"
 
 namespace KokkosTools {
 namespace NVTXFocusedConnector {