diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch | 78 |
1 files changed, 42 insertions, 36 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch index 3fff5607..bbf186df 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cc44429f0e55efa0fa142cc043e83123e3b376e4 Mon Sep 17 00:00:00 2001 | 1 | From 7e2525fbe9a051197d76fe1ceb94b857eae33409 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Wed, 10 Jun 2020 09:43:55 +0800 | 3 | Date: Wed, 10 Jun 2020 09:43:55 +0800 |
4 | Subject: [PATCH] inference-engine: use system installed packages | 4 | Subject: [PATCH] inference-engine: use system installed packages |
@@ -11,15 +11,15 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
11 | --- | 11 | --- |
12 | cmake/dependencies.cmake | 17 -------------- | 12 | cmake/dependencies.cmake | 17 -------------- |
13 | inference-engine/CMakeLists.txt | 2 +- | 13 | inference-engine/CMakeLists.txt | 2 +- |
14 | inference-engine/cmake/ie_parallel.cmake | 10 ++------- | 14 | inference-engine/cmake/ie_parallel.cmake | 7 +----- |
15 | .../src/inference_engine/CMakeLists.txt | 22 +------------------ | 15 | .../src/inference_engine/CMakeLists.txt | 23 +------------------ |
16 | .../src/legacy_api/CMakeLists.txt | 3 +-- | 16 | .../src/legacy_api/CMakeLists.txt | 3 +-- |
17 | .../src/vpu/graph_transformer/CMakeLists.txt | 1 - | 17 | .../src/vpu/graph_transformer/CMakeLists.txt | 1 - |
18 | .../common_test_utils/CMakeLists.txt | 7 ++---- | 18 | .../common_test_utils/CMakeLists.txt | 7 ++---- |
19 | .../unit_test_utils/CMakeLists.txt | 3 +-- | 19 | .../unit_test_utils/CMakeLists.txt | 3 +-- |
20 | .../tests_deprecated/helpers/CMakeLists.txt | 1 - | 20 | .../tests_deprecated/helpers/CMakeLists.txt | 1 - |
21 | inference-engine/thirdparty/CMakeLists.txt | 14 +----------- | 21 | inference-engine/thirdparty/CMakeLists.txt | 14 +---------- |
22 | 10 files changed, 9 insertions(+), 71 deletions(-) | 22 | 10 files changed, 8 insertions(+), 70 deletions(-) |
23 | 23 | ||
24 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | 24 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake |
25 | index 2a5a74db6..9cc9a6c94 100644 | 25 | index 2a5a74db6..9cc9a6c94 100644 |
@@ -52,54 +52,60 @@ index 2a5a74db6..9cc9a6c94 100644 | |||
52 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") | 52 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") |
53 | endif() | 53 | endif() |
54 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt | 54 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt |
55 | index 39ff413bc..ba8ed354c 100644 | 55 | index 7f45ab021..db85e8690 100644 |
56 | --- a/inference-engine/CMakeLists.txt | 56 | --- a/inference-engine/CMakeLists.txt |
57 | +++ b/inference-engine/CMakeLists.txt | 57 | +++ b/inference-engine/CMakeLists.txt |
58 | @@ -54,7 +54,7 @@ function(ie_developer_export) | 58 | @@ -57,7 +57,7 @@ function(ie_developer_export) |
59 | APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") | 59 | APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") |
60 | 60 | ||
61 | # Custom target to build only Inference Engine Developer Package targets | 61 | # Custom target to build only Inference Engine Developer Package targets |
62 | - add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets} gflags) | 62 | - add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} gflags |
63 | + add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets}) | 63 | + add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} |
64 | inference_engine_ir_reader inference_engine_ir_v7_reader) | ||
64 | endfunction() | 65 | endfunction() |
65 | 66 | ||
66 | add_subdirectory(thirdparty) | ||
67 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | 67 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake |
68 | index 0f3c41e0a..b3b2dfdab 100644 | 68 | index 7fd77ccc0..143dcf669 100644 |
69 | --- a/inference-engine/cmake/ie_parallel.cmake | 69 | --- a/inference-engine/cmake/ie_parallel.cmake |
70 | +++ b/inference-engine/cmake/ie_parallel.cmake | 70 | +++ b/inference-engine/cmake/ie_parallel.cmake |
71 | @@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME) | 71 | @@ -62,13 +62,8 @@ function(set_ie_threading_interface_for TARGET_NAME) |
72 | set(IE_THREAD_DEFINE "IE_THREAD_SEQ") | 72 | set(IE_THREAD_DEFINE "IE_THREAD_SEQ") |
73 | 73 | ||
74 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | 74 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") |
75 | - find_package(TBB COMPONENTS tbb tbbmalloc) | ||
76 | - if (TBB_FOUND) | 75 | - if (TBB_FOUND) |
77 | - set(IE_THREAD_DEFINE "IE_THREAD_TBB") | 76 | set(IE_THREAD_DEFINE "IE_THREAD_TBB") |
78 | - ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS}) | 77 | - ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS}) |
79 | - else () | 78 | - else () |
80 | - ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \ | 79 | - ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \ |
81 | - SEQ method will be used for ${TARGET_NAME}") | 80 | - SEQ method will be used for ${TARGET_NAME}") |
82 | - endif () | 81 | - endif () |
83 | + set(IE_THREAD_DEFINE "IE_THREAD_TBB") | 82 | + target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) |
84 | + target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) | ||
85 | elseif (THREADING STREQUAL "OMP") | 83 | elseif (THREADING STREQUAL "OMP") |
86 | if (WIN32) | 84 | if (WIN32) |
87 | set(omp_lib_name libiomp5md) | 85 | set(omp_lib_name libiomp5md) |
88 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | 86 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt |
89 | index 4ae0d5607..4106cf8b4 100644 | 87 | index 9ab888983..105e666a3 100644 |
90 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | 88 | --- a/inference-engine/src/inference_engine/CMakeLists.txt |
91 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | 89 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt |
92 | @@ -124,8 +124,7 @@ if(NGRAPH_ONNX_IMPORT_ENABLE) | 90 | @@ -127,7 +127,6 @@ target_include_directories(${TARGET_NAME}_common_obj PRIVATE |
93 | target_compile_definitions(${TARGET_NAME}_obj PRIVATE ONNX_IMPORT_ENABLE) | 91 | $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>) |
94 | endif() | 92 | |
93 | target_include_directories(${TARGET_NAME}_common_obj SYSTEM PRIVATE | ||
94 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | ||
95 | $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | ||
96 | |||
97 | # Create object library | ||
98 | @@ -139,8 +138,7 @@ add_library(${TARGET_NAME}_obj OBJECT | ||
99 | |||
100 | target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API) | ||
95 | 101 | ||
96 | -target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> | 102 | -target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> |
97 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) | 103 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) |
98 | +target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | 104 | +target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) |
99 | 105 | ||
100 | target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" | 106 | target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" |
101 | $<TARGET_PROPERTY:${TARGET_NAME}_reader_api,INTERFACE_INCLUDE_DIRECTORIES> | 107 | "${IE_MAIN_SOURCE_DIR}/src/readers/ir_reader" # for ie_ir_version.hpp |
102 | @@ -233,25 +232,6 @@ list(APPEND core_components ngraph) | 108 | @@ -233,25 +231,6 @@ list(APPEND core_components ngraph) |
103 | if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | 109 | if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") |
104 | ie_cpack_add_component(tbb REQUIRED) | 110 | ie_cpack_add_component(tbb REQUIRED) |
105 | list(APPEND core_components tbb) | 111 | list(APPEND core_components tbb) |
@@ -126,10 +132,10 @@ index 4ae0d5607..4106cf8b4 100644 | |||
126 | 132 | ||
127 | ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) | 133 | ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) |
128 | diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt | 134 | diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt |
129 | index 85524310b..dc25cae2f 100644 | 135 | index ed87a073a..adc970a09 100644 |
130 | --- a/inference-engine/src/legacy_api/CMakeLists.txt | 136 | --- a/inference-engine/src/legacy_api/CMakeLists.txt |
131 | +++ b/inference-engine/src/legacy_api/CMakeLists.txt | 137 | +++ b/inference-engine/src/legacy_api/CMakeLists.txt |
132 | @@ -33,8 +33,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CM | 138 | @@ -39,8 +39,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE |
133 | ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl | 139 | ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl |
134 | $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> | 140 | $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> |
135 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | 141 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> |
@@ -140,7 +146,7 @@ index 85524310b..dc25cae2f 100644 | |||
140 | # Create shared library | 146 | # Create shared library |
141 | 147 | ||
142 | diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | 148 | diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt |
143 | index 982d3c7fa..db881246c 100644 | 149 | index a45437453..7a67a8226 100644 |
144 | --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | 150 | --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt |
145 | +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | 151 | +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt |
146 | @@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) | 152 | @@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) |
@@ -192,36 +198,36 @@ index efead7271..732abee2d 100644 | |||
192 | endfunction() | 198 | endfunction() |
193 | 199 | ||
194 | diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | 200 | diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt |
195 | index df611c700..06bd911ae 100644 | 201 | index dbb0f4e5b..9586d651d 100644 |
196 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | 202 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt |
197 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | 203 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt |
198 | @@ -10,8 +10,7 @@ list(APPEND EXPORT_DEPENDENCIES | 204 | @@ -9,8 +9,7 @@ add_subdirectory(mocks/mock_engine) |
205 | list(APPEND EXPORT_DEPENDENCIES | ||
199 | commonTestUtils_s | 206 | commonTestUtils_s |
200 | inference_engine_s | 207 | inference_engine_s |
201 | inference_engine_lp_transformations | 208 | - inference_engine_lp_transformations |
202 | - inference_engine_ir_reader | ||
203 | - gmock) | 209 | - gmock) |
204 | + inference_engine_ir_reader) | 210 | + inference_engine_lp_transformations) |
205 | 211 | ||
206 | addIeTarget( | 212 | addIeTarget( |
207 | NAME ${TARGET_NAME} | 213 | NAME ${TARGET_NAME} |
208 | diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | 214 | diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt |
209 | index bf915e52d..9e7173db6 100644 | 215 | index 2bc668965..e44ab9d5d 100644 |
210 | --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt | 216 | --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt |
211 | +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | 217 | +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt |
212 | @@ -23,7 +23,6 @@ function(add_helpers target_name) | 218 | @@ -22,7 +22,6 @@ function(add_helpers target_name) |
219 | target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | ||
213 | "${IE_MAIN_SOURCE_DIR}/src/inference_engine" | 220 | "${IE_MAIN_SOURCE_DIR}/src/inference_engine" |
214 | $<TARGET_PROPERTY:inference_engine_ir_reader,INTERFACE_INCLUDE_DIRECTORIES> | ||
215 | $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES> | 221 | $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES> |
216 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | 222 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> |
217 | "${IE_MAIN_SOURCE_DIR}/src/vpu/" | 223 | "${IE_MAIN_SOURCE_DIR}/src/vpu/" |
218 | PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") | 224 | PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") |
219 | 225 | ||
220 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | 226 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt |
221 | index f94453e06..b3c25daf4 100644 | 227 | index a2550bfaa..0eb616415 100644 |
222 | --- a/inference-engine/thirdparty/CMakeLists.txt | 228 | --- a/inference-engine/thirdparty/CMakeLists.txt |
223 | +++ b/inference-engine/thirdparty/CMakeLists.txt | 229 | +++ b/inference-engine/thirdparty/CMakeLists.txt |
224 | @@ -38,28 +38,16 @@ function(build_with_lto) | 230 | @@ -51,28 +51,16 @@ function(build_with_lto) |
225 | function(ie_build_pugixml) | 231 | function(ie_build_pugixml) |
226 | set(BUILD_TESTS_current ${BUILD_TESTS}) | 232 | set(BUILD_TESTS_current ${BUILD_TESTS}) |
227 | set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE) | 233 | set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE) |