natas_hw
/
openvino
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support different names for ITTAPI (#17889)

This commit is contained in:
Ilya Lavrenov 2023-06-08 11:08:58 +04:00 committed by GitHub
parent 912e4b6f0d
commit bdfa970c7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/itt/CMakeLists.txt
View File

@ -12,7 +12,8 @@ add_library(openvino::itt ALIAS ${TARGET_NAME})
target_link_libraries(${TARGET_NAME} PUBLIC openvino::util)
if(ENABLE_PROFILING_ITT)
target_link_libraries(${TARGET_NAME} PUBLIC ittapi::ittapi)
target_link_libraries(${TARGET_NAME} PUBLIC
$<IF:$<TARGET_EXISTS:ittapi::ittnotify>,ittapi::ittnotify,ittapi::ittapi>)
if(ENABLE_PROFILING_FILTER STREQUAL "ALL")
target_compile_definitions(${TARGET_NAME} PUBLIC
ENABLE_PROFILING_ALL

10
src/common/itt/cmake/ITTConfig.cmake
View File

@ -47,12 +47,12 @@ find_package_handle_standard_args(ITT
if(ITT_FOUND)
set(INTEL_ITT_FOUND ${ITT_FOUND})
add_library(ittapi::ittapi STATIC IMPORTED GLOBAL)
set_target_properties(ittapi::ittapi PROPERTIES IMPORTED_LOCATION "${Located_ITT_LIBS}"
INTERFACE_INCLUDE_DIRECTORIES ${Located_ITT_INCLUDE_DIRS}
INTERFACE_COMPILE_DEFINITIONS ENABLE_PROFILING_ITT)
add_library(ittapi::ittnotify STATIC IMPORTED GLOBAL)
set_target_properties(ittapi::ittnotify PROPERTIES IMPORTED_LOCATION "${Located_ITT_LIBS}"
INTERFACE_INCLUDE_DIRECTORIES ${Located_ITT_INCLUDE_DIRS}
INTERFACE_COMPILE_DEFINITIONS ENABLE_PROFILING_ITT)
if(UNIX)
set_target_properties(ittapi::ittapi PROPERTIES INTERFACE_LINK_LIBRARIES "${CMAKE_DL_LIBS};Threads::Threads")
set_target_properties(ittapi::ittnotify PROPERTIES INTERFACE_LINK_LIBRARIES "${CMAKE_DL_LIBS};Threads::Threads")
endif()
endif()

12
thirdparty/dependencies.cmake vendored
View File

@ -29,9 +29,15 @@ endif()
if(ENABLE_PROFILING_ITT)
find_package(ittapi QUIET)
if(ittapi_FOUND)
# conan defines 'ittapi::ittapi' target
set_target_properties(ittapi::ittapi PROPERTIES
INTERFACE_COMPILE_DEFINITIONS ENABLE_PROFILING_ITT)
if(TARGET ittapi::ittapi)
# conan defines 'ittapi::ittapi' target
set_target_properties(ittapi::ittapi PROPERTIES
INTERFACE_COMPILE_DEFINITIONS ENABLE_PROFILING_ITT)
elseif(TARGET ittapi::ittnotify)
# official 'ittapi::ittnotify' target
set_target_properties(ittapi::ittnotify PROPERTIES
INTERFACE_COMPILE_DEFINITIONS ENABLE_PROFILING_ITT)
endif()
else()
add_subdirectory(thirdparty/ittapi)
endif()

2
thirdparty/itt_collector/sea_itt_lib/CMakeLists.txt vendored
View File

@ -27,7 +27,7 @@ add_library(${TARGET_NAME} SHARED ${SOURCES})
target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME IntelSEAPI)
target_link_libraries(${TARGET_NAME} PRIVATE ittapi::ittapi)
target_link_libraries(${TARGET_NAME} PRIVATE ittapi::ittnotify)
if(UNIX)
target_link_libraries(${TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS})

8
thirdparty/ittapi/CMakeLists.txt vendored
View File

@ -22,9 +22,9 @@ else()
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ittapi/src/ittnotify>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ittapi/include>)
# create alias ittapi::ittapi
add_library(ittapi::ittapi ALIAS ittnotify)
# create alias ittapi::ittnotify
add_library(ittapi::ittnotify ALIAS ittnotify)
openvino_developer_export_targets(COMPONENT openvino_common TARGETS ittapi::ittapi)
ov_install_static_lib(ittapi::ittapi ${OV_CPACK_COMP_CORE})
openvino_developer_export_targets(COMPONENT openvino_common TARGETS ittapi::ittnotify)
ov_install_static_lib(ittapi::ittnotify ${OV_CPACK_COMP_CORE})
endif()