restructure libomnitrace + tasking and omnitrace-causal updates (#237)

* restructured libomnitrace

- this is necessary to incorporate some of the binary analysis capabilities into omnitrace exe
- created libomnitrace-core (static)
- created libomnitrace-binary (static)
- created libomnitrace (static)
- omnitrace-avail links to libomnitrace.a
- omnitrace-critical-trace links to libomnitrace.a
- tweaked the testing
  - reduced verbosity on some of MPI tests
  - excluded trace-time-window from tests on Ubuntu 18.04
  - reduced causal e2e iterations
- minor tweak to tasking
  - manually create `PTL::UserTaskQueue` instance instead of relying on `PTL::ThreadPool` to create it

* Update formatting workflow

- source formatting uses ubuntu-22.04
- check-includes doesn't generate false positive for 'include "timemory.hpp"'

* omnitrace-causal --generate-configs

- fix config generation in omnitrace causal
- add test for omnitrace-causal + generating configs

* Fix omnitrace-object-library build

- accidentally included rocm sources in non-rocm builds

* Fix rocm compilation w/o rocprofiler

* update timemory submodule with mpi_get warning messages

* sampling offload file updates

- more verbose messages
- disable offload before stopping

* testing updates

- increase causal e2e iterations to 12
- increase lock_environment verbose to 2 (for sampling offload messages)
- fix return for omnitrace_add_validation_test

[ROCm/rocprofiler-systems commit: e7d3125459]

projects/rocprofiler-systems/.github/workflows/formatting.yml

@@ -64,7 +64,7 @@ jobs:
         fi
 
   source:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3
@@ -72,12 +72,7 @@ jobs:
       run: |
         DISTRIB_CODENAME=$(cat /etc/lsb-release | grep DISTRIB_CODENAME | awk -F '=' '{print $NF}')
         sudo apt-get update
-        sudo apt-get install -y software-properties-common wget curl
-        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        echo "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-11 main" | sudo tee -a /etc/apt/sources.list.d/llvm-toolchain.list
-        echo "deb-src http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-11 main" | sudo tee -a /etc/apt/sources.list.d/llvm-toolchain.list
-        sudo apt-get update
-        sudo apt-get install -y clang-format-11
+        sudo apt-get install -y software-properties-common wget curl clang-format-11
     - name: clang-format
       run: |
         set +e
@@ -99,8 +94,8 @@ jobs:
     - name: check-includes
       run: |
         set +e
-        FILES=$(find source examples -type f | egrep '\.hpp$|\.cpp$|\.cpp\.in$')
-        MATCHES=$(egrep 'include "timemory|include <bits' ${FILES})
+        FILES=$(find source examples -type f | egrep '\.(hpp|cpp)(|\.in)$')
+        MATCHES=$(egrep 'include "timemory/|include <bits/' ${FILES})
         if [ -n "${MATCHES}" ]; then
           echo -e "\nError! Included timemory header with quotes or bits folder included\n"
           echo -e "### MATCHES: ###"

projects/rocprofiler-systems/cmake/Packages.cmake

@@ -51,7 +51,7 @@ set(OMNITRACE_EXTENSION_LIBRARIES
 
 target_include_directories(
     omnitrace-headers
-    INTERFACE ${PROJECT_BINARY_DIR}/source/lib ${PROJECT_BINARY_DIR}/source/lib/omnitrace
+    INTERFACE ${PROJECT_BINARY_DIR}/source/lib ${PROJECT_BINARY_DIR}/source/lib/core
               ${PROJECT_SOURCE_DIR}/source/lib ${PROJECT_SOURCE_DIR}/source/lib/omnitrace
               ${PROJECT_SOURCE_DIR}/source/lib/omnitrace-user)
 
@@ -223,6 +223,7 @@ endif()
 # RCCL
 #
 # ----------------------------------------------------------------------------------------#
+
 if(OMNITRACE_USE_RCCL)
     find_package(RCCL-Headers ${omnitrace_FIND_QUIETLY} REQUIRED)
     target_link_libraries(omnitrace-rccl INTERFACE roc::rccl-headers)

projects/rocprofiler-systems/source/bin/omnitrace-avail/CMakeLists.txt

@@ -20,13 +20,14 @@ target_sources(
             ${CMAKE_CURRENT_LIST_DIR}/get_availability.hpp
             ${CMAKE_CURRENT_LIST_DIR}/get_categories.hpp
             ${CMAKE_CURRENT_LIST_DIR}/info_type.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/info_type.hpp
-            $<TARGET_OBJECTS:omnitrace::omnitrace-object-library>)
+            ${CMAKE_CURRENT_LIST_DIR}/info_type.hpp)
 
 target_include_directories(omnitrace-avail PRIVATE ${CMAKE_CURRENT_LIST_DIR})
 target_compile_definitions(omnitrace-avail PRIVATE OMNITRACE_EXTERN_COMPONENTS=0)
-target_link_libraries(omnitrace-avail PRIVATE omnitrace::omnitrace-compile-definitions
-                                              omnitrace::omnitrace-interface-library)
+target_link_libraries(
+    omnitrace-avail
+    PRIVATE omnitrace::omnitrace-compile-definitions
+            omnitrace::omnitrace-interface-library omnitrace::libomnitrace-static)
 set_target_properties(
     omnitrace-avail PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"
                                INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}")

projects/rocprofiler-systems/source/bin/omnitrace-avail/avail.cpp

@@ -29,8 +29,8 @@
 #include "get_availability.hpp"
 #include "info_type.hpp"
 
-#include "library/config.hpp"
-#include "library/gpu.hpp"
+#include "core/config.hpp"
+#include "core/gpu.hpp"
 #include "library/rocprofiler.hpp"
 
 #include <timemory/components.hpp>

projects/rocprofiler-systems/source/bin/omnitrace-avail/defines.hpp

@@ -25,5 +25,6 @@
 #define TIMEMORY_DISABLE_BANNER
 #define TIMEMORY_DISABLE_COMPONENT_STORAGE_INIT
 
-#include "library/config.hpp"
-#include "library/defines.hpp"
+#include "common/defines.h"
+#include "core/config.hpp"
+#include "core/defines.hpp"

projects/rocprofiler-systems/source/bin/omnitrace-causal/impl.cpp

@@ -905,11 +905,12 @@ parse_args(int argc, char** argv, std::vector<char*>& _env,
     {
         auto _is_omni_cfg = [](std::string_view itr) {
             return (itr.find("OMNITRACE") == 0 && itr.find("OMNITRACE_MODE") != 0 &&
-                    itr.find("OMNITRACE_CONFIG_FILE") != 0 &&
-                    itr.find('=') < itr.length());
+                    itr.find("OMNITRACE_DEBUG_") != 0 && itr.find('=') < itr.length());
+            // omnitrace has miscellaneous env options starting with OMNITRACE_DEBUG_ that
+            // are not official options
         };
 
-        auto _omni_env = std::map<std::string, std::string>{};
+        auto _omni_env_m = std::map<std::string, std::string>{};
         for(auto* itr : _env)
         {
             if(_is_omni_cfg(itr))
@@ -918,12 +919,25 @@ parse_args(int argc, char** argv, std::vector<char*>& _env,
                 auto _pos     = _env_var.find('=');
                 auto _env_val = _env_var.substr(_pos + 1);
                 _env_var      = _env_var.substr(0, _pos);
-                _omni_env.emplace(_env_var, _env_val);
+                _omni_env_m.emplace(_env_var, _env_val);
             }
         }
 
         _env.erase(std::remove_if(_env.begin(), _env.end(), _is_omni_cfg), _env.end());
 
+        auto _omni_env = std::vector<std::pair<std::string, std::string>>{};
+        // make sure that OMNITRACE_CONFIG_FILE is the first entry
+        {
+            auto citr = _omni_env_m.find("OMNITRACE_CONFIG_FILE");
+            if(citr != _omni_env_m.end())
+            {
+                _omni_env.emplace_back(citr->first, citr->second);
+                _omni_env_m.erase(citr);
+            }
+        }
+        for(const auto& itr : _omni_env_m)
+            _omni_env.emplace_back(itr.first, itr.second);
+
         _causal_envs_tmp = std::move(_causal_envs);
         _causal_envs.clear();
         auto _write_config =

projects/rocprofiler-systems/source/bin/omnitrace-critical-trace/CMakeLists.txt

@@ -4,11 +4,8 @@
 #
 # ------------------------------------------------------------------------------#
 
-add_executable(
-    omnitrace-critical-trace
-    ${CMAKE_CURRENT_LIST_DIR}/critical-trace.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/critical-trace.hpp
-    $<TARGET_OBJECTS:omnitrace::omnitrace-object-library>)
+add_executable(omnitrace-critical-trace ${CMAKE_CURRENT_LIST_DIR}/critical-trace.cpp
+                                        ${CMAKE_CURRENT_LIST_DIR}/critical-trace.hpp)
 
 target_include_directories(omnitrace-critical-trace PRIVATE ${CMAKE_CURRENT_LIST_DIR})
 target_compile_definitions(omnitrace-critical-trace PRIVATE OMNITRACE_EXTERN_COMPONENTS=0)
@@ -16,7 +13,7 @@ target_link_libraries(
     omnitrace-critical-trace
     PRIVATE omnitrace::omnitrace-compile-definitions
             omnitrace::omnitrace-interface-library omnitrace::omnitrace-headers
-            omnitrace::omnitrace-timemory)
+            omnitrace::omnitrace-timemory omnitrace::libomnitrace-static)
 set_target_properties(
     omnitrace-critical-trace
     PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"

projects/rocprofiler-systems/source/bin/omnitrace-critical-trace/critical-trace.cpp

@@ -23,9 +23,9 @@
 #include "critical-trace.hpp"
 
 #include "api.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
-#include "library/perfetto.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
+#include "core/perfetto.hpp"
 #include "library/tracing.hpp"
 
 #include <timemory/hash/types.hpp>

projects/rocprofiler-systems/source/bin/omnitrace-critical-trace/critical-trace.hpp

@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include "library/config.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
+#include "core/defines.hpp"
+#include "core/perfetto.hpp"
 #include "library/critical_trace.hpp"
-#include "library/debug.hpp"
-#include "library/defines.hpp"
-#include "library/perfetto.hpp"
 #include "library/ptl.hpp"
 
 #include <PTL/ThreadPool.hh>

projects/rocprofiler-systems/source/lib/CMakeLists.txt

@@ -19,6 +19,9 @@ else()
 endif()
 
 add_subdirectory(common)
+add_subdirectory(core)
+add_subdirectory(binary)
+
 add_subdirectory(omnitrace)
 add_subdirectory(omnitrace-dl)
 add_subdirectory(omnitrace-user)

projects/rocprofiler-systems/source/lib/binary/CMakeLists.txt

@@ -1,7 +1,6 @@
 #
 set(binary_sources
     ${CMAKE_CURRENT_LIST_DIR}/address_multirange.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/address_range.cpp
     ${CMAKE_CURRENT_LIST_DIR}/analysis.cpp
     ${CMAKE_CURRENT_LIST_DIR}/dwarf_entry.cpp
     ${CMAKE_CURRENT_LIST_DIR}/link_map.cpp
@@ -10,13 +9,20 @@ set(binary_sources
 
 set(binary_headers
     ${CMAKE_CURRENT_LIST_DIR}/address_multirange.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/address_range.hpp
     ${CMAKE_CURRENT_LIST_DIR}/analysis.hpp
     ${CMAKE_CURRENT_LIST_DIR}/dwarf_entry.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/fwd.hpp
     ${CMAKE_CURRENT_LIST_DIR}/binary_info.hpp
     ${CMAKE_CURRENT_LIST_DIR}/link_map.hpp
     ${CMAKE_CURRENT_LIST_DIR}/scope_filter.hpp
     ${CMAKE_CURRENT_LIST_DIR}/symbol.hpp)
 
-target_sources(omnitrace-object-library PRIVATE ${binary_sources} ${binary_headers})
+add_library(omnitrace-binary-library STATIC)
+add_library(omnitrace::omnitrace-binary ALIAS omnitrace-binary-library)
+
+target_sources(omnitrace-binary-library PRIVATE ${binary_sources} ${binary_headers})
+
+target_link_libraries(
+    omnitrace-binary-library PRIVATE omnitrace::omnitrace-interface-library
+                                     omnitrace::omnitrace-core)
+
+set_target_properties(omnitrace-binary-library PROPERTIES OUTPUT_NAME omnitrace-binary)

projects/rocprofiler-systems/source/lib/binary/address_multirange.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/binary/address_multirange.hpp"
+#include "address_multirange.hpp"
 
 #include <algorithm>
 #include <cstdint>

projects/rocprofiler-systems/source/lib/binary/address_multirange.hpp

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "library/binary/address_range.hpp"
-#include "library/binary/fwd.hpp"
+#include "core/binary/address_range.hpp"
+#include "core/binary/fwd.hpp"
 
 #include <timemory/utility/macros.hpp>
 

projects/rocprofiler-systems/source/lib/binary/analysis.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/config.hpp"
+#include "core/config.hpp"
 
 #if !defined(TIMEMORY_USE_BFD)
 #    error "BFD support not enabled"
@@ -30,18 +30,18 @@
 
 #include <bfd.h>
 
-#include "library/binary/address_range.hpp"
-#include "library/binary/analysis.hpp"
-#include "library/binary/binary_info.hpp"
-#include "library/binary/dwarf_entry.hpp"
-#include "library/binary/fwd.hpp"
-#include "library/binary/scope_filter.hpp"
-#include "library/binary/symbol.hpp"
-#include "library/common.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
-#include "library/state.hpp"
-#include "library/utility.hpp"
+#include "analysis.hpp"
+#include "binary_info.hpp"
+#include "core/binary/address_range.hpp"
+#include "core/binary/fwd.hpp"
+#include "core/common.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
+#include "core/state.hpp"
+#include "core/utility.hpp"
+#include "dwarf_entry.hpp"
+#include "scope_filter.hpp"
+#include "symbol.hpp"
 
 #include <timemory/log/macros.hpp>
 #include <timemory/unwind/bfd.hpp>

projects/rocprofiler-systems/source/lib/binary/analysis.hpp

@@ -23,10 +23,10 @@
 #pragma once
 
 #include "common/defines.h"
-#include "library/binary/fwd.hpp"
-#include "library/common.hpp"
-#include "library/defines.hpp"
-#include "library/exception.hpp"
+#include "core/binary/fwd.hpp"
+#include "core/common.hpp"
+#include "core/defines.hpp"
+#include "core/exception.hpp"
 
 #include <timemory/hash/types.hpp>
 #include <timemory/mpl/concepts.hpp>

projects/rocprofiler-systems/source/lib/binary/binary_info.hpp

@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include "library/binary/address_range.hpp"
-#include "library/binary/dwarf_entry.hpp"
-#include "library/binary/fwd.hpp"
-#include "library/binary/symbol.hpp"
-#include "library/utility.hpp"
+#include "core/binary/address_range.hpp"
+#include "core/binary/fwd.hpp"
+#include "core/utility.hpp"
+#include "dwarf_entry.hpp"
+#include "symbol.hpp"
 
 #include <timemory/utility/procfs/maps.hpp>
 

projects/rocprofiler-systems/source/lib/binary/dwarf_entry.cpp

@@ -20,10 +20,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/binary/dwarf_entry.hpp"
-#include "library/binary/fwd.hpp"
-#include "library/timemory.hpp"
-#include "library/utility.hpp"
+#include "dwarf_entry.hpp"
+#include "core/binary/fwd.hpp"
+#include "core/timemory.hpp"
+#include "core/utility.hpp"
 
 #include <dwarf.h>
 #include <elfutils/libdw.h>

projects/rocprofiler-systems/source/lib/binary/dwarf_entry.hpp

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "library/binary/address_range.hpp"
-#include "library/binary/fwd.hpp"
+#include "core/binary/address_range.hpp"
+#include "core/binary/fwd.hpp"
 
 namespace omnitrace
 {

projects/rocprofiler-systems/source/lib/binary/link_map.cpp

@@ -20,11 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/binary/link_map.hpp"
-#include "library/common.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
-#include "library/timemory.hpp"
+#include "link_map.hpp"
+#include "core/common.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
+#include "core/timemory.hpp"
 
 #include <timemory/utility/filepath.hpp>
 

projects/rocprofiler-systems/source/lib/binary/scope_filter.cpp

@@ -20,8 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/binary/scope_filter.hpp"
-#include "library/exception.hpp"
+#include "scope_filter.hpp"
+#include "core/exception.hpp"
 
 #include <regex>
 

projects/rocprofiler-systems/source/lib/binary/scope_filter.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "library/defines.hpp"
+#include "core/defines.hpp"
 
 #include <cstdint>
 #include <string>

projects/rocprofiler-systems/source/lib/binary/symbol.cpp

@@ -20,8 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/config.hpp"
-#include "library/debug.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
 
 #if !defined(TIMEMORY_USE_BFD)
 #    error "BFD support not enabled"
@@ -40,12 +40,12 @@
 #include <elfutils/libdw.h>
 #include <libcoff.h>
 
-#include "library/binary/dwarf_entry.hpp"
-#include "library/binary/fwd.hpp"
-#include "library/binary/scope_filter.hpp"
-#include "library/binary/symbol.hpp"
-#include "library/timemory.hpp"
-#include "library/utility.hpp"
+#include "core/binary/fwd.hpp"
+#include "core/timemory.hpp"
+#include "core/utility.hpp"
+#include "dwarf_entry.hpp"
+#include "scope_filter.hpp"
+#include "symbol.hpp"
 
 #include <timemory/mpl/concepts.hpp>
 

projects/rocprofiler-systems/source/lib/binary/symbol.hpp

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "library/binary/address_range.hpp"
-#include "library/binary/fwd.hpp"
+#include "core/binary/address_range.hpp"
+#include "core/binary/fwd.hpp"
 
 #include <timemory/unwind/bfd.hpp>
 

projects/rocprofiler-systems/source/lib/core/CMakeLists.txt

@@ -0,0 +1,52 @@
+#
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defines.hpp.in
+               ${CMAKE_CURRENT_BINARY_DIR}/defines.hpp @ONLY)
+
+set(core_sources
+    ${CMAKE_CURRENT_LIST_DIR}/categories.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/config.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/constraint.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/debug.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/dynamic_library.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/exception.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/gpu.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/locking.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/mproc.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/perfetto.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/state.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/timemory.cpp)
+
+set(core_headers
+    ${CMAKE_CURRENT_LIST_DIR}/categories.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/common.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/concepts.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/config.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/constraint.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/debug.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/dynamic_library.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/exception.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/gpu.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/locking.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/mproc.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/perfetto.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/redirect.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/state.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/timemory.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/utility.hpp)
+
+add_library(omnitrace-core-library STATIC)
+add_library(omnitrace::omnitrace-core ALIAS omnitrace-core-library)
+
+target_sources(omnitrace-core-library PRIVATE ${core_sources} ${core_headers}
+                                              ${CMAKE_CURRENT_BINARY_DIR}/defines.hpp)
+add_subdirectory(binary)
+add_subdirectory(components)
+add_subdirectory(containers)
+
+target_include_directories(omnitrace-core-library BEFORE
+                           PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+
+target_link_libraries(omnitrace-core-library
+                      PRIVATE omnitrace::omnitrace-interface-library)
+
+set_target_properties(omnitrace-core-library PROPERTIES OUTPUT_NAME omnitrace-core)

projects/rocprofiler-systems/source/lib/core/binary/CMakeLists.txt

@@ -0,0 +1,7 @@
+#
+set(binary_sources ${CMAKE_CURRENT_LIST_DIR}/address_range.cpp)
+
+set(binary_headers ${CMAKE_CURRENT_LIST_DIR}/address_range.hpp
+                   ${CMAKE_CURRENT_LIST_DIR}/fwd.hpp)
+
+target_sources(omnitrace-core-library PRIVATE ${binary_sources} ${binary_headers})

projects/rocprofiler-systems/source/lib/core/binary/address_range.cpp

@@ -20,8 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/binary/address_range.hpp"
-#include "library/debug.hpp"
+#include "binary/address_range.hpp"
+#include "debug.hpp"
 
 namespace omnitrace
 {

projects/rocprofiler-systems/source/lib/core/binary/address_range.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "library/binary/fwd.hpp"
-#include "library/common.hpp"
-#include "library/timemory.hpp"
+#include "core/binary/fwd.hpp"
+#include "core/common.hpp"
+#include "core/timemory.hpp"
 
 #include <timemory/hash/types.hpp>
 #include <timemory/utility/macros.hpp>

projects/rocprofiler-systems/source/lib/core/binary/fwd.hpp

@@ -23,9 +23,9 @@
 #pragma once
 
 #include "common/defines.h"
-#include "library/common.hpp"
-#include "library/defines.hpp"
-#include "library/exception.hpp"
+#include "core/common.hpp"
+#include "core/defines.hpp"
+#include "core/exception.hpp"
 
 #include <timemory/hash/types.hpp>
 #include <timemory/mpl/concepts.hpp>

projects/rocprofiler-systems/source/lib/core/categories.cpp

@@ -20,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/categories.hpp"
-#include "library/common.hpp"
-#include "library/config.hpp"
-#include "library/constraint.hpp"
-#include "library/debug.hpp"
-#include "library/timemory.hpp"
-#include "library/utility.hpp"
+#include "core/categories.hpp"
+#include "core/common.hpp"
+#include "core/config.hpp"
+#include "core/constraint.hpp"
+#include "core/debug.hpp"
+#include "core/timemory.hpp"
+#include "core/utility.hpp"
 
 #include <set>
 #include <string>

projects/rocprofiler-systems/source/lib/core/categories.hpp

@@ -23,7 +23,7 @@
 #pragma once
 
 #include "common/join.hpp"
-#include "library/defines.hpp"
+#include "defines.hpp"
 #include "omnitrace/categories.h"  // in omnitrace-user
 
 #if defined(TIMEMORY_PERFETTO_CATEGORIES)

projects/rocprofiler-systems/source/lib/core/common.hpp

@@ -22,10 +22,10 @@
 
 #pragma once
 
+#include "categories.hpp"
 #include "common/join.hpp"
-#include "library/categories.hpp"
-#include "library/concepts.hpp"
-#include "library/defines.hpp"
+#include "concepts.hpp"
+#include "defines.hpp"
 
 #include <timemory/api.hpp>
 #include <timemory/api/macros.hpp>

projects/rocprofiler-systems/source/lib/core/components/CMakeLists.txt

@@ -0,0 +1,6 @@
+#
+set(component_sources)
+
+set(component_headers ${CMAKE_CURRENT_LIST_DIR}/fwd.hpp)
+
+target_sources(omnitrace-core-library PRIVATE ${component_sources} ${component_headers})

projects/rocprofiler-systems/source/lib/core/components/fwd.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "library/categories.hpp"
-#include "library/common.hpp"
-#include "library/defines.hpp"
+#include "core/categories.hpp"
+#include "core/common.hpp"
+#include "core/defines.hpp"
 
 #include <timemory/api.hpp>
 #include <timemory/api/macros.hpp>

projects/rocprofiler-systems/source/lib/core/concepts.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "library/defines.hpp"
+#include "defines.hpp"
 
 #include <timemory/mpl/concepts.hpp>
 #include <timemory/utility/types.hpp>

projects/rocprofiler-systems/source/lib/core/config.cpp

@@ -20,14 +20,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/config.hpp"
+#include "config.hpp"
 #include "common/defines.h"
-#include "library/constraint.hpp"
-#include "library/debug.hpp"
-#include "library/defines.hpp"
-#include "library/gpu.hpp"
-#include "library/mproc.hpp"
-#include "library/perfetto.hpp"
+#include "constraint.hpp"
+#include "debug.hpp"
+#include "defines.hpp"
+#include "gpu.hpp"
+#include "mproc.hpp"
+#include "perfetto.hpp"
 
 #include <timemory/backends/dmp.hpp>
 #include <timemory/backends/mpi.hpp>

projects/rocprofiler-systems/source/lib/core/config.hpp

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "library/common.hpp"
-#include "library/defines.hpp"
-#include "library/state.hpp"
-#include "library/timemory.hpp"
+#include "common.hpp"
+#include "defines.hpp"
+#include "state.hpp"
+#include "timemory.hpp"
 
 #include <timemory/backends/threading.hpp>
 #include <timemory/macros/language.hpp>

projects/rocprofiler-systems/source/lib/core/constraint.cpp

@@ -20,11 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/constraint.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
-#include "library/state.hpp"
-#include "library/utility.hpp"
+#include "constraint.hpp"
+#include "config.hpp"
+#include "debug.hpp"
+#include "state.hpp"
+#include "utility.hpp"
 
 #include <timemory/units.hpp>
 #include <timemory/utility/delimit.hpp>

projects/rocprofiler-systems/source/lib/core/constraint.hpp

@@ -30,7 +30,7 @@
 /// to use this
 ///
 
-#include "library/defines.hpp"
+#include "defines.hpp"
 
 #include <cstdint>
 #include <ctime>

projects/rocprofiler-systems/source/lib/core/containers/CMakeLists.txt

@@ -4,5 +4,4 @@ set(containers_sources)
 set(containers_headers ${CMAKE_CURRENT_LIST_DIR}/stable_vector.hpp
                        ${CMAKE_CURRENT_LIST_DIR}/static_vector.hpp)
 
-target_sources(omnitrace-object-library PRIVATE ${containers_sources}
-                                                ${containers_headers})
+target_sources(omnitrace-core-library PRIVATE ${containers_sources} ${containers_headers})

projects/rocprofiler-systems/source/lib/core/containers/c_array.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "library/exception.hpp"
+#include "core/exception.hpp"
 
 #include <array>
 #include <atomic>

projects/rocprofiler-systems/source/lib/core/containers/operators.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "library/defines.hpp"
+#include "core/defines.hpp"
 
 #include <iterator>
 #include <type_traits>

projects/rocprofiler-systems/source/lib/core/containers/stable_vector.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "library/containers/operators.hpp"
-#include "library/containers/static_vector.hpp"
-#include "library/defines.hpp"
+#include "core/containers/operators.hpp"
+#include "core/containers/static_vector.hpp"
+#include "core/defines.hpp"
 
 #include <algorithm>
 #include <initializer_list>

projects/rocprofiler-systems/source/lib/core/containers/static_vector.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "library/common.hpp"
-#include "library/debug.hpp"
-#include "library/exception.hpp"
+#include "core/common.hpp"
+#include "core/debug.hpp"
+#include "core/exception.hpp"
 
 #include <timemory/utility/demangle.hpp>
 

projects/rocprofiler-systems/source/lib/core/debug.cpp

@@ -20,9 +20,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/debug.hpp"
-#include "library/binary/address_range.hpp"
-#include "library/state.hpp"
+#include "debug.hpp"
+#include "binary/address_range.hpp"
+#include "state.hpp"
 
 #include <timemory/log/color.hpp>
 #include <timemory/utility/filepath.hpp>

projects/rocprofiler-systems/source/lib/core/debug.hpp

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "library/defines.hpp"
-#include "library/exception.hpp"
+#include "defines.hpp"
+#include "exception.hpp"
 
 #include <timemory/api.hpp>
 #include <timemory/backends/dmp.hpp>

projects/rocprofiler-systems/source/lib/core/dynamic_library.cpp

@@ -20,10 +20,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/dynamic_library.hpp"
-#include "library/common.hpp"
-#include "library/debug.hpp"
-#include "library/defines.hpp"
+#include "dynamic_library.hpp"
+#include "common.hpp"
+#include "debug.hpp"
+#include "defines.hpp"
 
 #include <timemory/environment.hpp>
 #include <timemory/utility/delimit.hpp>

projects/rocprofiler-systems/source/lib/core/dynamic_library.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "library/defines.hpp"
+#include "defines.hpp"
 
 #include <dlfcn.h>
 #include <string>

projects/rocprofiler-systems/source/lib/core/exception.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/exception.hpp"
+#include "exception.hpp"
 
 #include <any>
 #include <cstring>

projects/rocprofiler-systems/source/lib/core/gpu.cpp

@@ -34,9 +34,9 @@
 #    endif
 #endif
 
-#include "library/gpu.hpp"
-#include "library/debug.hpp"
-#include "library/defines.hpp"
+#include "gpu.hpp"
+#include "debug.hpp"
+#include "defines.hpp"
 
 #include <timemory/manager.hpp>
 

projects/rocprofiler-systems/source/lib/core/mproc.cpp

@@ -20,9 +20,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/mproc.hpp"
-#include "library/common.hpp"
-#include "library/debug.hpp"
+#include "mproc.hpp"
+#include "common.hpp"
+#include "debug.hpp"
 
 #include <fstream>
 #include <set>

projects/rocprofiler-systems/source/lib/core/perfetto.cpp

@@ -20,9 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/perfetto.hpp"
-#include "library/config.hpp"
-#include "library/tracing.hpp"
+#include "perfetto.hpp"
+#include "config.hpp"
 
 namespace omnitrace
 {

projects/rocprofiler-systems/source/lib/core/perfetto.hpp

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "library/categories.hpp"
-#include "library/common.hpp"
+#include "categories.hpp"
+#include "common.hpp"
 
 #if defined(TIMEMORY_USE_PERFETTO)
 #    include <timemory/components/perfetto/backends.hpp>
@@ -32,7 +32,7 @@
 PERFETTO_DEFINE_CATEGORIES(OMNITRACE_PERFETTO_CATEGORIES);
 #endif
 
-#include "library/debug.hpp"
+#include "debug.hpp"
 
 #include <map>
 #include <memory>

projects/rocprofiler-systems/source/lib/core/redirect.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "library/defines.hpp"
+#include "core/defines.hpp"
 
 #include <array>
 #include <iostream>

projects/rocprofiler-systems/source/lib/core/state.cpp

@@ -20,10 +20,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/state.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
-#include "library/utility.hpp"
+#include "state.hpp"
+#include "config.hpp"
+#include "debug.hpp"
+#include "utility.hpp"
 
 #include <string>
 

projects/rocprofiler-systems/source/lib/core/state.hpp

@@ -22,7 +22,8 @@
 
 #pragma once
 
-#include "library/defines.hpp"
+#include "common/defines.h"
+#include "defines.hpp"
 
 #include <cstdint>
 #include <string>

projects/rocprofiler-systems/source/lib/core/timemory.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/timemory.hpp"
+#include "timemory.hpp"
 
 using namespace omnitrace;
 

projects/rocprofiler-systems/source/lib/core/timemory.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "library/common.hpp"
-#include "library/components/fwd.hpp"
-#include "library/defines.hpp"
+#include "common.hpp"
+#include "components/fwd.hpp"
+#include "defines.hpp"
 
 #include <timemory/api.hpp>
 #include <timemory/backends/mpi.hpp>

projects/rocprofiler-systems/source/lib/core/utility.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "library/concepts.hpp"
+#include "concepts.hpp"
 
 #include <timemory/mpl/concepts.hpp>
 #include <timemory/utility/join.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/CMakeLists.txt

@@ -73,21 +73,41 @@ endif()
 #
 # ------------------------------------------------------------------------------#
 
-add_library(omnitrace-library SHARED $<TARGET_OBJECTS:omnitrace-object-library>)
-add_library(omnitrace::omnitrace-library ALIAS omnitrace-library)
+add_library(omnitrace-static-library STATIC $<TARGET_OBJECTS:omnitrace-object-library>)
+add_library(omnitrace::libomnitrace-static ALIAS omnitrace-static-library)
 
-target_link_libraries(omnitrace-library PRIVATE omnitrace::omnitrace-interface-library)
+target_link_libraries(
+    omnitrace-static-library
+    PRIVATE omnitrace::omnitrace-interface-library omnitrace::omnitrace-core
+            omnitrace::omnitrace-core omnitrace::omnitrace-binary)
+
+set_target_properties(omnitrace-static-library PROPERTIES OUTPUT_NAME omnitrace)
+
+# ------------------------------------------------------------------------------#
+#
+# omnitrace shared library
+#
+# ------------------------------------------------------------------------------#
+
+add_library(omnitrace-shared-library SHARED $<TARGET_OBJECTS:omnitrace-object-library>)
+add_library(omnitrace::libomnitrace-shared ALIAS omnitrace-shared-library)
+add_library(omnitrace::omnitrace-library ALIAS omnitrace-shared-library)
+
+target_link_libraries(
+    omnitrace-shared-library
+    PRIVATE omnitrace::omnitrace-interface-library omnitrace::omnitrace-core
+            omnitrace::omnitrace-core omnitrace::omnitrace-binary)
 
 set_target_properties(
-    omnitrace-library
+    omnitrace-shared-library
     PROPERTIES OUTPUT_NAME omnitrace
                VERSION ${PROJECT_VERSION}
                SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
                INSTALL_RPATH "${OMNITRACE_LIB_INSTALL_RPATH}")
 
-omnitrace_strip_target(omnitrace-library)
+omnitrace_strip_target(omnitrace-shared-library)
 
 install(
-    TARGETS omnitrace-library
+    TARGETS omnitrace-shared-library
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
     OPTIONAL)

projects/rocprofiler-systems/source/lib/omnitrace/api.cpp

@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 #include "api.hpp"
-#include "library/debug.hpp"
+#include "core/debug.hpp"
 
 #include <exception>
 #include <stdexcept>

projects/rocprofiler-systems/source/lib/omnitrace/api.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "library/defines.hpp"
+#include "core/defines.hpp"
 #include "omnitrace/categories.h"  // in omnitrace-user
 
 #include <timemory/compat/macros.h>

projects/rocprofiler-systems/source/lib/omnitrace/library.cpp

@@ -26,24 +26,26 @@
 //
 #include "api.hpp"
 #include "common/setup.hpp"
-#include "library/categories.hpp"
+#include "core/categories.hpp"
+#include "core/components/fwd.hpp"
+#include "core/concepts.hpp"
+#include "core/config.hpp"
+#include "core/constraint.hpp"
+#include "core/debug.hpp"
+#include "core/defines.hpp"
+#include "core/gpu.hpp"
+#include "core/timemory.hpp"
+#include "core/utility.hpp"
 #include "library/causal/data.hpp"
 #include "library/causal/experiment.hpp"
 #include "library/causal/sampling.hpp"
 #include "library/components/exit_gotcha.hpp"
 #include "library/components/fork_gotcha.hpp"
-#include "library/components/fwd.hpp"
 #include "library/components/mpi_gotcha.hpp"
 #include "library/components/pthread_gotcha.hpp"
 #include "library/components/rocprofiler.hpp"
-#include "library/concepts.hpp"
-#include "library/config.hpp"
-#include "library/constraint.hpp"
 #include "library/coverage.hpp"
 #include "library/critical_trace.hpp"
-#include "library/debug.hpp"
-#include "library/defines.hpp"
-#include "library/gpu.hpp"
 #include "library/ompt.hpp"
 #include "library/process_sampler.hpp"
 #include "library/ptl.hpp"
@@ -53,9 +55,7 @@
 #include "library/sampling.hpp"
 #include "library/thread_data.hpp"
 #include "library/thread_info.hpp"
-#include "library/timemory.hpp"
 #include "library/tracing.hpp"
-#include "library/utility.hpp"
 #include "omnitrace/categories.h"  // in omnitrace-user
 
 #include <timemory/hash/types.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/CMakeLists.txt

@@ -1,69 +1,38 @@
 #
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defines.hpp.in
-               ${CMAKE_CURRENT_BINARY_DIR}/defines.hpp @ONLY)
-
 set(library_sources
-    ${CMAKE_CURRENT_LIST_DIR}/categories.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/config.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/constraint.cpp
     ${CMAKE_CURRENT_LIST_DIR}/coverage.cpp
     ${CMAKE_CURRENT_LIST_DIR}/cpu_freq.cpp
     ${CMAKE_CURRENT_LIST_DIR}/critical_trace.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/debug.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/dynamic_library.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/exception.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/gpu.cpp
     ${CMAKE_CURRENT_LIST_DIR}/kokkosp.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/locking.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/mproc.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ompt.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/perfetto.cpp
     ${CMAKE_CURRENT_LIST_DIR}/process_sampler.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ptl.cpp
     ${CMAKE_CURRENT_LIST_DIR}/runtime.cpp
     ${CMAKE_CURRENT_LIST_DIR}/sampling.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/state.cpp
     ${CMAKE_CURRENT_LIST_DIR}/thread_deleter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/thread_info.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/timemory.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tracing.cpp)
 
 set(library_headers
-    ${CMAKE_CURRENT_LIST_DIR}/categories.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/common.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/concepts.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/config.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/constraint.hpp
     ${CMAKE_CURRENT_LIST_DIR}/coverage.hpp
     ${CMAKE_CURRENT_LIST_DIR}/cpu_freq.hpp
     ${CMAKE_CURRENT_LIST_DIR}/critical_trace.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/debug.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/dynamic_library.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/gpu.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/locking.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/mproc.hpp
     ${CMAKE_CURRENT_LIST_DIR}/ompt.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/perfetto.hpp
     ${CMAKE_CURRENT_LIST_DIR}/process_sampler.hpp
     ${CMAKE_CURRENT_LIST_DIR}/ptl.hpp
     ${CMAKE_CURRENT_LIST_DIR}/rcclp.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/redirect.hpp
     ${CMAKE_CURRENT_LIST_DIR}/rocm.hpp
     ${CMAKE_CURRENT_LIST_DIR}/rocm_smi.hpp
     ${CMAKE_CURRENT_LIST_DIR}/rocprofiler.hpp
     ${CMAKE_CURRENT_LIST_DIR}/roctracer.hpp
     ${CMAKE_CURRENT_LIST_DIR}/runtime.hpp
     ${CMAKE_CURRENT_LIST_DIR}/sampling.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/state.hpp
     ${CMAKE_CURRENT_LIST_DIR}/thread_data.hpp
     ${CMAKE_CURRENT_LIST_DIR}/thread_deleter.hpp
     ${CMAKE_CURRENT_LIST_DIR}/thread_info.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/timemory.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/tracing.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/utility.hpp)
+    ${CMAKE_CURRENT_LIST_DIR}/tracing.hpp)
 
-target_sources(omnitrace-object-library PRIVATE ${library_sources} ${library_headers}
-                                                ${CMAKE_CURRENT_BINARY_DIR}/defines.hpp)
+target_sources(omnitrace-object-library PRIVATE ${library_sources} ${library_headers})
 
 if(OMNITRACE_USE_ROCTRACER OR OMNITRACE_USE_ROCPROFILER)
     target_sources(omnitrace-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rocm.cpp)
@@ -89,10 +58,8 @@ if(OMNITRACE_USE_ROCM_SMI)
                    PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rocm_smi.cpp)
 endif()
 
-add_subdirectory(binary)
 add_subdirectory(causal)
 add_subdirectory(components)
-add_subdirectory(containers)
 add_subdirectory(coverage)
 add_subdirectory(rocm)
 add_subdirectory(tracing)

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/components/backtrace.cpp

@@ -21,18 +21,18 @@
 // SOFTWARE.
 
 #include "library/causal/components/backtrace.hpp"
+#include "core/concepts.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
+#include "core/state.hpp"
+#include "core/utility.hpp"
 #include "library/causal/data.hpp"
 #include "library/causal/delay.hpp"
 #include "library/causal/experiment.hpp"
-#include "library/concepts.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
 #include "library/runtime.hpp"
-#include "library/state.hpp"
 #include "library/thread_data.hpp"
 #include "library/thread_info.hpp"
 #include "library/tracing.hpp"
-#include "library/utility.hpp"
 
 #include <timemory/components/timing/backends.hpp>
 #include <timemory/components/timing/wall_clock.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/components/backtrace.hpp

@@ -22,12 +22,12 @@
 
 #pragma once
 
+#include "core/common.hpp"
+#include "core/components/fwd.hpp"
+#include "core/defines.hpp"
+#include "core/timemory.hpp"
 #include "library/causal/data.hpp"
 #include "library/causal/sample_data.hpp"
-#include "library/common.hpp"
-#include "library/components/fwd.hpp"
-#include "library/defines.hpp"
-#include "library/timemory.hpp"
 
 #include <timemory/components/base.hpp>
 #include <timemory/macros/language.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/components/blocking_gotcha.cpp

@@ -21,12 +21,12 @@
 // SOFTWARE.
 
 #include "library/causal/components/blocking_gotcha.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
+#include "core/state.hpp"
 #include "library/causal/delay.hpp"
 #include "library/causal/experiment.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
 #include "library/runtime.hpp"
-#include "library/state.hpp"
 
 #include <timemory/components/macros.hpp>
 #include <timemory/hash/types.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/components/blocking_gotcha.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "library/common.hpp"
-#include "library/defines.hpp"
-#include "library/timemory.hpp"
+#include "core/common.hpp"
+#include "core/defines.hpp"
+#include "core/timemory.hpp"
 
 #include <timemory/components/gotcha/backends.hpp>
 #include <timemory/mpl/macros.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/components/causal_gotcha.cpp

@@ -21,9 +21,9 @@
 // SOFTWARE.
 
 #include "library/causal/components/causal_gotcha.hpp"
+#include "core/config.hpp"
 #include "library/causal/components/blocking_gotcha.hpp"
 #include "library/causal/components/unblocking_gotcha.hpp"
-#include "library/config.hpp"
 
 #include <timemory/backends/threading.hpp>
 #include <timemory/utility/macros.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/components/causal_gotcha.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "library/common.hpp"
-#include "library/defines.hpp"
-#include "library/timemory.hpp"
+#include "core/common.hpp"
+#include "core/defines.hpp"
+#include "core/timemory.hpp"
 
 #include <cstdint>
 #include <future>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/components/progress_point.cpp

@@ -21,12 +21,12 @@
 // SOFTWARE.
 
 #include "library/causal/components/progress_point.hpp"
+#include "core/common.hpp"
+#include "core/concepts.hpp"
+#include "core/debug.hpp"
+#include "core/timemory.hpp"
 #include "library/causal/experiment.hpp"
-#include "library/common.hpp"
-#include "library/concepts.hpp"
-#include "library/debug.hpp"
 #include "library/thread_data.hpp"
-#include "library/timemory.hpp"
 
 #include <timemory/hash/types.hpp>
 #include <timemory/mpl/type_traits.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/components/progress_point.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "library/common.hpp"
-#include "library/components/fwd.hpp"
-#include "library/defines.hpp"
+#include "core/common.hpp"
+#include "core/components/fwd.hpp"
+#include "core/defines.hpp"
 
 #include <timemory/components/base.hpp>
 #include <timemory/hash/types.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/components/unblocking_gotcha.cpp

@@ -21,10 +21,10 @@
 // SOFTWARE.
 
 #include "library/causal/components/unblocking_gotcha.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
 #include "library/causal/delay.hpp"
 #include "library/causal/experiment.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
 #include "library/runtime.hpp"
 
 #include <timemory/components/macros.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/components/unblocking_gotcha.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "library/common.hpp"
-#include "library/defines.hpp"
-#include "library/timemory.hpp"
+#include "core/common.hpp"
+#include "core/defines.hpp"
+#include "core/timemory.hpp"
 
 #include <timemory/components/gotcha/backends.hpp>
 #include <timemory/mpl/macros.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/data.cpp

@@ -21,24 +21,24 @@
 // SOFTWARE.
 
 #include "library/causal/data.hpp"
-#include "library/binary/address_multirange.hpp"
-#include "library/binary/analysis.hpp"
-#include "library/binary/binary_info.hpp"
-#include "library/binary/fwd.hpp"
-#include "library/binary/link_map.hpp"
-#include "library/binary/scope_filter.hpp"
+#include "binary/address_multirange.hpp"
+#include "binary/analysis.hpp"
+#include "binary/binary_info.hpp"
+#include "binary/link_map.hpp"
+#include "binary/scope_filter.hpp"
+#include "core/binary/fwd.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
+#include "core/state.hpp"
+#include "core/utility.hpp"
 #include "library/causal/delay.hpp"
 #include "library/causal/experiment.hpp"
 #include "library/causal/sampling.hpp"
 #include "library/causal/selected_entry.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
 #include "library/ptl.hpp"
 #include "library/runtime.hpp"
-#include "library/state.hpp"
 #include "library/thread_data.hpp"
 #include "library/thread_info.hpp"
-#include "library/utility.hpp"
 
 #include <timemory/data/atomic_ring_buffer.hpp>
 #include <timemory/hash/types.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/data.hpp

@@ -22,14 +22,14 @@
 
 #pragma once
 
-#include "library/binary/analysis.hpp"
-#include "library/binary/fwd.hpp"
+#include "binary/analysis.hpp"
+#include "core/binary/fwd.hpp"
+#include "core/containers/c_array.hpp"
+#include "core/containers/static_vector.hpp"
+#include "core/defines.hpp"
+#include "core/utility.hpp"
 #include "library/causal/fwd.hpp"
-#include "library/containers/c_array.hpp"
-#include "library/containers/static_vector.hpp"
-#include "library/defines.hpp"
 #include "library/thread_data.hpp"
-#include "library/utility.hpp"
 
 #include <timemory/hash/types.hpp>
 #include <timemory/tpls/cereal/cereal/cereal.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/delay.cpp

@@ -21,13 +21,13 @@
 // SOFTWARE.
 
 #include "library/causal/delay.hpp"
+#include "core/state.hpp"
+#include "core/utility.hpp"
 #include "library/causal/experiment.hpp"
 #include "library/runtime.hpp"
-#include "library/state.hpp"
 #include "library/thread_data.hpp"
 #include "library/thread_info.hpp"
 #include "library/tracing.hpp"
-#include "library/utility.hpp"
 
 #include <timemory/components/macros.hpp>
 #include <timemory/mpl/concepts.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/delay.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "library/common.hpp"
-#include "library/components/fwd.hpp"
-#include "library/defines.hpp"
+#include "core/common.hpp"
+#include "core/components/fwd.hpp"
+#include "core/defines.hpp"
 #include "library/thread_data.hpp"
 
 #include <timemory/components/base.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/experiment.cpp

@@ -22,13 +22,13 @@
 
 #include "library/causal/experiment.hpp"
 #include "common/defines.h"
+#include "core/config.hpp"
+#include "core/debug.hpp"
+#include "core/state.hpp"
 #include "library/causal/components/backtrace.hpp"
 #include "library/causal/components/progress_point.hpp"
 #include "library/causal/data.hpp"
 #include "library/causal/delay.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
-#include "library/state.hpp"
 #include "library/thread_data.hpp"
 #include "library/thread_info.hpp"
 #include "library/tracing.hpp"

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/experiment.hpp

@@ -22,16 +22,16 @@
 
 #pragma once
 
-#include "library/binary/dwarf_entry.hpp"
-#include "library/binary/symbol.hpp"
+#include "binary/dwarf_entry.hpp"
+#include "binary/symbol.hpp"
+#include "core/containers/c_array.hpp"
+#include "core/defines.hpp"
+#include "core/utility.hpp"
 #include "library/causal/components/backtrace.hpp"
 #include "library/causal/components/progress_point.hpp"
 #include "library/causal/data.hpp"
 #include "library/causal/sample_data.hpp"
 #include "library/causal/selected_entry.hpp"
-#include "library/containers/c_array.hpp"
-#include "library/defines.hpp"
-#include "library/utility.hpp"
 
 #include <timemory/hash/types.hpp>
 #include <timemory/mpl/concepts.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/fwd.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "library/binary/fwd.hpp"
-#include "library/containers/static_vector.hpp"
-#include "library/defines.hpp"
+#include "core/binary/fwd.hpp"
+#include "core/containers/static_vector.hpp"
+#include "core/defines.hpp"
 
 #include <timemory/hash/types.hpp>
 #include <timemory/unwind/stack.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/perf.cpp

@@ -21,8 +21,8 @@
 // SOFTWARE.
 
 #include "library/causal/perf.hpp"
-#include "library/timemory.hpp"
-#include "library/utility.hpp"
+#include "core/timemory.hpp"
+#include "core/utility.hpp"
 
 #include <timemory/log/logger.hpp>
 #include <timemory/log/macros.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/perf.hpp

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "library/containers/c_array.hpp"
-#include "library/defines.hpp"
+#include "core/containers/c_array.hpp"
+#include "core/defines.hpp"
 
 #include <cstddef>
 #include <cstdint>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/sample_data.hpp

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "library/defines.hpp"
-#include "library/timemory.hpp"
+#include "core/defines.hpp"
+#include "core/timemory.hpp"
 
 #include <chrono>
 #include <cstdint>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/sampling.cpp

@@ -21,19 +21,19 @@
 // SOFTWARE.
 
 #include "library/causal/sampling.hpp"
+#include "core/common.hpp"
+#include "core/concepts.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
+#include "core/state.hpp"
+#include "core/utility.hpp"
 #include "library/causal/components/backtrace.hpp"
 #include "library/causal/data.hpp"
-#include "library/common.hpp"
-#include "library/concepts.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
 #include "library/ptl.hpp"
 #include "library/runtime.hpp"
 #include "library/sampling.hpp"
-#include "library/state.hpp"
 #include "library/thread_data.hpp"
 #include "library/thread_info.hpp"
-#include "library/utility.hpp"
 
 #include <timemory/macros.hpp>
 #include <timemory/sampling/allocator.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/sampling.hpp

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "library/concepts.hpp"
-#include "library/defines.hpp"
+#include "core/concepts.hpp"
+#include "core/defines.hpp"
 
 #include <cstdint>
 #include <memory>

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/selected_entry.cpp

@@ -21,8 +21,8 @@
 // SOFTWARE.
 
 #include "library/causal/selected_entry.hpp"
-#include "library/common.hpp"
-#include "library/timemory.hpp"
+#include "core/common.hpp"
+#include "core/timemory.hpp"
 
 namespace omnitrace
 {

projects/rocprofiler-systems/source/lib/omnitrace/library/causal/selected_entry.hpp

@@ -22,12 +22,12 @@
 
 #pragma once
 
-#include "library/binary/dwarf_entry.hpp"
-#include "library/binary/fwd.hpp"
-#include "library/binary/symbol.hpp"
+#include "binary/dwarf_entry.hpp"
+#include "binary/symbol.hpp"
+#include "core/binary/fwd.hpp"
+#include "core/debug.hpp"
+#include "core/defines.hpp"
 #include "library/causal/fwd.hpp"
-#include "library/debug.hpp"
-#include "library/defines.hpp"
 
 #include <timemory/hash/types.hpp>
 #include <timemory/unwind/dlinfo.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/components/CMakeLists.txt

@@ -14,7 +14,6 @@ set(component_sources
     ${CMAKE_CURRENT_LIST_DIR}/pthread_mutex_gotcha.cpp)
 
 set(component_headers
-    ${CMAKE_CURRENT_LIST_DIR}/fwd.hpp
     ${CMAKE_CURRENT_LIST_DIR}/backtrace.hpp
     ${CMAKE_CURRENT_LIST_DIR}/backtrace_metrics.hpp
     ${CMAKE_CURRENT_LIST_DIR}/backtrace_timestamp.hpp

projects/rocprofiler-systems/source/lib/omnitrace/library/components/backtrace.cpp

@@ -20,12 +20,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "library/common.hpp"
+#include "core/common.hpp"
+#include "core/components/fwd.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
+#include "core/perfetto.hpp"
 #include "library/components/ensure_storage.hpp"
-#include "library/components/fwd.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
-#include "library/perfetto.hpp"
 #include "library/ptl.hpp"
 #include "library/runtime.hpp"
 #include "library/sampling.hpp"

projects/rocprofiler-systems/source/lib/omnitrace/library/components/backtrace.hpp

@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include "library/common.hpp"
-#include "library/components/fwd.hpp"
-#include "library/defines.hpp"
+#include "core/common.hpp"
+#include "core/components/fwd.hpp"
+#include "core/defines.hpp"
+#include "core/timemory.hpp"
 #include "library/thread_data.hpp"
-#include "library/timemory.hpp"
 
 #include <timemory/components/base.hpp>
 #include <timemory/macros/language.hpp>

projects/rocprofiler-systems/source/lib/omnitrace/library/components/backtrace_metrics.cpp

@@ -21,11 +21,11 @@
 // SOFTWARE.
 
 #include "library/components/backtrace_metrics.hpp"
+#include "core/components/fwd.hpp"
+#include "core/config.hpp"
+#include "core/debug.hpp"
+#include "core/perfetto.hpp"
 #include "library/components/ensure_storage.hpp"
-#include "library/components/fwd.hpp"
-#include "library/config.hpp"
-#include "library/debug.hpp"
-#include "library/perfetto.hpp"
 #include "library/ptl.hpp"
 #include "library/runtime.hpp"
 #include "library/sampling.hpp"

projects/rocprofiler-systems/source/lib/omnitrace/library/components/backtrace_metrics.hpp

@@ -22,12 +22,12 @@
 
 #pragma once
 
-#include "library/common.hpp"
+#include "core/common.hpp"
+#include "core/components/fwd.hpp"
+#include "core/defines.hpp"
+#include "core/timemory.hpp"
 #include "library/components/backtrace.hpp"
-#include "library/components/fwd.hpp"
-#include "library/defines.hpp"
 #include "library/thread_data.hpp"
-#include "library/timemory.hpp"
 
 #include <timemory/components/base.hpp>
 #include <timemory/components/papi/papi_array.hpp>