Merge 4f17c8d081 into 3f3661a86f

Merge branch 'paboyle:develop' into bugfix/nvtx
Reverting to older version of nvtx for Tursa support
2025-12-05 22:04:40 +00:00 · 2025-01-29 13:11:15 +00:00 · 2025-01-29 13:10:12 +00:00 · 2025-01-29 12:57:38 +00:00
2 changed files with 2 additions and 1 deletions
--- a/Grid/perfmon/Tracing.h
+++ b/Grid/perfmon/Tracing.h
@@ -3,7 +3,7 @@
 NAMESPACE_BEGIN(Grid);
 #ifdef GRID_TRACING_NVTX
-#include <nvtx3/nvToolsExt.h>
+#include <nvToolsExt.h>
 class GridTracer {
 public:
  GridTracer(const char* name) {
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,7 @@ AC_ARG_ENABLE([tracing],
 case ${ac_TRACING} in
    nvtx)
        AC_DEFINE([GRID_TRACING_NVTX],[1],[use NVTX])
 	LIBS="${LIBS} -lnvToolsExt"
 	;;
    roctx)
        AC_DEFINE([GRID_TRACING_ROCTX],[1],[use ROCTX])
Author	SHA1	Message	Date
Mashy Green	fc53f29e18	Merge `4f17c8d081` into `3f3661a86f`	2025-01-29 13:11:15 +00:00
Mashy Green	4f17c8d081	Merge branch 'paboyle:develop' into bugfix/nvtx	2025-01-29 13:10:12 +00:00
Mashy Green	aaab753982	Reverting to older version of nvtx for Tursa support	2025-01-29 12:57:38 +00:00