diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-06-05 01:26:01 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-06-11 15:35:56 +0800 |
commit | 78386dd80bcc9b740c181ce4718af7e0b328f85a (patch) | |
tree | bf5c92b798890fafb3bb0f8b05ebf60d75ef1b97 /dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch | |
parent | 7006412eb1535e55598d337a1ca7705410ba37a9 (diff) | |
download | meta-intel-78386dd80bcc9b740c181ce4718af7e0b328f85a.tar.gz |
openvino-inference-engine: upgrade 2020.1 -> 2020.3.0
* Point to the renamed repository and change the project name to
openvino-inference-engine.
* Include ngraph as a submodule instead of using it as a separate
project.
* Use the new unit tests, the old ones have been deprecated.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
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 | 206 |
1 files changed, 206 insertions, 0 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 new file mode 100644 index 00000000..d1379de5 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch | |||
@@ -0,0 +1,206 @@ | |||
1 | From e7730e68795c8ed0b9e1772ddc21ec931da462d0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 10 Jun 2020 09:43:55 +0800 | ||
4 | Subject: [PATCH 1/5] inference-engine: use system installed packages | ||
5 | |||
6 | Use installed versions of pugixml, ade, protobuf and tbb. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | cmake/dependencies.cmake | 17 -------------- | ||
13 | inference-engine/cmake/ie_parallel.cmake | 10 ++------- | ||
14 | .../src/inference_engine/CMakeLists.txt | 22 +------------------ | ||
15 | .../src/legacy_api/CMakeLists.txt | 3 +-- | ||
16 | .../src/vpu/graph_transformer/CMakeLists.txt | 1 - | ||
17 | .../common_test_utils/CMakeLists.txt | 3 +-- | ||
18 | .../tests_deprecated/helpers/CMakeLists.txt | 1 - | ||
19 | inference-engine/thirdparty/CMakeLists.txt | 11 +--------- | ||
20 | 8 files changed, 6 insertions(+), 62 deletions(-) | ||
21 | |||
22 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | ||
23 | index 2a5a74db..9cc9a6c9 100644 | ||
24 | --- a/cmake/dependencies.cmake | ||
25 | +++ b/cmake/dependencies.cmake | ||
26 | @@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING) | ||
27 | |||
28 | set(protoc_version "3.7.1") | ||
29 | if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux) | ||
30 | - RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT | ||
31 | - ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" | ||
32 | - TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64") | ||
33 | - debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) | ||
34 | else() | ||
35 | message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation") | ||
36 | endif() | ||
37 | |||
38 | - reset_deps_cache(SYSTEM_PROTOC) | ||
39 | - | ||
40 | - message("${SYSTEM_PROTOC_ROOT}/bin") | ||
41 | - find_program( | ||
42 | - SYSTEM_PROTOC | ||
43 | - NAMES protoc | ||
44 | - PATHS "${SYSTEM_PROTOC_ROOT}/bin" | ||
45 | - NO_DEFAULT_PATH) | ||
46 | - if(NOT SYSTEM_PROTOC) | ||
47 | - message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary") | ||
48 | - endif() | ||
49 | - | ||
50 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") | ||
51 | endif() | ||
52 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | ||
53 | index 0f3c41e0..b3b2dfda 100644 | ||
54 | --- a/inference-engine/cmake/ie_parallel.cmake | ||
55 | +++ b/inference-engine/cmake/ie_parallel.cmake | ||
56 | @@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME) | ||
57 | set(IE_THREAD_DEFINE "IE_THREAD_SEQ") | ||
58 | |||
59 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | ||
60 | - find_package(TBB COMPONENTS tbb tbbmalloc) | ||
61 | - if (TBB_FOUND) | ||
62 | - set(IE_THREAD_DEFINE "IE_THREAD_TBB") | ||
63 | - ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS}) | ||
64 | - else () | ||
65 | - ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \ | ||
66 | - SEQ method will be used for ${TARGET_NAME}") | ||
67 | - endif () | ||
68 | + set(IE_THREAD_DEFINE "IE_THREAD_TBB") | ||
69 | + target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) | ||
70 | elseif (THREADING STREQUAL "OMP") | ||
71 | if (WIN32) | ||
72 | set(omp_lib_name libiomp5md) | ||
73 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | ||
74 | index c8cd4b27..d98ba55d 100644 | ||
75 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | ||
76 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | ||
77 | @@ -117,8 +117,7 @@ add_library(${TARGET_NAME}_obj OBJECT | ||
78 | |||
79 | target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API) | ||
80 | |||
81 | -target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> | ||
82 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) | ||
83 | +target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | ||
84 | |||
85 | target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" | ||
86 | $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>) | ||
87 | @@ -257,25 +256,6 @@ list(APPEND core_components ngraph) | ||
88 | if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | ||
89 | ie_cpack_add_component(tbb REQUIRED) | ||
90 | list(APPEND core_components tbb) | ||
91 | - | ||
92 | - install(DIRECTORY "${TBB}/include" | ||
93 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
94 | - COMPONENT tbb) | ||
95 | - install(DIRECTORY "${TBB}/lib" | ||
96 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
97 | - COMPONENT tbb) | ||
98 | - if(EXISTS "${TBB}/bin") | ||
99 | - install(DIRECTORY "${TBB}/bin" | ||
100 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
101 | - COMPONENT tbb) | ||
102 | - endif() | ||
103 | - install(FILES "${TBB}/LICENSE" | ||
104 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
105 | - COMPONENT tbb) | ||
106 | - install(FILES "${TBB}/cmake/TBBConfig.cmake" | ||
107 | - "${TBB}/cmake/TBBConfigVersion.cmake" | ||
108 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake | ||
109 | - COMPONENT tbb) | ||
110 | endif() | ||
111 | |||
112 | 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 | ||
114 | index d54c5906..90920ab3 100644 | ||
115 | --- a/inference-engine/src/legacy_api/CMakeLists.txt | ||
116 | +++ b/inference-engine/src/legacy_api/CMakeLists.txt | ||
117 | @@ -33,8 +33,7 @@ target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE | ||
118 | |||
119 | target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src | ||
120 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | ||
121 | - $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> | ||
122 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) | ||
123 | + $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | ||
124 | |||
125 | function(nn_builder_disable_warnings) | ||
126 | disable_deprecated_warnings() | ||
127 | 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 | ||
129 | --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | ||
130 | +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | ||
131 | @@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) | ||
132 | |||
133 | target_include_directories(${TARGET_NAME} | ||
134 | SYSTEM PUBLIC | ||
135 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | ||
136 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | ||
137 | "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include") | ||
138 | |||
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 | ||
140 | index 8a4ffd42..5bee450a 100644 | ||
141 | --- 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 | ||
143 | @@ -28,7 +28,6 @@ else () | ||
144 | endif () | ||
145 | |||
146 | list(APPEND EXPORT_DEPENDENCIES | ||
147 | - ${PUGI} | ||
148 | ${NGRAPH_LIBRARIES} | ||
149 | gtest | ||
150 | gtest_main | ||
151 | @@ -70,7 +69,6 @@ function(add_common_utils ADD_TARGET_NAME) | ||
152 | PUBLIC | ||
153 | ${IE_TESTS_ROOT}/ie_test_utils | ||
154 | $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES> | ||
155 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | ||
156 | PRIVATE | ||
157 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | ||
158 | ) | ||
159 | @@ -80,6 +78,7 @@ function(add_common_utils ADD_TARGET_NAME) | ||
160 | target_link_libraries(${ADD_TARGET_NAME} | ||
161 | PUBLIC | ||
162 | ${EXPORT_DEPENDENCIES} | ||
163 | + pugixml | ||
164 | ) | ||
165 | endfunction() | ||
166 | |||
167 | diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | ||
168 | index 14265fa9..2482be78 100644 | ||
169 | --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt | ||
170 | +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | ||
171 | @@ -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" | ||
174 | $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES> | ||
175 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | ||
176 | "${IE_MAIN_SOURCE_DIR}/src/vpu/" | ||
177 | PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") | ||
178 | |||
179 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | ||
180 | index ebf32c71..56b6bcb0 100644 | ||
181 | --- a/inference-engine/thirdparty/CMakeLists.txt | ||
182 | +++ b/inference-engine/thirdparty/CMakeLists.txt | ||
183 | @@ -35,19 +35,10 @@ function(build_with_lto) | ||
184 | add_subdirectory(clDNN) | ||
185 | endif() | ||
186 | |||
187 | - add_subdirectory(pugixml) | ||
188 | add_subdirectory(stb_lib) | ||
189 | - add_subdirectory(ade) | ||
190 | add_subdirectory(fluid/modules/gapi) | ||
191 | |||
192 | - # developer package | ||
193 | - | ||
194 | - target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") | ||
195 | - | ||
196 | - ie_developer_export_targets(ade fluid pugixml) | ||
197 | - if(TARGET pugixml_mt) | ||
198 | - ie_developer_export_targets(pugixml_mt) | ||
199 | - endif() | ||
200 | + ie_developer_export_targets(fluid) | ||
201 | endfunction() | ||
202 | |||
203 | build_with_lto() | ||
204 | -- | ||
205 | 2.25.4 | ||
206 | |||