Use -sdk suffix and reset VERSION to 0.0.0 (#263)

* Fix find_package(rocprofiler) in build tree

* Move include/rocprofiler to include/rocprofiler-sdk

* Update include/CMakeLists.txt

- add_subdirectory(rocprofiler-sdk)

* Move lib/rocprofiler to lib/rocprofiler-sdk

* Move lib/rocprofiler-tool to lib/rocprofiler-sdk-tool

* Update lib/CMakeLists.txt

- add_subdirectory(rocprofiler-sdk)
- add_subdirectory(rocprofiler-sdk-tool)

* Update lib/rocprofiler-sdk/CMakeLists.txt

* Rename rocprofiler-tool to rocprofiler-sdk-tool

* Replace include rocprofiler/ with include rocprofiler-sdk/

* Replace include lib/rocprofiler/ with include lib/rocprofiler-sdk/

* Set VERSION to 0.0.0 and finish install to rocprofiler-sdk

* More fixes for rocprofiler -> rocprofiler-sdk

- fix issue with rocprofiler-sdk-config.cmake.in
- fix counters xml install path

* Fix documentation generation

* Create rocprofiler_LIB_ROCPROFILER_SDK_DIR for build tree

* cmake formatting (cmake-format) (#264)

Co-authored-by: jrmadsen <jrmadsen@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

source/lib/CMakeLists.txt

@@ -2,8 +2,8 @@
 #
 #
 add_subdirectory(common)
-add_subdirectory(rocprofiler)
-add_subdirectory(rocprofiler-tool)
+add_subdirectory(rocprofiler-sdk)
+add_subdirectory(rocprofiler-sdk-tool)
 add_subdirectory(plugins)
 
 if(ROCPROFILER_BUILD_TESTS)

source/lib/common/container/record_header_buffer.cpp

@@ -22,7 +22,7 @@
 
 #include "lib/common/container/record_header_buffer.hpp"
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 #include <algorithm>
 #include <atomic>
 #include <new>

source/lib/common/container/record_header_buffer.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/container/ring_buffer.hpp"
 

source/lib/common/defines.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
+#include <rocprofiler-sdk/defines.h>
 
 #define ROCPROFILER_VISIBILITY(MODE)  ROCPROFILER_ATTRIBUTE(visibility(MODE))
 #define ROCPROFILER_INTERNAL_API      ROCPROFILER_VISIBILITY("internal")

source/lib/rocprofiler-sdk-tool/CMakeLists.txt

@@ -2,10 +2,11 @@
 # Tool library used by rocprofiler
 #
 
-add_library(rocprofiler-tool SHARED)
-target_sources(rocprofiler-tool PRIVATE helper.hpp helper.cpp tool.cpp trace_buffer.hpp)
+add_library(rocprofiler-sdk-tool SHARED)
+target_sources(rocprofiler-sdk-tool PRIVATE helper.hpp helper.cpp tool.cpp
+                                            trace_buffer.hpp)
 target_link_libraries(
-    rocprofiler-tool
+    rocprofiler-sdk-tool
     PRIVATE rocprofiler::rocprofiler-shared-library
             rocprofiler::rocprofiler-hsa-runtime
             rocprofiler::rocprofiler-headers
@@ -16,9 +17,9 @@ target_link_libraries(
             atomic)
 
 set_target_properties(
-    rocprofiler-tool
+    rocprofiler-sdk-tool
     PROPERTIES LIBRARY_OUTPUT_DIRECTORY
-               ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/rocprofiler
+               ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/rocprofiler-sdk
                SOVERSION ${PROJECT_VERSION_MAJOR}
                VERSION ${PROJECT_VERSION}
                SKIP_BUILD_RPATH OFF
@@ -26,7 +27,7 @@ set_target_properties(
                INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..")
 
 install(
-    TARGETS rocprofiler-tool
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
+    TARGETS rocprofiler-sdk-tool
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofiler-sdk
     COMPONENT tools
-    EXPORT ${PROJECT_NAME}-library-targets)
+    EXPORT rocprofiler-sdk-library-targets)

source/lib/rocprofiler-sdk-tool/README.md

@@ -3,12 +3,12 @@
 This is a tool that gets registered with the
 rocprofiler to obtain its services.
 The tool is built as a shared library and is named as
-rocprofiler-tool.
+rocprofiler-sdk-tool.
 The library can be preloaded using LD_PRELOAD
 to facilitate its registration as a tool
 with the rocprofiler.
 
-The user through rocprofv2 script can select the
+The user through rocprofv3 script can select the
 options to obtain tracing and counter collection
 services from the rocprofiler.
 

source/lib/rocprofiler-sdk-tool/helper.hpp

@@ -43,8 +43,8 @@
 #include <hsa/hsa_ext_amd.h>
 #include <hsa/hsa_ven_amd_aqlprofile.h>
 #include <hsa/hsa_ven_amd_loader.h>
-#include <rocprofiler/registration.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/registration.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #define ROCPROFILER_CALL(result, msg)                                                              \
     {                                                                                              \

source/lib/rocprofiler-sdk/CMakeLists.txt

@@ -81,7 +81,7 @@ target_link_libraries(
 
 set_target_properties(
     rocprofiler-shared-library
-    PROPERTIES OUTPUT_NAME rocprofiler64
+    PROPERTIES OUTPUT_NAME rocprofiler-sdk
                SOVERSION ${PROJECT_VERSION_MAJOR}
                VERSION ${PROJECT_VERSION}
                SKIP_BUILD_RPATH OFF
@@ -90,13 +90,12 @@ set_target_properties(
                DEFINE_SYMBOL rocprofiler_EXPORTS)
 
 add_library(rocprofiler::rocprofiler-library ALIAS rocprofiler-shared-library)
-add_library(rocprofiler::rocprofiler ALIAS rocprofiler-shared-library)
 
 install(
     TARGETS rocprofiler-shared-library
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
     COMPONENT core
-    EXPORT ${PROJECT_NAME}-library-targets)
+    EXPORT rocprofiler-sdk-library-targets)
 
 # ----------------------------------------------------------------------------------------#
 #
@@ -117,8 +116,8 @@ target_link_libraries(
             rocprofiler::rocprofiler-object-library)
 
 set_target_properties(
-    rocprofiler-static-library PROPERTIES OUTPUT_NAME rocprofiler64 DEFINE_SYMBOL
-                                                                    rocprofiler_EXPORTS)
+    rocprofiler-static-library PROPERTIES OUTPUT_NAME rocprofiler-sdk DEFINE_SYMBOL
+                                                                      rocprofiler_EXPORTS)
 
 # ----------------------------------------------------------------------------------------#
 #

source/lib/rocprofiler-sdk/agent.cpp

@@ -20,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/agent.h>
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/agent.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/filesystem.hpp"
-#include "lib/rocprofiler/agent.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/agent.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
 
 #include <fmt/core.h>
 #include <glog/logging.h>

source/lib/rocprofiler-sdk/agent.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <rocprofiler/agent.h>
+#include <rocprofiler-sdk/agent.h>
 
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
 
 #include <hsa/hsa_api_trace.h>
 

source/lib/rocprofiler-sdk/allocator.cpp

@@ -20,8 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/allocator.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/allocator.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <glog/logging.h>
 

source/lib/rocprofiler-sdk/aql/helpers.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
 
 #include <fmt/core.h>
 #include <glog/logging.h>

source/lib/rocprofiler-sdk/aql/helpers.hpp

@@ -26,7 +26,7 @@
 
 #include <hsa/hsa_ven_amd_aqlprofile.h>
 
-#include "lib/rocprofiler/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/aql/intercept.cpp

@@ -20,9 +20,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/aql/intercept.hpp"
+#include "lib/rocprofiler-sdk/aql/intercept.hpp"
 
-#include "lib/rocprofiler/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/aql/packet_construct.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/aql/packet_construct.hpp"
+#include "lib/rocprofiler-sdk/aql/packet_construct.hpp"
 
 #include <fmt/core.h>
 #include <hsa/hsa_ext_amd.h>

source/lib/rocprofiler-sdk/aql/packet_construct.hpp

@@ -30,10 +30,10 @@
 #include <hsa/hsa_api_trace.h>
 #include <hsa/hsa_ven_amd_aqlprofile.h>
 
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
-#include "lib/rocprofiler/hsa/queue.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue.hpp"
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/aql/tests/aql_test.cpp

@@ -31,12 +31,12 @@
 #include <hsa/hsa_api_trace.h>
 #include <hsa/hsa_ven_amd_aqlprofile.h>
 
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/aql/packet_construct.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
-#include "lib/rocprofiler/hsa/queue.hpp"
-#include "lib/rocprofiler/hsa/queue_controller.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/aql/packet_construct.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp"
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/buffer.cpp

@@ -20,18 +20,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/buffer.hpp"
+#include "lib/rocprofiler-sdk/buffer.hpp"
 
 #include <glog/logging.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/container/stable_vector.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/context/domain.hpp"
-#include "lib/rocprofiler/hsa/hsa.hpp"
-#include "lib/rocprofiler/internal_threading.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/internal_threading.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <atomic>
 #include <exception>

source/lib/rocprofiler-sdk/buffer.hpp

@@ -22,13 +22,13 @@
 
 #pragma once
 
-#include <rocprofiler/buffer.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/buffer.h>
+#include <rocprofiler-sdk/fwd.h>
 
 #include "lib/common/container/record_header_buffer.hpp"
 #include "lib/common/container/stable_vector.hpp"
 #include "lib/common/demangle.hpp"
-#include "lib/rocprofiler/allocator.hpp"
+#include "lib/rocprofiler-sdk/allocator.hpp"
 
 #include <array>
 #include <atomic>

source/lib/rocprofiler-sdk/buffer_tracing.cpp

@@ -20,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/context/domain.hpp"
-#include "lib/rocprofiler/hsa/hsa.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <glog/logging.h>
 

source/lib/rocprofiler-sdk/callback_tracing.cpp

@@ -20,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/context/domain.hpp"
-#include "lib/rocprofiler/hsa/hsa.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <glog/logging.h>
 

source/lib/rocprofiler-sdk/context.cpp

@@ -20,14 +20,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/context.h>
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/context.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/context/domain.hpp"
-#include "lib/rocprofiler/hsa/hsa.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <atomic>
 #include <vector>

source/lib/rocprofiler-sdk/context/context.cpp

@@ -20,16 +20,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/buffer_tracing.h>
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/buffer_tracing.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/container/stable_vector.hpp"
 #include "lib/common/synchronized.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/buffer.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/counters/core.hpp"
+#include "lib/rocprofiler-sdk/buffer.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/counters/core.hpp"
 
 #include <glog/logging.h>
 

source/lib/rocprofiler-sdk/context/context.hpp

@@ -22,17 +22,17 @@
 
 #pragma once
 
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/registration.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/registration.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/container/small_vector.hpp"
 #include "lib/common/container/stable_vector.hpp"
 #include "lib/common/synchronized.hpp"
-#include "lib/rocprofiler/allocator.hpp"
-#include "lib/rocprofiler/context/domain.hpp"
-#include "lib/rocprofiler/counters/core.hpp"
-#include "lib/rocprofiler/external_correlation.hpp"
+#include "lib/rocprofiler-sdk/allocator.hpp"
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include "lib/rocprofiler-sdk/counters/core.hpp"
+#include "lib/rocprofiler-sdk/external_correlation.hpp"
 
 #include <array>
 #include <atomic>

source/lib/rocprofiler-sdk/context/domain.cpp

@@ -20,8 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/context/domain.hpp"
-#include <rocprofiler/rocprofiler.h>
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include <rocprofiler-sdk/rocprofiler.h>
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/context/domain.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/mpl.hpp"
 

source/lib/rocprofiler-sdk/counters.cpp

@@ -20,18 +20,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include <fmt/core.h>
 
 #include "lib/common/synchronized.hpp"
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/counters/evaluate_ast.hpp"
-#include "lib/rocprofiler/counters/id_decode.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
-#include "lib/rocprofiler/hsa/queue.hpp"
-#include "lib/rocprofiler/hsa/queue_controller.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp"
+#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp"
 
 extern "C" {
 /**

source/lib/rocprofiler-sdk/counters/core.cpp

@@ -20,18 +20,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/counters/core.hpp"
+#include "lib/rocprofiler-sdk/counters/core.hpp"
 
 #include "lib/common/synchronized.hpp"
-#include "lib/rocprofiler/agent.hpp"
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/aql/packet_construct.hpp"
-#include "lib/rocprofiler/buffer.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/hsa/queue_controller.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/agent.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/aql/packet_construct.hpp"
+#include "lib/rocprofiler-sdk/buffer.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/counters/core.hpp

@@ -22,14 +22,14 @@
 
 #pragma once
 
-#include <rocprofiler/agent.h>
-#include <rocprofiler/dispatch_profile.h>
+#include <rocprofiler-sdk/agent.h>
+#include <rocprofiler-sdk/dispatch_profile.h>
 
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/aql/packet_construct.hpp"
-#include "lib/rocprofiler/counters/evaluate_ast.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/aql/packet_construct.hpp"
+#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/counters/dimensions.cpp

@@ -31,9 +31,9 @@
 
 #include "lib/common/synchronized.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/aql/packet_construct.hpp"
-#include "lib/rocprofiler/hsa/queue_controller.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/aql/packet_construct.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp"
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/counters/dimensions.hpp

@@ -29,8 +29,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "lib/rocprofiler/counters/id_decode.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/counters/evaluate_ast.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/counters/evaluate_ast.hpp"
+#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp"
 #include <fmt/core.h>
 
 #include <exception>
@@ -30,8 +30,8 @@
 #include <stdexcept>
 #include "lib/common/synchronized.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/counters/dimensions.hpp"
-#include "lib/rocprofiler/counters/parser/reader.hpp"
+#include "lib/rocprofiler-sdk/counters/dimensions.hpp"
+#include "lib/rocprofiler-sdk/counters/parser/reader.hpp"
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/counters/evaluate_ast.hpp

@@ -28,10 +28,10 @@
 #include <unordered_map>
 
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/aql/packet_construct.hpp"
-#include "lib/rocprofiler/counters/dimensions.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/counters/parser/raw_ast.hpp"
+#include "lib/rocprofiler-sdk/aql/packet_construct.hpp"
+#include "lib/rocprofiler-sdk/counters/dimensions.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/counters/parser/raw_ast.hpp"
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/counters/id_decode.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/counters/id_decode.hpp"
+#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
 
 #include <string>
 #include <unordered_map>

source/lib/rocprofiler-sdk/counters/id_decode.hpp

@@ -24,7 +24,7 @@
 
 #include <unordered_map>
 
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/fwd.h>
 
 #include <glog/logging.h>
 

source/lib/rocprofiler-sdk/counters/metrics.cpp

@@ -22,14 +22,14 @@
 
 #include "metrics.hpp"
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/defines.hpp"
 #include "lib/common/filesystem.hpp"
 #include "lib/common/synchronized.hpp"
 #include "lib/common/utility.hpp"
 #include "lib/common/xml.hpp"
-#include "lib/rocprofiler/agent.hpp"
+#include "lib/rocprofiler-sdk/agent.hpp"
 
 #include "dimensions.hpp"
 #include "glog/logging.h"
@@ -145,7 +145,7 @@ findViaInstallPath(const std::string& filename)
     if(dladdr(reinterpret_cast<const void*>(rocprofiler_query_available_agents), &dl_info) != 0)
     {
         return common::filesystem::path{dl_info.dli_fname}.parent_path().parent_path() /
-               fmt::format("share/rocprofiler/{}", filename);
+               fmt::format("share/rocprofiler-sdk/{}", filename);
     }
     return filename;
 }
@@ -167,13 +167,19 @@ findViaEnvironment(const std::string& filename)
 MetricMap
 getDerivedHardwareMetrics()
 {
-    return loadXml(findViaEnvironment("derived_counters.xml"));
+    auto counters_path = findViaEnvironment("derived_counters.xml");
+    LOG_IF(FATAL, !common::filesystem::exists(counters_path))
+        << "metric xml file '" << counters_path << "' does not exist";
+    return loadXml(counters_path);
 }
 
 MetricMap
 getBaseHardwareMetrics()
 {
-    return loadXml(findViaEnvironment("basic_counters.xml"), true);
+    auto counters_path = findViaEnvironment("basic_counters.xml");
+    LOG_IF(FATAL, !common::filesystem::exists(counters_path))
+        << "metric xml file '" << counters_path << "' does not exist";
+    return loadXml(counters_path, true);
 }
 
 const MetricIdMap&

source/lib/rocprofiler-sdk/counters/parser/raw_ast.hpp

@@ -36,7 +36,7 @@
 #include <glog/logging.h>
 
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/counters/id_decode.hpp"
+#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
 
 namespace rocprofiler
 {

source/lib/rocprofiler-sdk/counters/parser/tests/parser_test.cpp

@@ -26,8 +26,8 @@
 
 #include <gtest/gtest.h>
 
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/counters/parser/reader.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/counters/parser/reader.hpp"
 
 TEST(parser, base_ops)
 {

source/lib/rocprofiler-sdk/counters/tests/dimension.cpp

@@ -23,7 +23,7 @@
 #include <gtest/gtest.h>
 
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/counters/id_decode.hpp"
+#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
 
 TEST(dimension, set_get)
 {

source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.cpp

@@ -28,8 +28,8 @@
 #include <gtest/gtest.h>
 
 #include "evaluate_ast_test.hpp"
-#include "lib/rocprofiler/agent.hpp"
-#include "lib/rocprofiler/counters/parser/reader.hpp"
+#include "lib/rocprofiler-sdk/agent.hpp"
+#include "lib/rocprofiler-sdk/counters/parser/reader.hpp"
 
 namespace
 {

source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.hpp

@@ -25,7 +25,7 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include "lib/rocprofiler/counters/evaluate_ast.hpp"
+#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp"
 
 struct test_data
 {

source/lib/rocprofiler-sdk/counters/tests/metrics_test.cpp

@@ -25,8 +25,8 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "lib/rocprofiler/agent.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/agent.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
 
 namespace
 {

source/lib/rocprofiler-sdk/counters/xml/CMakeLists.txt

@@ -0,0 +1,10 @@
+configure_file(basic_counters.xml
+               ${PROJECT_BINARY_DIR}/share/rocprofiler-sdk/basic_counters.xml COPYONLY)
+configure_file(derived_counters.xml
+               ${PROJECT_BINARY_DIR}/share/rocprofiler-sdk/derived_counters.xml COPYONLY)
+
+install(
+    FILES ${PROJECT_BINARY_DIR}/share/rocprofiler-sdk/basic_counters.xml
+          ${PROJECT_BINARY_DIR}/share/rocprofiler-sdk/derived_counters.xml
+    DESTINATION share/rocprofiler-sdk
+    COMPONENT core)

source/lib/rocprofiler-sdk/dispatch_profile.cpp

@@ -20,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/counters/core.hpp"
-#include "lib/rocprofiler/counters/evaluate_ast.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/counters/core.hpp"
+#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
 
 extern "C" {
 /**

source/lib/rocprofiler-sdk/external_correlation.cpp

@@ -20,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/external_correlation.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/external_correlation.h>
+#include <rocprofiler-sdk/fwd.h>
 
 #include "lib/common/synchronized.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/external_correlation.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/external_correlation.hpp"
 
 #include <unistd.h>
 

source/lib/rocprofiler-sdk/external_correlation.hpp

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/external_correlation.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/external_correlation.h>
+#include <rocprofiler-sdk/fwd.h>
 
 #include "lib/common/defines.hpp"
 #include "lib/common/synchronized.hpp"

source/lib/rocprofiler-sdk/hsa/agent_cache.hpp

@@ -34,7 +34,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include <rocprofiler/agent.h>
+#include <rocprofiler-sdk/agent.h>
 #include "lib/common/utility.hpp"
 
 // Construct const and non-const accessor functions

source/lib/rocprofiler-sdk/hsa/aql_packet.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include "lib/rocprofiler/hsa/aql_packet.hpp"
+#include "lib/rocprofiler-sdk/hsa/aql_packet.hpp"
 
 #include <cstdlib>
 

source/lib/rocprofiler-sdk/hsa/code_object.cpp

@@ -20,18 +20,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include "lib/rocprofiler/hsa/code_object.hpp"
+#include "lib/rocprofiler-sdk/hsa/code_object.hpp"
 #include "lib/common/scope_destructor.hpp"
 #include "lib/common/synchronized.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/agent.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/agent.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
 
 #include <hsa/hsa.h>
-#include <rocprofiler/callback_tracing.h>
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/hsa.h>
+#include <rocprofiler-sdk/callback_tracing.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/hsa.h>
 
 #include <glog/logging.h>
 #include <hsa/hsa_api_trace.h>

source/lib/rocprofiler-sdk/hsa/details/ostream.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include <iostream>
 #include <string>

source/lib/rocprofiler-sdk/hsa/hsa.cpp

@@ -20,18 +20,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include "lib/rocprofiler/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
 #include "lib/common/defines.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/buffer.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/hsa/details/ostream.hpp"
-#include "lib/rocprofiler/hsa/types.hpp"
-#include "lib/rocprofiler/hsa/utils.hpp"
+#include "lib/rocprofiler-sdk/buffer.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/hsa/details/ostream.hpp"
+#include "lib/rocprofiler-sdk/hsa/types.hpp"
+#include "lib/rocprofiler-sdk/hsa/utils.hpp"
 
-#include <rocprofiler/buffer.h>
-#include <rocprofiler/callback_tracing.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/buffer.h>
+#include <rocprofiler-sdk/callback_tracing.h>
+#include <rocprofiler-sdk/fwd.h>
 
 #include <glog/logging.h>
 

source/lib/rocprofiler-sdk/hsa/hsa.def.cpp

@@ -23,7 +23,7 @@
 #if defined(ROCPROFILER_LIB_ROCPROFILER_HSA_HSA_CPP_IMPL) &&                                       \
     ROCPROFILER_LIB_ROCPROFILER_HSA_HSA_CPP_IMPL == 1
 
-#    include <rocprofiler/hsa.h>
+#    include <rocprofiler-sdk/hsa.h>
 
 #    include "defines.hpp"
 #    include "hsa.hpp"

source/lib/rocprofiler-sdk/hsa/hsa.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include <cstdint>
 #include <vector>

source/lib/rocprofiler-sdk/hsa/queue.cpp

@@ -20,16 +20,16 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE. */
 
-#include "lib/rocprofiler/hsa/queue.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/buffer.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/hsa/code_object.hpp"
+#include "lib/rocprofiler-sdk/buffer.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/hsa/code_object.hpp"
 
 #include <glog/logging.h>
 #include <hsa/hsa.h>
 #include <hsa/hsa_ext_amd.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/fwd.h>
 
 #include <atomic>
 #include <chrono>

source/lib/rocprofiler-sdk/hsa/queue.hpp

@@ -22,14 +22,14 @@
 
 #pragma once
 
-#include <rocprofiler/buffer_tracing.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/buffer_tracing.h>
+#include <rocprofiler-sdk/fwd.h>
 
 #include "lib/common/container/small_vector.hpp"
 #include "lib/common/synchronized.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
-#include "lib/rocprofiler/hsa/aql_packet.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/hsa/aql_packet.hpp"
 
 #include <hsa/amd_hsa_kernel_code.h>
 #include <hsa/hsa.h>

source/lib/rocprofiler-sdk/hsa/queue_controller.cpp

@@ -20,12 +20,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include "lib/rocprofiler/hsa/queue_controller.hpp"
-#include "lib/rocprofiler/agent.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp"
+#include "lib/rocprofiler-sdk/agent.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
 
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/fwd.h>
 
 #include <glog/logging.h>
 

source/lib/rocprofiler-sdk/hsa/queue_controller.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
-#include "lib/rocprofiler/hsa/queue.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue.hpp"
 
 #include <cstdint>
 #include <optional>

source/lib/rocprofiler-sdk/hsa/types.hpp

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/hsa.h>
-#include <rocprofiler/version.h>
+#include <rocprofiler-sdk/hsa.h>
+#include <rocprofiler-sdk/version.h>
 
 #include "lib/common/defines.hpp"
 

source/lib/rocprofiler-sdk/hsa/utils.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/version.h>
+#include <rocprofiler-sdk/version.h>
 
 #include <hsa/hsa_ext_amd.h>
 

source/lib/rocprofiler-sdk/intercept_table.cpp

@@ -20,16 +20,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/intercept_table.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/intercept_table.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/container/stable_vector.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/buffer.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/internal_threading.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/buffer.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/internal_threading.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <hsa/hsa_api_trace.h>
 

source/lib/rocprofiler-sdk/intercept_table.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/intercept_table.h>
+#include <rocprofiler-sdk/intercept_table.h>
 
 #include <tuple>
 

source/lib/rocprofiler-sdk/internal_threading.cpp

@@ -20,17 +20,17 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/internal_threading.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/internal_threading.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/container/stable_vector.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/allocator.hpp"
-#include "lib/rocprofiler/buffer.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/internal_threading.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/allocator.hpp"
+#include "lib/rocprofiler-sdk/buffer.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/internal_threading.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <cstdint>
 #include <mutex>

source/lib/rocprofiler-sdk/internal_threading.hpp

@@ -22,12 +22,12 @@
 
 #pragma once
 
-#include <rocprofiler/internal_threading.h>
+#include <rocprofiler-sdk/internal_threading.h>
 
 #include "lib/common/container/stable_vector.hpp"
 #include "lib/common/defines.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/allocator.hpp"
+#include "lib/rocprofiler-sdk/allocator.hpp"
 
 #include <PTL/TaskGroup.hh>
 #include <PTL/ThreadPool.hh>

source/lib/rocprofiler-sdk/pc_sampling.cpp

@@ -20,10 +20,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/pc_sampling.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/pc_sampling.h>
 
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 namespace
 {

source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include "lib/rocprofiler/pc_sampling/parser/correlation.hpp"
+#include "lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp"
 
 template <>
 struct std::hash<device_handle>

source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp

@@ -28,7 +28,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "lib/rocprofiler/pc_sampling/parser/translation.hpp"
+#include "lib/rocprofiler-sdk/pc_sampling/parser/translation.hpp"
 
 #if 0
 template <>