summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
diff options
context:
space:
mode:
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.patch262
1 files changed, 0 insertions, 262 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
deleted file mode 100644
index bbf186df..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ /dev/null
@@ -1,262 +0,0 @@
1From 7e2525fbe9a051197d76fe1ceb94b857eae33409 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:43:55 +0800
4Subject: [PATCH] inference-engine: use system installed packages
5
6Use installed versions of pugixml, ade, protobuf and tbb.
7
8Upstream-Status: Pending
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 cmake/dependencies.cmake | 17 --------------
13 inference-engine/CMakeLists.txt | 2 +-
14 inference-engine/cmake/ie_parallel.cmake | 7 +-----
15 .../src/inference_engine/CMakeLists.txt | 23 +------------------
16 .../src/legacy_api/CMakeLists.txt | 3 +--
17 .../src/vpu/graph_transformer/CMakeLists.txt | 1 -
18 .../common_test_utils/CMakeLists.txt | 7 ++----
19 .../unit_test_utils/CMakeLists.txt | 3 +--
20 .../tests_deprecated/helpers/CMakeLists.txt | 1 -
21 inference-engine/thirdparty/CMakeLists.txt | 14 +----------
22 10 files changed, 8 insertions(+), 70 deletions(-)
23
24diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
25index 2a5a74db6..9cc9a6c94 100644
26--- a/cmake/dependencies.cmake
27+++ b/cmake/dependencies.cmake
28@@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING)
29
30 set(protoc_version "3.7.1")
31 if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux)
32- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
33- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
34- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64")
35- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
36 else()
37 message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation")
38 endif()
39
40- reset_deps_cache(SYSTEM_PROTOC)
41-
42- message("${SYSTEM_PROTOC_ROOT}/bin")
43- find_program(
44- SYSTEM_PROTOC
45- NAMES protoc
46- PATHS "${SYSTEM_PROTOC_ROOT}/bin"
47- NO_DEFAULT_PATH)
48- if(NOT SYSTEM_PROTOC)
49- message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
50- endif()
51-
52- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
53 endif()
54diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
55index 7f45ab021..db85e8690 100644
56--- a/inference-engine/CMakeLists.txt
57+++ b/inference-engine/CMakeLists.txt
58@@ -57,7 +57,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 ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} gflags
63+ add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets}
64 inference_engine_ir_reader inference_engine_ir_v7_reader)
65 endfunction()
66
67diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
68index 7fd77ccc0..143dcf669 100644
69--- a/inference-engine/cmake/ie_parallel.cmake
70+++ b/inference-engine/cmake/ie_parallel.cmake
71@@ -62,13 +62,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
72 set(IE_THREAD_DEFINE "IE_THREAD_SEQ")
73
74 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
75- if (TBB_FOUND)
76 set(IE_THREAD_DEFINE "IE_THREAD_TBB")
77- ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS})
78- else ()
79- ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \
80- SEQ method will be used for ${TARGET_NAME}")
81- endif ()
82+ target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc)
83 elseif (THREADING STREQUAL "OMP")
84 if (WIN32)
85 set(omp_lib_name libiomp5md)
86diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
87index 9ab888983..105e666a3 100644
88--- a/inference-engine/src/inference_engine/CMakeLists.txt
89+++ b/inference-engine/src/inference_engine/CMakeLists.txt
90@@ -127,7 +127,6 @@ target_include_directories(${TARGET_NAME}_common_obj PRIVATE
91 $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
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)
101
102-target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
103- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
104+target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
105
106 target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
107 "${IE_MAIN_SOURCE_DIR}/src/readers/ir_reader" # for ie_ir_version.hpp
108@@ -233,25 +231,6 @@ list(APPEND core_components ngraph)
109 if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
110 ie_cpack_add_component(tbb REQUIRED)
111 list(APPEND core_components tbb)
112-
113- install(DIRECTORY "${TBB}/include"
114- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
115- COMPONENT tbb)
116- install(DIRECTORY "${TBB}/lib"
117- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
118- COMPONENT tbb)
119- if(EXISTS "${TBB}/bin")
120- install(DIRECTORY "${TBB}/bin"
121- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
122- COMPONENT tbb)
123- endif()
124- install(FILES "${TBB}/LICENSE"
125- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
126- COMPONENT tbb)
127- install(FILES "${TBB}/cmake/TBBConfig.cmake"
128- "${TBB}/cmake/TBBConfigVersion.cmake"
129- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake
130- COMPONENT tbb)
131 endif()
132
133 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
134diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt
135index ed87a073a..adc970a09 100644
136--- a/inference-engine/src/legacy_api/CMakeLists.txt
137+++ b/inference-engine/src/legacy_api/CMakeLists.txt
138@@ -39,8 +39,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE
139 ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl
140 $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
141 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
142- $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
143- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
144+ $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
145
146 # Create shared library
147
148diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
149index a45437453..7a67a8226 100644
150--- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
151+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
152@@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
153
154 target_include_directories(${TARGET_NAME}
155 SYSTEM PUBLIC
156- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
157 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
158 "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include")
159
160diff --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
161index efead7271..732abee2d 100644
162--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
163+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
164@@ -23,7 +23,7 @@ function(add_gtest_libraries)
165 PROPERTIES FOLDER thirdparty)
166 endfunction()
167
168-add_gtest_libraries()
169+#add_gtest_libraries()
170
171 if (MSVC)
172 set(PUGI pugixml_mt)
173@@ -32,10 +32,7 @@ else ()
174 endif ()
175
176 list(APPEND EXPORT_DEPENDENCIES
177- ${PUGI}
178 ${NGRAPH_LIBRARIES}
179- gtest
180- gtest_main
181 )
182
183 set(TARGET_NAME commonTestUtils)
184@@ -74,7 +71,6 @@ function(add_common_utils ADD_TARGET_NAME)
185 PUBLIC
186 ${IE_TESTS_ROOT}/ie_test_utils
187 $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
188- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
189 PRIVATE
190 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
191 )
192@@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME)
193 target_link_libraries(${ADD_TARGET_NAME}
194 PUBLIC
195 ${EXPORT_DEPENDENCIES}
196+ pugixml
197 )
198 endfunction()
199
200diff --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
201index dbb0f4e5b..9586d651d 100644
202--- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
203+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
204@@ -9,8 +9,7 @@ add_subdirectory(mocks/mock_engine)
205 list(APPEND EXPORT_DEPENDENCIES
206 commonTestUtils_s
207 inference_engine_s
208- inference_engine_lp_transformations
209- gmock)
210+ inference_engine_lp_transformations)
211
212 addIeTarget(
213 NAME ${TARGET_NAME}
214diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
215index 2bc668965..e44ab9d5d 100644
216--- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt
217+++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
218@@ -22,7 +22,6 @@ function(add_helpers target_name)
219 target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
220 "${IE_MAIN_SOURCE_DIR}/src/inference_engine"
221 $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES>
222- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
223 "${IE_MAIN_SOURCE_DIR}/src/vpu/"
224 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
225
226diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
227index a2550bfaa..0eb616415 100644
228--- a/inference-engine/thirdparty/CMakeLists.txt
229+++ b/inference-engine/thirdparty/CMakeLists.txt
230@@ -51,28 +51,16 @@ function(build_with_lto)
231 function(ie_build_pugixml)
232 set(BUILD_TESTS_current ${BUILD_TESTS})
233 set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
234- add_subdirectory(pugixml)
235 set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE)
236 endfunction()
237
238 ie_build_pugixml()
239 add_subdirectory(stb_lib)
240- add_subdirectory(ade)
241 add_subdirectory(fluid/modules/gapi)
242
243- target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
244-
245- set_target_properties(pugixml ade fluid stb_image
246+ set_target_properties(fluid stb_image
247 PROPERTIES FOLDER thirdparty)
248
249- # developer package
250-
251- ie_developer_export_targets(ade fluid pugixml)
252- if(TARGET pugixml_mt)
253- ie_developer_export_targets(pugixml_mt)
254- set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty)
255- endif()
256-
257 if(ENABLE_MKL_DNN)
258 set(SDL_cmake_included ON)
259 include(mkldnn.cmake)
260--
2612.26.2
262
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-05 03:37:51 +0000