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

Remove legacy targets (#9333)

Browse Source 
* Remove some legacy targets

* Replace some targets

* Removed inference_engine_plugin_api dependency

* Minor comment for developer config

* Fixed include paths

* Small fixes for static build

* Try to fix build pyopenvino

* Fixed comments

* Try to fix build

* Include OpenVINODeveloperPackage inside InferenceEngineDeveloperPackageConfig

* Try to fix GAPI tests
This commit is contained in:
Ilya Churaev
2021-12-23 08:16:23 +03:00
committed by GitHub
parent 16b39d15d0
commit 42350a705e
54 changed files with 123 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
inference-engine/src/mkldnn_plugin/CMakeLists.txt
View File

@@ -41,9 +41,6 @@ if(SELECTIVE_BUILD STREQUAL "ON")
endif()
target_link_libraries(${TARGET_NAME} PRIVATE mkldnn
inference_engine
inference_engine_transformations
inference_engine_lp_transformations
ov_shape_inference
inference_engine_snippets)
@@ -71,10 +68,8 @@ add_library(${TARGET_NAME}_obj OBJECT ${SOURCES} ${HEADERS})
link_system_libraries(${TARGET_NAME}_obj PUBLIC mkldnn)
target_include_directories(${TARGET_NAME}_obj PRIVATE $<TARGET_PROPERTY:inference_engine_preproc_s,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::itt,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ov_shape_inference,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_snippets,INTERFACE_INCLUDE_DIRECTORIES>
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}

6
inference-engine/src/vpu/common/CMakeLists.txt
View File

@@ -36,8 +36,8 @@ function(add_common_target TARGET_NAME STATIC_IE)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
target_include_directories(${TARGET_NAME} SYSTEM PUBLIC
$<TARGET_PROPERTY:ngraph,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::runtime,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openvino::runtime::dev,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
if(WIN32)
@@ -52,7 +52,7 @@ function(add_common_target TARGET_NAME STATIC_IE)
openvino_developer_export_targets(COMPONENT vpu TARGETS ${TARGET_NAME})
target_link_libraries(${TARGET_NAME} PUBLIC ngraph inference_engine_transformations
target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime openvino::runtime::dev
PRIVATE openvino::itt)
if(NOT STATIC_IE)

4
inference-engine/src/vpu/graph_transformer/CMakeLists.txt
View File

@@ -53,8 +53,8 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
target_link_libraries(${TARGET_NAME}
PUBLIC
ngraph
inference_engine_plugin_api
openvino::runtime
openvino::runtime::dev
PRIVATE
openvino::itt
)

4
inference-engine/thirdparty/clDNN/src/CMakeLists.txt vendored
View File

@@ -37,8 +37,8 @@ target_link_libraries(${TARGET_NAME} PUBLIC OpenCL)
target_link_libraries(${TARGET_NAME} PRIVATE ov_intel_gpu_kernels
ov_intel_gpu_runtime
openvino::itt
inference_engine_plugin_api
inference_engine)
openvino::runtime::dev
openvino::runtime)
if(ENABLE_ONEDNN_FOR_GPU)
target_link_libraries(${TARGET_NAME} PUBLIC onednn_gpu_tgt)