From 74ed76529aa8d4d94ed497a8dd54d31eb0476aa0 Mon Sep 17 00:00:00 2001 From: ajanicijamd Date: Fri, 14 Jun 2024 16:50:25 -0400 Subject: [PATCH 1/2] =?UTF-8?q?Changed=20macros=20verbprintf=20and=20verbp?= =?UTF-8?q?rintf=5Fbare=20so=20they=20write=20to=20stdout=E2=80=A6=20(#346?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flush stdout when listing keys + bump verbose level for GPU count --- source/bin/omnitrace-avail/avail.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/bin/omnitrace-avail/avail.cpp b/source/bin/omnitrace-avail/avail.cpp index 53031f2f4..5fe5c446f 100644 --- a/source/bin/omnitrace-avail/avail.cpp +++ b/source/bin/omnitrace-avail/avail.cpp @@ -338,7 +338,7 @@ main(int argc, char** argv) << itr.description << "\n"; } } - std::cout << _msg.str(); + std::cout << _msg.str() << std::flush; } }); parser @@ -521,12 +521,12 @@ main(int argc, char** argv) { verbprintf(0, "Retrieving the GPU HW counters failed: %s", _e.what()); } - verbprintf(0, "Found %i HIP devices and %zu GPU HW counters\n", gpu_count, + verbprintf(1, "Found %i HIP devices and %zu GPU HW counters\n", gpu_count, _num_metrics); } else { - verbprintf(0, "No HIP devices found. GPU HW counters will not be available\n"); + verbprintf(1, "No HIP devices found. GPU HW counters will not be available\n"); } #endif From f9ae806b788044ab38131b443cff2f6ddae0c1c3 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Sat, 15 Jun 2024 03:03:08 -0400 Subject: [PATCH 2/2] Removing static version asserts. (#347) It is causing failures on our internal builds Signed-off-by: David Galiffi --- source/lib/core/gpu.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/source/lib/core/gpu.cpp b/source/lib/core/gpu.cpp index ffd848a7b..d56dc7bbd 100644 --- a/source/lib/core/gpu.cpp +++ b/source/lib/core/gpu.cpp @@ -51,17 +51,6 @@ #if OMNITRACE_USE_HIP > 0 # include -static_assert(OMNITRACE_HIP_VERSION_MAJOR == HIP_VERSION_MAJOR, - "OMNITRACE_HIP_VERSION_MAJOR (detected by cmake) != HIP_VERSION_MAJOR " - "(from )"); - -# if OMNITRACE_HIP_VERSION_MAJOR >= 5 -// HIP versions 4.x and older have unreliable values for HIP_VERSION_MINOR -static_assert(OMNITRACE_HIP_VERSION_MINOR == HIP_VERSION_MINOR, - "OMNITRACE_HIP_VERSION_MINOR (detected by cmake) != HIP_VERSION_MINOR " - "(from )"); -# endif - # if !defined(OMNITRACE_HIP_RUNTIME_CALL) # define OMNITRACE_HIP_RUNTIME_CALL(err) \ { \