From 00315e1e2f9d2e61d1f460aa901c2d7843575317 Mon Sep 17 00:00:00 2001
From: "Jonathan R. Madsen" <jrmadsen@users.noreply.github.com>
Date: Mon, 2 May 2022 13:08:51 -0500
Subject: [PATCH] Reorganize source/lib/omnitrace (#51)

- Got rid of `source/lib/omnitrace/include` and `source/lib/omnitrace/src` and merged into `source/lib/omnitrace`
- Updated perfetto submodule to v25.0
- Updated papi submodule

[ROCm/rocprofiler-systems commit: 1f66e23fdd8a17266d9a6e30b3afab55cb2b8542]
---
 .../rocprofiler-systems/cmake/Packages.cmake  |   6 +-
 projects/rocprofiler-systems/external/papi    |   2 +-
 .../rocprofiler-systems/external/perfetto     |   2 +-
 .../source/lib/omnitrace/CMakeLists.txt       | 114 +++++++++---------
 .../lib/omnitrace/{src => }/library.cpp       |   0
 .../lib/omnitrace/{include => }/library.hpp   |   0
 .../lib/omnitrace/{src => }/library/api.cpp   |   0
 .../omnitrace/{include => }/library/api.hpp   |   0
 .../{include => }/library/common.hpp          |   0
 .../library/components/backtrace.cpp          |   0
 .../library/components/backtrace.hpp          |   0
 .../library/components/fork_gotcha.cpp        |   0
 .../library/components/fork_gotcha.hpp        |   0
 .../library/components/functors.hpp           |   0
 .../{include => }/library/components/fwd.hpp  |   0
 .../library/components/mpi_gotcha.cpp         |   0
 .../library/components/mpi_gotcha.hpp         |   0
 .../library/components/omnitrace.cpp          |   0
 .../library/components/omnitrace.hpp          |   0
 .../library/components/pthread_gotcha.cpp     |   0
 .../library/components/pthread_gotcha.hpp     |   0
 .../{src => }/library/components/rocm_smi.cpp |   0
 .../library/components/rocm_smi.hpp           |   0
 .../library/components/roctracer.cpp          |   0
 .../library/components/roctracer.hpp          |   0
 .../components/roctracer_callbacks.cpp        |   0
 .../components/roctracer_callbacks.hpp        |   0
 .../library/components/user_region.cpp        |   0
 .../library/components/user_region.hpp        |   0
 .../omnitrace/{src => }/library/config.cpp    |   0
 .../{include => }/library/config.hpp          |   0
 .../omnitrace/{src => }/library/coverage.cpp  |   0
 .../{include => }/library/coverage.hpp        |   0
 .../omnitrace/{src => }/library/cpu_freq.cpp  |   0
 .../{include => }/library/cpu_freq.hpp        |   0
 .../{src => }/library/critical_trace.cpp      |   0
 .../{include => }/library/critical_trace.hpp  |   0
 .../omnitrace/{include => }/library/debug.hpp |   0
 .../{include => }/library/defines.hpp.in      |   0
 .../{include => }/library/dynamic_library.hpp |   0
 .../lib/omnitrace/{src => }/library/gpu.cpp   |   0
 .../omnitrace/{include => }/library/gpu.hpp   |   0
 .../omnitrace/{src => }/library/kokkosp.cpp   |   0
 .../lib/omnitrace/{src => }/library/ompt.cpp  |   0
 .../omnitrace/{include => }/library/ompt.hpp  |   0
 .../omnitrace/{src => }/library/perfetto.cpp  |   0
 .../{include => }/library/perfetto.hpp        |   0
 .../lib/omnitrace/{src => }/library/ptl.cpp   |   0
 .../omnitrace/{include => }/library/ptl.hpp   |   0
 .../{include => }/library/redirect.hpp        |   0
 .../omnitrace/{src => }/library/runtime.cpp   |   0
 .../{include => }/library/runtime.hpp         |   0
 .../omnitrace/{src => }/library/sampling.cpp  |   0
 .../{include => }/library/sampling.hpp        |   0
 .../lib/omnitrace/{src => }/library/state.cpp |   0
 .../omnitrace/{include => }/library/state.hpp |   0
 .../{src => }/library/thread_data.cpp         |   0
 .../{include => }/library/thread_data.hpp     |   0
 .../{src => }/library/thread_sampler.cpp      |   0
 .../{include => }/library/thread_sampler.hpp  |   0
 .../omnitrace/{src => }/library/timemory.cpp  |   0
 .../{include => }/library/timemory.hpp        |   0
 62 files changed, 62 insertions(+), 62 deletions(-)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/api.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/api.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/common.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/components/backtrace.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/components/backtrace.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/components/fork_gotcha.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/components/fork_gotcha.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/components/functors.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/components/fwd.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/components/mpi_gotcha.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/components/mpi_gotcha.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/components/omnitrace.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/components/omnitrace.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/components/pthread_gotcha.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/components/pthread_gotcha.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/components/rocm_smi.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/components/rocm_smi.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/components/roctracer.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/components/roctracer.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/components/roctracer_callbacks.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/components/roctracer_callbacks.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/components/user_region.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/components/user_region.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/config.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/config.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/coverage.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/coverage.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/cpu_freq.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/cpu_freq.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/critical_trace.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/critical_trace.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/debug.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/defines.hpp.in (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/dynamic_library.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/gpu.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/gpu.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/kokkosp.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/ompt.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/ompt.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/perfetto.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/perfetto.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/ptl.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/ptl.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/redirect.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/runtime.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/runtime.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/sampling.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/sampling.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/state.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/state.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/thread_data.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/thread_data.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/thread_sampler.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/thread_sampler.hpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{src => }/library/timemory.cpp (100%)
 rename projects/rocprofiler-systems/source/lib/omnitrace/{include => }/library/timemory.hpp (100%)

diff --git a/projects/rocprofiler-systems/cmake/Packages.cmake b/projects/rocprofiler-systems/cmake/Packages.cmake
index 9edd5d8ccd..f342d75241 100644
--- a/projects/rocprofiler-systems/cmake/Packages.cmake
+++ b/projects/rocprofiler-systems/cmake/Packages.cmake
@@ -35,11 +35,11 @@ set(OMNITRACE_EXTENSION_LIBRARIES
     omnitrace::omnitrace-papi)
 
 target_include_directories(
-    omnitrace-headers INTERFACE ${PROJECT_SOURCE_DIR}/source/lib/omnitrace/include
-                                ${PROJECT_BINARY_DIR}/source/lib/omnitrace/include)
+    omnitrace-headers INTERFACE ${PROJECT_SOURCE_DIR}/source/lib/omnitrace
+                                ${PROJECT_BINARY_DIR}/source/lib/omnitrace)
 
 # include threading because of rooflines
-target_link_libraries(omnitrace-headers INTERFACE omnitrace-threading)
+target_link_libraries(omnitrace-headers INTERFACE omnitrace::omnitrace-threading)
 
 # ensure the env overrides the appending /opt/rocm later
 string(REPLACE ":" ";" CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH};${CMAKE_PREFIX_PATH}")
diff --git a/projects/rocprofiler-systems/external/papi b/projects/rocprofiler-systems/external/papi
index a19657e1c0..effd1ef4e0 160000
--- a/projects/rocprofiler-systems/external/papi
+++ b/projects/rocprofiler-systems/external/papi
@@ -1 +1 @@
-Subproject commit a19657e1c0f0eea2b63d90a20eb8d46925643973
+Subproject commit effd1ef4e0fd4b80e36546791277215a2d6b9eba
diff --git a/projects/rocprofiler-systems/external/perfetto b/projects/rocprofiler-systems/external/perfetto
index 0551922853..7e8d6801db 160000
--- a/projects/rocprofiler-systems/external/perfetto
+++ b/projects/rocprofiler-systems/external/perfetto
@@ -1 +1 @@
-Subproject commit 0551922853f0494336e1abd82de66de829c95b4e
+Subproject commit 7e8d6801dbf73936a916dbcd8ed06a758c8d989e
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/CMakeLists.txt b/projects/rocprofiler-systems/source/lib/omnitrace/CMakeLists.txt
index cc37a89924..92fcfa674c 100644
--- a/projects/rocprofiler-systems/source/lib/omnitrace/CMakeLists.txt
+++ b/projects/rocprofiler-systems/source/lib/omnitrace/CMakeLists.txt
@@ -44,65 +44,65 @@ target_link_libraries(
 add_library(omnitrace-object-library OBJECT)
 add_library(omnitrace::omnitrace-object-library ALIAS omnitrace-object-library)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/library/defines.hpp.in
-               ${CMAKE_CURRENT_BINARY_DIR}/include/library/defines.hpp @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/library/defines.hpp.in
+               ${CMAKE_CURRENT_BINARY_DIR}/library/defines.hpp @ONLY)
 
 set(library_sources
-    ${CMAKE_CURRENT_LIST_DIR}/src/library.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/api.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/config.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/coverage.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/cpu_freq.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/critical_trace.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/kokkosp.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/gpu.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/ompt.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/perfetto.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/ptl.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/runtime.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/sampling.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/state.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/thread_data.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/thread_sampler.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/timemory.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/backtrace.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/fork_gotcha.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/mpi_gotcha.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/omnitrace.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/pthread_gotcha.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/user_region.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/api.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/config.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/coverage.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/cpu_freq.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/critical_trace.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/kokkosp.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/gpu.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/ompt.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/perfetto.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/ptl.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/runtime.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/sampling.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/state.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/thread_data.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/thread_sampler.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/timemory.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/backtrace.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/fork_gotcha.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/mpi_gotcha.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/omnitrace.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/pthread_gotcha.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/user_region.cpp
     ${perfetto_DIR}/sdk/perfetto.cc)
 
 set(library_headers
-    ${CMAKE_CURRENT_LIST_DIR}/include/library.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/api.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/config.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/common.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/coverage.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/cpu_freq.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/critical_trace.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/debug.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/gpu.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/ompt.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/perfetto.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/ptl.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/runtime.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/sampling.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/state.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/thread_data.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/thread_sampler.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/timemory.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/fwd.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/backtrace.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/fork_gotcha.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/functors.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/mpi_gotcha.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/omnitrace.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/rocm_smi.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/roctracer.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/roctracer_callbacks.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/pthread_gotcha.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/user_region.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/api.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/config.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/common.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/coverage.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/cpu_freq.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/critical_trace.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/debug.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/gpu.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/ompt.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/perfetto.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/ptl.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/runtime.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/sampling.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/state.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/thread_data.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/thread_sampler.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/timemory.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/fwd.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/backtrace.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/fork_gotcha.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/functors.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/mpi_gotcha.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/omnitrace.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/rocm_smi.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/roctracer.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/roctracer_callbacks.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/pthread_gotcha.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/user_region.hpp
     ${perfetto_DIR}/sdk/perfetto.h)
 
 target_sources(omnitrace-object-library PRIVATE ${library_sources} ${library_headers})
@@ -110,13 +110,13 @@ target_sources(omnitrace-object-library PRIVATE ${library_sources} ${library_hea
 if(OMNITRACE_USE_ROCTRACER)
     target_sources(
         omnitrace-object-library
-        PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src/library/components/roctracer.cpp
-                ${CMAKE_CURRENT_LIST_DIR}/src/library/components/roctracer_callbacks.cpp)
+        PRIVATE ${CMAKE_CURRENT_LIST_DIR}/library/components/roctracer.cpp
+                ${CMAKE_CURRENT_LIST_DIR}/library/components/roctracer_callbacks.cpp)
 endif()
 
 if(OMNITRACE_USE_ROCM_SMI)
     target_sources(omnitrace-object-library
-                   PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src/library/components/rocm_smi.cpp)
+                   PRIVATE ${CMAKE_CURRENT_LIST_DIR}/library/components/rocm_smi.cpp)
 endif()
 
 target_link_libraries(omnitrace-object-library PRIVATE omnitrace-interface-library)
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/api.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/api.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/api.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/api.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/api.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/api.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/api.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/api.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/common.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/common.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/common.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/common.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/backtrace.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/backtrace.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/backtrace.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/backtrace.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/backtrace.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/backtrace.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/backtrace.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/backtrace.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/fork_gotcha.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/fork_gotcha.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/fork_gotcha.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/fork_gotcha.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/fork_gotcha.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/fork_gotcha.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/fork_gotcha.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/fork_gotcha.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/functors.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/functors.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/functors.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/functors.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/fwd.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/fwd.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/fwd.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/fwd.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/mpi_gotcha.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/mpi_gotcha.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/mpi_gotcha.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/mpi_gotcha.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/mpi_gotcha.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/mpi_gotcha.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/mpi_gotcha.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/mpi_gotcha.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/omnitrace.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/omnitrace.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/omnitrace.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/omnitrace.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/omnitrace.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/omnitrace.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/omnitrace.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/omnitrace.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/pthread_gotcha.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/pthread_gotcha.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/pthread_gotcha.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/pthread_gotcha.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/pthread_gotcha.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/pthread_gotcha.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/pthread_gotcha.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/pthread_gotcha.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/rocm_smi.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/rocm_smi.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/rocm_smi.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/rocm_smi.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/rocm_smi.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/rocm_smi.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/rocm_smi.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/rocm_smi.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/roctracer.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/roctracer.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/roctracer.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/roctracer.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/roctracer.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/roctracer.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/roctracer.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/roctracer.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/roctracer_callbacks.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/roctracer_callbacks.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/roctracer_callbacks.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/roctracer_callbacks.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/roctracer_callbacks.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/roctracer_callbacks.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/roctracer_callbacks.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/roctracer_callbacks.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/user_region.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/user_region.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/components/user_region.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/user_region.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/user_region.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/components/user_region.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/components/user_region.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/components/user_region.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/config.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/config.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/config.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/config.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/config.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/config.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/config.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/config.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/coverage.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/coverage.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/coverage.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/coverage.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/coverage.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/coverage.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/coverage.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/coverage.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/cpu_freq.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/cpu_freq.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/cpu_freq.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/cpu_freq.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/cpu_freq.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/cpu_freq.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/cpu_freq.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/cpu_freq.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/critical_trace.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/critical_trace.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/critical_trace.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/critical_trace.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/critical_trace.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/critical_trace.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/critical_trace.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/critical_trace.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/debug.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/debug.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/debug.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/debug.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/defines.hpp.in b/projects/rocprofiler-systems/source/lib/omnitrace/library/defines.hpp.in
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/defines.hpp.in
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/defines.hpp.in
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/dynamic_library.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/dynamic_library.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/dynamic_library.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/dynamic_library.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/gpu.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/gpu.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/gpu.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/gpu.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/gpu.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/gpu.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/gpu.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/gpu.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/kokkosp.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/kokkosp.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/kokkosp.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/kokkosp.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/ompt.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/ompt.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/ompt.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/ompt.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/ompt.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/ompt.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/ompt.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/ompt.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/perfetto.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/perfetto.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/perfetto.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/perfetto.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/perfetto.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/perfetto.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/perfetto.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/perfetto.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/ptl.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/ptl.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/ptl.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/ptl.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/ptl.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/ptl.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/ptl.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/ptl.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/redirect.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/redirect.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/redirect.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/redirect.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/runtime.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/runtime.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/runtime.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/runtime.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/runtime.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/runtime.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/runtime.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/runtime.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/sampling.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/sampling.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/sampling.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/sampling.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/sampling.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/sampling.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/sampling.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/sampling.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/state.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/state.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/state.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/state.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/state.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/state.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/state.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/state.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/thread_data.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/thread_data.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/thread_data.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/thread_data.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/thread_data.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/thread_data.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/thread_data.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/thread_data.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/thread_sampler.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/thread_sampler.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/thread_sampler.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/thread_sampler.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/thread_sampler.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/thread_sampler.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/thread_sampler.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/thread_sampler.hpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/src/library/timemory.cpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/timemory.cpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/src/library/timemory.cpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/timemory.cpp
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/include/library/timemory.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/timemory.hpp
similarity index 100%
rename from projects/rocprofiler-systems/source/lib/omnitrace/include/library/timemory.hpp
rename to projects/rocprofiler-systems/source/lib/omnitrace/library/timemory.hpp