From aee95ea520902a01c1eb9f8949a8e7943c0dbcf5 Mon Sep 17 00:00:00 2001
From: nychiang <sorakid507@gmail.com>
Date: Wed, 30 Sep 2026 02:17:12 -0700
Subject: [PATCH] Fix CUDA profiling with NVTX3

---
 cmake/ReSolveFindCudaLibraries.cmake | 7 ++++++-
 resolve/Profiling.hpp                | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cmake/ReSolveFindCudaLibraries.cmake b/cmake/ReSolveFindCudaLibraries.cmake
index e03ea264a..db0aa8288 100644
--- a/cmake/ReSolveFindCudaLibraries.cmake
+++ b/cmake/ReSolveFindCudaLibraries.cmake
@@ -15,7 +15,12 @@ if(RESOLVE_USE_CUDSS)
 endif()
 
 if(RESOLVE_USE_PROFILING)
-  target_link_libraries(resolve_cuda INTERFACE CUDA::nvToolsExt)
+  if(TARGET CUDA::nvtx3)
+    target_link_libraries(resolve_cuda INTERFACE CUDA::nvtx3)
+    target_compile_definitions(resolve_cuda INTERFACE RESOLVE_USE_NVTX3)
+  else()
+    target_link_libraries(resolve_cuda INTERFACE CUDA::nvToolsExt)
+  endif()
 endif()
 
 install(TARGETS resolve_cuda EXPORT ReSolveTargets)
diff --git a/resolve/Profiling.hpp b/resolve/Profiling.hpp
index 6765d5ba9..d83a1b94f 100644
--- a/resolve/Profiling.hpp
+++ b/resolve/Profiling.hpp
@@ -12,7 +12,11 @@
 #endif // RESOLVE_USE_HIP
 
 #ifdef RESOLVE_USE_CUDA
+#ifdef RESOLVE_USE_NVTX3
+#include <nvtx3/nvToolsExt.h>
+#else
 #include <nvToolsExt.h>
+#endif // RESOLVE_USE_NVTX3
 #define RESOLVE_RANGE_PUSH(x) nvtxRangePush(x)
 #define RESOLVE_RANGE_POP(x) \
   nvtxRangePop();            \