Merge branch 'main' into docs/refactor

ROCm · Jun 18, 2024 · 9720cda · 9720cda
2 parents 197f03d + f9ae806
commit 9720cda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git 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
 

diff --git a/source/lib/core/gpu.cpp b/source/lib/core/gpu.cpp
@@ -51,17 +51,6 @@
 #if OMNITRACE_USE_HIP > 0
 #    include <timemory/components/hip/backends.hpp>
 
-static_assert(OMNITRACE_HIP_VERSION_MAJOR == HIP_VERSION_MAJOR,
-              "OMNITRACE_HIP_VERSION_MAJOR (detected by cmake) != HIP_VERSION_MAJOR "
-              "(from <hip/hip_version.h>)");
-
-#    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 <hip/hip_version.h>)");
-#    endif
-
 #    if !defined(OMNITRACE_HIP_RUNTIME_CALL)
 #        define OMNITRACE_HIP_RUNTIME_CALL(err)                                          \
             {                                                                            \