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

Try to fix inference_engine_s

Browse Source
This commit is contained in:
Ilya Churaev committed 2022-10-03 19:24:11 +04:00
1 parent 3d97988a54
commit a1adca8b05
8 files changed
+48 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/cmake/openvino.cmake
+43
View File
@@ -256,3 +256,46 @@ if(ENABLE_PKGCONFIG_GEN)
COMMENT "[pkg-config] validating openvino.pc"
VERBATIM)
endif()
# Static library used for unit tests which are always built
set(LEGACY_SRC_ROOT "${OpenVINO_SOURCE_DIR}/src/common/legacy/src")
file(GLOB_RECURSE legacy_src "${LEGACY_SRC_ROOT}/*.cpp"
"${LEGACY_SRC_ROOT}/*.hpp")
set_source_files_properties(${legacy_src} PROPERTIES
INCLUDE_DIRECTORIES $<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
${legacy_src}
$<TARGET_OBJECTS:ngraph_obj>
$<TARGET_OBJECTS:frontend_common_obj>
$<TARGET_OBJECTS:inference_engine_obj>
$<TARGET_OBJECTS:inference_engine_transformations_obj>
$<TARGET_OBJECTS:inference_engine_lp_transformations_obj>)
set_ie_threading_interface_for(${TARGET_NAME}_s)
if (TBBBIND_2_5_FOUND)
target_link_libraries(${TARGET_NAME}_s PRIVATE ${TBBBIND_2_5_IMPORTED_TARGETS})
endif()
target_include_directories(${TARGET_NAME}_s PUBLIC
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/src>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/transformations/include>
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/low_precision_transformations/include>
$<BUILD_INTERFACE:$<TARGET_PROPERTY:inference_engine_legacy,SOURCE_DIR>/src>)
if(WIN32)
set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
endif()
target_link_libraries(${TARGET_NAME}_s PRIVATE openvino::itt pugixml::static)
target_compile_definitions(${TARGET_NAME}_s PUBLIC USE_STATIC_IE)
set_target_properties(${TARGET_NAME}_s PROPERTIES
EXCLUDE_FROM_ALL ON
INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
add_library(inference_engine_s ALIAS ${TARGET_NAME}_s)
src/common/low_precision_transformations/include/low_precision/lpt_visibility.hpp
+1 -1
View File
@@ -11,7 +11,7 @@
* @brief Defines visibility settings for Inference Engine LP Transformations library
*/
#ifdef OPENVINO_STATIC_LIBRARY
#if defined(OPENVINO_STATIC_LIBRARY) || defined(USE_STATIC_IE)
# define LP_TRANSFORMATIONS_API
#else
# ifdef IMPLEMENT_OPENVINO_API
src/common/preprocessing/CMakeLists.txt
+1 -1
View File
@@ -185,7 +185,7 @@ if(WIN32)
set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
endif()
target_link_libraries(${TARGET_NAME}_s PRIVATE fluid openvino::itt openvino::runtime)
target_link_libraries(${TARGET_NAME}_s PRIVATE fluid openvino::itt)
target_compile_definitions(${TARGET_NAME}_s INTERFACE USE_STATIC_IE)
src/inference/CMakeLists.txt
-35
View File
@@ -168,41 +168,6 @@ ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}_obj
SOURCE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/openvino"
ADDITIONAL_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
# Static library used for unit tests which are always built
file(GLOB_RECURSE legacy_src "${LEGACY_SRC_ROOT}/*.cpp"
"${LEGACY_SRC_ROOT}/*.hpp")
set_source_files_properties(${legacy_src} PROPERTIES
INCLUDE_DIRECTORIES $<TARGET_PROPERTY:${TARGET_NAME}_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
${legacy_src}
$<TARGET_OBJECTS:${TARGET_NAME}_obj>)
set_ie_threading_interface_for(${TARGET_NAME}_s)
if (TBBBIND_2_5_FOUND)
target_link_libraries(${TARGET_NAME}_s PRIVATE ${TBBBIND_2_5_IMPORTED_TARGETS})
endif()
target_include_directories(${TARGET_NAME}_s PUBLIC
$<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
$<BUILD_INTERFACE:$<TARGET_PROPERTY:${TARGET_NAME}_legacy,SOURCE_DIR>/src>)
if(WIN32)
set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
endif()
target_link_libraries(${TARGET_NAME}_s PRIVATE openvino::itt ${CMAKE_DL_LIBS} ngraph
frontend_common::static openvino_gapi_preproc_s inference_engine_transformations openvino::pugixml)
target_compile_definitions(${TARGET_NAME}_s PUBLIC USE_STATIC_IE)
set_target_properties(${TARGET_NAME}_s PROPERTIES
EXCLUDE_FROM_ALL ON
INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
# LTO
set_target_properties(${TARGET_NAME}_obj
src/tests/ie_test_utils/common_test_utils/CMakeLists.txt
+1 -3
View File
@@ -19,8 +19,6 @@ function(add_common_utils ADD_TARGET_NAME)
gtest
gtest_main
ngraphFunctions
openvino::runtime
openvino::runtime::dev
PRIVATE
openvino::util
)
@@ -29,7 +27,7 @@ function(add_common_utils ADD_TARGET_NAME)
if(ARGN)
target_link_libraries(${ADD_TARGET_NAME} PRIVATE inference_engine_s)
else()
target_link_libraries(${ADD_TARGET_NAME} PRIVATE inference_engine_legacy)
target_link_libraries(${ADD_TARGET_NAME} PRIVATE inference_engine_legacy openvino::runtime openvino::runtime::dev)
endif()
ie_faster_build(${ADD_TARGET_NAME}
src/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt
+1 -1
View File
@@ -17,7 +17,7 @@ addIeTarget(
${CMAKE_CURRENT_SOURCE_DIR}/src
LINK_LIBRARIES
PUBLIC
openvino::runtime
openvino_s
ngraph_reference
interpreter_backend
ADD_CPPLINT
src/tests/unit/inference_engine/CMakeLists.txt
-1
View File
@@ -16,7 +16,6 @@ addIeTargetTest(
NAME ${TARGET_NAME}
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
LINK_LIBRARIES
inference_engine_lp_transformations
${OpenCV_LIBRARIES}
ADD_CPPLINT
DEPENDENCIES
src/tests/util/CMakeLists.txt
+1 -1
View File
@@ -15,7 +15,7 @@ add_library(ngraph_test_util STATIC EXCLUDE_FROM_ALL ${UTIL_SRC})
ie_faster_build(ngraph_test_util UNITY)
target_link_libraries(ngraph_test_util PUBLIC openvino::runtime gtest gmock)
target_link_libraries(ngraph_test_util PUBLIC openvino_s gtest gmock)
target_include_directories(ngraph_test_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(ngraph_test_util PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")