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>
Este commit está contenido en:
cometido por
GitHub
padre
fe5d074375
commit
9a0c84efa6
@@ -1,4 +1,4 @@
|
||||
#
|
||||
#
|
||||
#
|
||||
add_subdirectory(rocprofiler)
|
||||
add_subdirectory(rocprofiler-sdk)
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ set(ROCPROFILER_HEADER_FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/version.h)
|
||||
|
||||
install(FILES ${ROCPROFILER_HEADER_FILES}
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler)
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk)
|
||||
|
||||
add_subdirectory(hip)
|
||||
add_subdirectory(hsa)
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
#include <hsakmt/hsakmttypes.h>
|
||||
|
||||
+2
-2
@@ -22,8 +22,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
+3
-3
@@ -22,9 +22,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/agent.h>
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/agent.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
+5
-5
@@ -22,11 +22,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler/hip.h>
|
||||
#include <rocprofiler/hsa.h>
|
||||
#include <rocprofiler/marker.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
#include <rocprofiler-sdk/hip.h>
|
||||
#include <rocprofiler-sdk/hsa.h>
|
||||
#include <rocprofiler-sdk/marker.h>
|
||||
|
||||
#include <hsa/hsa_ven_amd_loader.h>
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
@@ -22,9 +22,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/agent.h>
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/agent.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
+5
-5
@@ -22,11 +22,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/agent.h>
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler/hsa.h>
|
||||
#include <rocprofiler/profile_config.h>
|
||||
#include <rocprofiler-sdk/agent.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
#include <rocprofiler-sdk/hsa.h>
|
||||
#include <rocprofiler-sdk/profile_config.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
+2
-2
@@ -22,8 +22,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
@@ -22,5 +22,5 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/hip/api_args.h>
|
||||
#include <rocprofiler/hip/api_id.h>
|
||||
#include <rocprofiler-sdk/hip/api_args.h>
|
||||
#include <rocprofiler-sdk/hip/api_id.h>
|
||||
+1
-1
@@ -6,4 +6,4 @@
|
||||
set(ROCPROFILER_HIP_HEADER_FILES api_args.h api_id.h)
|
||||
|
||||
install(FILES ${ROCPROFILER_HIP_HEADER_FILES}
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler/hip)
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/hip)
|
||||
@@ -32,9 +32,9 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <rocprofiler/hsa/api_args.h>
|
||||
#include <rocprofiler/hsa/api_id.h>
|
||||
#include <rocprofiler/hsa/table_api_id.h>
|
||||
#include <rocprofiler-sdk/hsa/api_args.h>
|
||||
#include <rocprofiler-sdk/hsa/api_id.h>
|
||||
#include <rocprofiler-sdk/hsa/table_api_id.h>
|
||||
|
||||
#include <hsa/hsa.h>
|
||||
|
||||
+1
-1
@@ -6,4 +6,4 @@
|
||||
set(ROCPROFILER_HSA_HEADER_FILES api_args.h api_id.h table_api_id.h)
|
||||
|
||||
install(FILES ${ROCPROFILER_HSA_HEADER_FILES}
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler/hsa)
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/hsa)
|
||||
+1
-1
@@ -26,7 +26,7 @@
|
||||
#include <hsa/hsa_api_trace.h>
|
||||
#include <hsa/hsa_ext_amd.h>
|
||||
#include <hsa/hsa_ext_image.h>
|
||||
#include <rocprofiler/version.h>
|
||||
#include <rocprofiler-sdk/version.h>
|
||||
|
||||
typedef union rocprofiler_hsa_api_retval_u
|
||||
{
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/version.h>
|
||||
#include <rocprofiler-sdk/version.h>
|
||||
|
||||
/**
|
||||
* @brief ROCProfiler enumeration of HSA API tracing operations
|
||||
+2
-2
@@ -22,8 +22,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
+2
-2
@@ -22,8 +22,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
@@ -22,5 +22,5 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/marker/api_args.h>
|
||||
#include <rocprofiler/marker/api_id.h>
|
||||
#include <rocprofiler-sdk/marker/api_args.h>
|
||||
#include <rocprofiler-sdk/marker/api_id.h>
|
||||
+1
-1
@@ -6,4 +6,4 @@
|
||||
set(ROCPROFILER_MARKER_HEADER_FILES api_args.h api_id.h)
|
||||
|
||||
install(FILES ${ROCPROFILER_MARKER_HEADER_FILES}
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler/marker)
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/marker)
|
||||
+4
-4
@@ -22,9 +22,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/agent.h>
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/agent.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
@@ -292,4 +292,4 @@ struct rocprofiler_pc_sampling_record_s
|
||||
|
||||
/** @} */
|
||||
|
||||
ROCPROFILER_EXTERN_C_FINI
|
||||
ROCPROFILER_EXTERN_C_FINI
|
||||
+3
-3
@@ -22,9 +22,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/agent.h>
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/agent.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
+3
-3
@@ -22,8 +22,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
@@ -109,7 +109,7 @@ rocprofiler_is_finalized(int* status) ROCPROFILER_API;
|
||||
* @return rocprofiler_tool_configure_result_t*
|
||||
*
|
||||
* @code{.cpp}
|
||||
* #include <rocprofiler/registration.h>
|
||||
* #include <rocprofiler-sdk/registration.h>
|
||||
*
|
||||
* static rocprofiler_client_id_t my_client_id;
|
||||
* static rocprofiler_client_finalize_t my_fini_func;
|
||||
+20
-20
@@ -25,8 +25,8 @@
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "rocprofiler/defines.h"
|
||||
#include "rocprofiler/fwd.h"
|
||||
#include "rocprofiler-sdk/defines.h"
|
||||
#include "rocprofiler-sdk/fwd.h"
|
||||
|
||||
/**
|
||||
* @defgroup VERSIONING_GROUP Library Versioning
|
||||
@@ -40,7 +40,7 @@
|
||||
* @{
|
||||
*/
|
||||
|
||||
#include "rocprofiler/version.h"
|
||||
#include "rocprofiler-sdk/version.h"
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
@@ -64,23 +64,23 @@ ROCPROFILER_EXTERN_C_FINI
|
||||
|
||||
/** @} */
|
||||
|
||||
#include "rocprofiler/agent.h"
|
||||
// #include "rocprofiler/agent_profile.h"
|
||||
#include "rocprofiler/buffer.h"
|
||||
#include "rocprofiler/buffer_tracing.h"
|
||||
#include "rocprofiler/callback_tracing.h"
|
||||
#include "rocprofiler/context.h"
|
||||
#include "rocprofiler/counters.h"
|
||||
#include "rocprofiler/dispatch_profile.h"
|
||||
#include "rocprofiler/external_correlation.h"
|
||||
#include "rocprofiler/hip.h"
|
||||
#include "rocprofiler/hsa.h"
|
||||
#include "rocprofiler/intercept_table.h"
|
||||
#include "rocprofiler/internal_threading.h"
|
||||
// #include "rocprofiler/marker.h"
|
||||
#include "rocprofiler/pc_sampling.h"
|
||||
#include "rocprofiler/profile_config.h"
|
||||
// #include "rocprofiler/spm.h"
|
||||
#include "rocprofiler-sdk/agent.h"
|
||||
// #include "rocprofiler-sdk/agent_profile.h"
|
||||
#include "rocprofiler-sdk/buffer.h"
|
||||
#include "rocprofiler-sdk/buffer_tracing.h"
|
||||
#include "rocprofiler-sdk/callback_tracing.h"
|
||||
#include "rocprofiler-sdk/context.h"
|
||||
#include "rocprofiler-sdk/counters.h"
|
||||
#include "rocprofiler-sdk/dispatch_profile.h"
|
||||
#include "rocprofiler-sdk/external_correlation.h"
|
||||
#include "rocprofiler-sdk/hip.h"
|
||||
#include "rocprofiler-sdk/hsa.h"
|
||||
#include "rocprofiler-sdk/intercept_table.h"
|
||||
#include "rocprofiler-sdk/internal_threading.h"
|
||||
// #include "rocprofiler-sdk/marker.h"
|
||||
#include "rocprofiler-sdk/pc_sampling.h"
|
||||
#include "rocprofiler-sdk/profile_config.h"
|
||||
// #include "rocprofiler-sdk/spm.h"
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "rocprofiler/rocprofiler.h"
|
||||
#include "rocprofiler-sdk/rocprofiler.h"
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <rocprofiler/defines.h>
|
||||
#include <rocprofiler/fwd.h>
|
||||
#include <rocprofiler-sdk/defines.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
ROCPROFILER_EXTERN_C_INIT
|
||||
|
||||
Referencia en una nueva incidencia
Block a user