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 | 130 |
1 files changed, 90 insertions, 40 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 d1379de5..3fff5607 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,7 +1,7 @@ | |||
1 | From e7730e68795c8ed0b9e1772ddc21ec931da462d0 Mon Sep 17 00:00:00 2001 | 1 | From cc44429f0e55efa0fa142cc043e83123e3b376e4 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 1/5] inference-engine: use system installed packages | 4 | Subject: [PATCH] inference-engine: use system installed packages |
5 | 5 | ||
6 | Use installed versions of pugixml, ade, protobuf and tbb. | 6 | Use installed versions of pugixml, ade, protobuf and tbb. |
7 | 7 | ||
@@ -10,17 +10,19 @@ Upstream-Status: Pending | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 10 | 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/cmake/ie_parallel.cmake | 10 ++------- | 14 | inference-engine/cmake/ie_parallel.cmake | 10 ++------- |
14 | .../src/inference_engine/CMakeLists.txt | 22 +------------------ | 15 | .../src/inference_engine/CMakeLists.txt | 22 +------------------ |
15 | .../src/legacy_api/CMakeLists.txt | 3 +-- | 16 | .../src/legacy_api/CMakeLists.txt | 3 +-- |
16 | .../src/vpu/graph_transformer/CMakeLists.txt | 1 - | 17 | .../src/vpu/graph_transformer/CMakeLists.txt | 1 - |
17 | .../common_test_utils/CMakeLists.txt | 3 +-- | 18 | .../common_test_utils/CMakeLists.txt | 7 ++---- |
19 | .../unit_test_utils/CMakeLists.txt | 3 +-- | ||
18 | .../tests_deprecated/helpers/CMakeLists.txt | 1 - | 20 | .../tests_deprecated/helpers/CMakeLists.txt | 1 - |
19 | inference-engine/thirdparty/CMakeLists.txt | 11 +--------- | 21 | inference-engine/thirdparty/CMakeLists.txt | 14 +----------- |
20 | 8 files changed, 6 insertions(+), 62 deletions(-) | 22 | 10 files changed, 9 insertions(+), 71 deletions(-) |
21 | 23 | ||
22 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | 24 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake |
23 | index 2a5a74db..9cc9a6c9 100644 | 25 | index 2a5a74db6..9cc9a6c94 100644 |
24 | --- a/cmake/dependencies.cmake | 26 | --- a/cmake/dependencies.cmake |
25 | +++ b/cmake/dependencies.cmake | 27 | +++ b/cmake/dependencies.cmake |
26 | @@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING) | 28 | @@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING) |
@@ -49,8 +51,21 @@ index 2a5a74db..9cc9a6c9 100644 | |||
49 | - | 51 | - |
50 | - 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") |
51 | endif() | 53 | endif() |
54 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt | ||
55 | index 39ff413bc..ba8ed354c 100644 | ||
56 | --- a/inference-engine/CMakeLists.txt | ||
57 | +++ b/inference-engine/CMakeLists.txt | ||
58 | @@ -54,7 +54,7 @@ function(ie_developer_export) | ||
59 | APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") | ||
60 | |||
61 | # Custom target to build only Inference Engine Developer Package targets | ||
62 | - add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets} gflags) | ||
63 | + add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets}) | ||
64 | endfunction() | ||
65 | |||
66 | add_subdirectory(thirdparty) | ||
52 | 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 |
53 | index 0f3c41e0..b3b2dfda 100644 | 68 | index 0f3c41e0a..b3b2dfdab 100644 |
54 | --- a/inference-engine/cmake/ie_parallel.cmake | 69 | --- a/inference-engine/cmake/ie_parallel.cmake |
55 | +++ b/inference-engine/cmake/ie_parallel.cmake | 70 | +++ b/inference-engine/cmake/ie_parallel.cmake |
56 | @@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME) | 71 | @@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME) |
@@ -71,20 +86,20 @@ index 0f3c41e0..b3b2dfda 100644 | |||
71 | if (WIN32) | 86 | if (WIN32) |
72 | set(omp_lib_name libiomp5md) | 87 | set(omp_lib_name libiomp5md) |
73 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | 88 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt |
74 | index c8cd4b27..d98ba55d 100644 | 89 | index 4ae0d5607..4106cf8b4 100644 |
75 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | 90 | --- a/inference-engine/src/inference_engine/CMakeLists.txt |
76 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | 91 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt |
77 | @@ -117,8 +117,7 @@ add_library(${TARGET_NAME}_obj OBJECT | 92 | @@ -124,8 +124,7 @@ if(NGRAPH_ONNX_IMPORT_ENABLE) |
78 | 93 | target_compile_definitions(${TARGET_NAME}_obj PRIVATE ONNX_IMPORT_ENABLE) | |
79 | target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API) | 94 | endif() |
80 | 95 | ||
81 | -target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> | 96 | -target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> |
82 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) | 97 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) |
83 | +target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | 98 | +target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) |
84 | 99 | ||
85 | target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" | 100 | target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" |
86 | $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>) | 101 | $<TARGET_PROPERTY:${TARGET_NAME}_reader_api,INTERFACE_INCLUDE_DIRECTORIES> |
87 | @@ -257,25 +256,6 @@ list(APPEND core_components ngraph) | 102 | @@ -233,25 +232,6 @@ list(APPEND core_components ngraph) |
88 | if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | 103 | if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") |
89 | ie_cpack_add_component(tbb REQUIRED) | 104 | ie_cpack_add_component(tbb REQUIRED) |
90 | list(APPEND core_components tbb) | 105 | list(APPEND core_components tbb) |
@@ -111,21 +126,21 @@ index c8cd4b27..d98ba55d 100644 | |||
111 | 126 | ||
112 | ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) | 127 | ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) |
113 | diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt | 128 | diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt |
114 | index d54c5906..90920ab3 100644 | 129 | index 85524310b..dc25cae2f 100644 |
115 | --- a/inference-engine/src/legacy_api/CMakeLists.txt | 130 | --- a/inference-engine/src/legacy_api/CMakeLists.txt |
116 | +++ b/inference-engine/src/legacy_api/CMakeLists.txt | 131 | +++ b/inference-engine/src/legacy_api/CMakeLists.txt |
117 | @@ -33,8 +33,7 @@ target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE | 132 | @@ -33,8 +33,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CM |
118 | 133 | ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl | |
119 | target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src | 134 | $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> |
120 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | 135 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> |
121 | - $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> | 136 | - $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> |
122 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) | 137 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) |
123 | + $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | 138 | + $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) |
124 | 139 | ||
125 | function(nn_builder_disable_warnings) | 140 | # Create shared library |
126 | disable_deprecated_warnings() | 141 | |
127 | diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | 142 | diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt |
128 | index 982d3c7f..db881246 100644 | 143 | index 982d3c7fa..db881246c 100644 |
129 | --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | 144 | --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt |
130 | +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | 145 | +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt |
131 | @@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) | 146 | @@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) |
@@ -137,18 +152,30 @@ index 982d3c7f..db881246 100644 | |||
137 | "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include") | 152 | "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include") |
138 | 153 | ||
139 | diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | 154 | diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt |
140 | index 8a4ffd42..5bee450a 100644 | 155 | index efead7271..732abee2d 100644 |
141 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | 156 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt |
142 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | 157 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt |
143 | @@ -28,7 +28,6 @@ else () | 158 | @@ -23,7 +23,7 @@ function(add_gtest_libraries) |
159 | PROPERTIES FOLDER thirdparty) | ||
160 | endfunction() | ||
161 | |||
162 | -add_gtest_libraries() | ||
163 | +#add_gtest_libraries() | ||
164 | |||
165 | if (MSVC) | ||
166 | set(PUGI pugixml_mt) | ||
167 | @@ -32,10 +32,7 @@ else () | ||
144 | endif () | 168 | endif () |
145 | 169 | ||
146 | list(APPEND EXPORT_DEPENDENCIES | 170 | list(APPEND EXPORT_DEPENDENCIES |
147 | - ${PUGI} | 171 | - ${PUGI} |
148 | ${NGRAPH_LIBRARIES} | 172 | ${NGRAPH_LIBRARIES} |
149 | gtest | 173 | - gtest |
150 | gtest_main | 174 | - gtest_main |
151 | @@ -70,7 +69,6 @@ function(add_common_utils ADD_TARGET_NAME) | 175 | ) |
176 | |||
177 | set(TARGET_NAME commonTestUtils) | ||
178 | @@ -74,7 +71,6 @@ function(add_common_utils ADD_TARGET_NAME) | ||
152 | PUBLIC | 179 | PUBLIC |
153 | ${IE_TESTS_ROOT}/ie_test_utils | 180 | ${IE_TESTS_ROOT}/ie_test_utils |
154 | $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES> | 181 | $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES> |
@@ -156,7 +183,7 @@ index 8a4ffd42..5bee450a 100644 | |||
156 | PRIVATE | 183 | PRIVATE |
157 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | 184 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> |
158 | ) | 185 | ) |
159 | @@ -80,6 +78,7 @@ function(add_common_utils ADD_TARGET_NAME) | 186 | @@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME) |
160 | target_link_libraries(${ADD_TARGET_NAME} | 187 | target_link_libraries(${ADD_TARGET_NAME} |
161 | PUBLIC | 188 | PUBLIC |
162 | ${EXPORT_DEPENDENCIES} | 189 | ${EXPORT_DEPENDENCIES} |
@@ -164,43 +191,66 @@ index 8a4ffd42..5bee450a 100644 | |||
164 | ) | 191 | ) |
165 | endfunction() | 192 | endfunction() |
166 | 193 | ||
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 | ||
195 | index df611c700..06bd911ae 100644 | ||
196 | --- 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 | ||
198 | @@ -10,8 +10,7 @@ list(APPEND EXPORT_DEPENDENCIES | ||
199 | commonTestUtils_s | ||
200 | inference_engine_s | ||
201 | inference_engine_lp_transformations | ||
202 | - inference_engine_ir_reader | ||
203 | - gmock) | ||
204 | + inference_engine_ir_reader) | ||
205 | |||
206 | addIeTarget( | ||
207 | NAME ${TARGET_NAME} | ||
167 | diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | 208 | diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt |
168 | index 14265fa9..2482be78 100644 | 209 | index bf915e52d..9e7173db6 100644 |
169 | --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt | 210 | --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt |
170 | +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | 211 | +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt |
171 | @@ -23,7 +23,6 @@ function(add_helpers target_name) | 212 | @@ -23,7 +23,6 @@ function(add_helpers target_name) |
172 | target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | ||
173 | "${IE_MAIN_SOURCE_DIR}/src/inference_engine" | 213 | "${IE_MAIN_SOURCE_DIR}/src/inference_engine" |
214 | $<TARGET_PROPERTY:inference_engine_ir_reader,INTERFACE_INCLUDE_DIRECTORIES> | ||
174 | $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES> | 215 | $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES> |
175 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | 216 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> |
176 | "${IE_MAIN_SOURCE_DIR}/src/vpu/" | 217 | "${IE_MAIN_SOURCE_DIR}/src/vpu/" |
177 | PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") | 218 | PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") |
178 | 219 | ||
179 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | 220 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt |
180 | index ebf32c71..56b6bcb0 100644 | 221 | index f94453e06..b3c25daf4 100644 |
181 | --- a/inference-engine/thirdparty/CMakeLists.txt | 222 | --- a/inference-engine/thirdparty/CMakeLists.txt |
182 | +++ b/inference-engine/thirdparty/CMakeLists.txt | 223 | +++ b/inference-engine/thirdparty/CMakeLists.txt |
183 | @@ -35,19 +35,10 @@ function(build_with_lto) | 224 | @@ -38,28 +38,16 @@ function(build_with_lto) |
184 | add_subdirectory(clDNN) | 225 | function(ie_build_pugixml) |
185 | endif() | 226 | set(BUILD_TESTS_current ${BUILD_TESTS}) |
227 | set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE) | ||
228 | - add_subdirectory(pugixml) | ||
229 | set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE) | ||
230 | endfunction() | ||
186 | 231 | ||
187 | - add_subdirectory(pugixml) | 232 | ie_build_pugixml() |
188 | add_subdirectory(stb_lib) | 233 | add_subdirectory(stb_lib) |
189 | - add_subdirectory(ade) | 234 | - add_subdirectory(ade) |
190 | add_subdirectory(fluid/modules/gapi) | 235 | add_subdirectory(fluid/modules/gapi) |
191 | 236 | ||
192 | - # developer package | ||
193 | - | ||
194 | - target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") | 237 | - target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") |
195 | - | 238 | - |
239 | - set_target_properties(pugixml ade fluid stb_image | ||
240 | + set_target_properties(fluid stb_image | ||
241 | PROPERTIES FOLDER thirdparty) | ||
242 | |||
243 | - # developer package | ||
244 | - | ||
196 | - ie_developer_export_targets(ade fluid pugixml) | 245 | - ie_developer_export_targets(ade fluid pugixml) |
197 | - if(TARGET pugixml_mt) | 246 | - if(TARGET pugixml_mt) |
198 | - ie_developer_export_targets(pugixml_mt) | 247 | - ie_developer_export_targets(pugixml_mt) |
248 | - set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty) | ||
199 | - endif() | 249 | - endif() |
200 | + ie_developer_export_targets(fluid) | 250 | - |
201 | endfunction() | 251 | if(ENABLE_MKL_DNN) |
202 | 252 | set(SDL_cmake_included ON) | |
203 | build_with_lto() | 253 | include(mkldnn.cmake) |
204 | -- | 254 | -- |
205 | 2.25.4 | 255 | 2.26.2 |
206 | 256 | ||