diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files')
6 files changed, 0 insertions, 621 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch deleted file mode 100644 index 185a475b..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From a7ee6a27135fef24a398690d9280aca79315fa25 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Tue, 9 Jun 2020 11:35:59 +0800 | ||
4 | Subject: [PATCH] don't install licenses and version | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | CMakeLists.txt | 13 ++----------- | ||
11 | 1 file changed, 2 insertions(+), 11 deletions(-) | ||
12 | |||
13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
14 | index c347cb465d..9f57a5ed9c 100644 | ||
15 | --- a/CMakeLists.txt | ||
16 | +++ b/CMakeLists.txt | ||
17 | @@ -641,7 +641,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
18 | install(EXPORT ngraphTargets | ||
19 | FILE ngraphTargets.cmake | ||
20 | NAMESPACE ngraph:: | ||
21 | - DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake | ||
22 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
23 | COMPONENT ngraph) | ||
24 | |||
25 | configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in | ||
26 | @@ -654,15 +654,6 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
27 | |||
28 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake | ||
29 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake | ||
30 | - DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake | ||
31 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
32 | COMPONENT ngraph) | ||
33 | endif() | ||
34 | - | ||
35 | -install(DIRECTORY | ||
36 | - ${CMAKE_CURRENT_SOURCE_DIR}/licenses | ||
37 | - DESTINATION "${NGRAPH_COMPONENT_PREFIX}." | ||
38 | - COMPONENT ngraph | ||
39 | -) | ||
40 | - | ||
41 | -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) | ||
42 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) | ||
43 | -- | ||
44 | 2.25.4 | ||
45 | |||
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 3fff5607..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch +++ /dev/null | |||
@@ -1,256 +0,0 @@ | |||
1 | From cc44429f0e55efa0fa142cc043e83123e3b376e4 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] 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/CMakeLists.txt | 2 +- | ||
14 | inference-engine/cmake/ie_parallel.cmake | 10 ++------- | ||
15 | .../src/inference_engine/CMakeLists.txt | 22 +------------------ | ||
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, 9 insertions(+), 71 deletions(-) | ||
23 | |||
24 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | ||
25 | index 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() | ||
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) | ||
67 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | ||
68 | index 0f3c41e0a..b3b2dfdab 100644 | ||
69 | --- a/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) | ||
72 | set(IE_THREAD_DEFINE "IE_THREAD_SEQ") | ||
73 | |||
74 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | ||
75 | - find_package(TBB COMPONENTS tbb tbbmalloc) | ||
76 | - if (TBB_FOUND) | ||
77 | - set(IE_THREAD_DEFINE "IE_THREAD_TBB") | ||
78 | - ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS}) | ||
79 | - else () | ||
80 | - ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \ | ||
81 | - SEQ method will be used for ${TARGET_NAME}") | ||
82 | - endif () | ||
83 | + set(IE_THREAD_DEFINE "IE_THREAD_TBB") | ||
84 | + target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) | ||
85 | elseif (THREADING STREQUAL "OMP") | ||
86 | if (WIN32) | ||
87 | set(omp_lib_name libiomp5md) | ||
88 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | ||
89 | index 4ae0d5607..4106cf8b4 100644 | ||
90 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | ||
91 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | ||
92 | @@ -124,8 +124,7 @@ if(NGRAPH_ONNX_IMPORT_ENABLE) | ||
93 | target_compile_definitions(${TARGET_NAME}_obj PRIVATE ONNX_IMPORT_ENABLE) | ||
94 | endif() | ||
95 | |||
96 | -target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> | ||
97 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) | ||
98 | +target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | ||
99 | |||
100 | target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" | ||
101 | $<TARGET_PROPERTY:${TARGET_NAME}_reader_api,INTERFACE_INCLUDE_DIRECTORIES> | ||
102 | @@ -233,25 +232,6 @@ list(APPEND core_components ngraph) | ||
103 | if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | ||
104 | ie_cpack_add_component(tbb REQUIRED) | ||
105 | list(APPEND core_components tbb) | ||
106 | - | ||
107 | - install(DIRECTORY "${TBB}/include" | ||
108 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
109 | - COMPONENT tbb) | ||
110 | - install(DIRECTORY "${TBB}/lib" | ||
111 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
112 | - COMPONENT tbb) | ||
113 | - if(EXISTS "${TBB}/bin") | ||
114 | - install(DIRECTORY "${TBB}/bin" | ||
115 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
116 | - COMPONENT tbb) | ||
117 | - endif() | ||
118 | - install(FILES "${TBB}/LICENSE" | ||
119 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
120 | - COMPONENT tbb) | ||
121 | - install(FILES "${TBB}/cmake/TBBConfig.cmake" | ||
122 | - "${TBB}/cmake/TBBConfigVersion.cmake" | ||
123 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake | ||
124 | - COMPONENT tbb) | ||
125 | endif() | ||
126 | |||
127 | 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 | ||
129 | index 85524310b..dc25cae2f 100644 | ||
130 | --- a/inference-engine/src/legacy_api/CMakeLists.txt | ||
131 | +++ b/inference-engine/src/legacy_api/CMakeLists.txt | ||
132 | @@ -33,8 +33,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CM | ||
133 | ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl | ||
134 | $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> | ||
135 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | ||
136 | - $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> | ||
137 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) | ||
138 | + $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | ||
139 | |||
140 | # Create shared library | ||
141 | |||
142 | 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 | ||
144 | --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | ||
145 | +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | ||
146 | @@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) | ||
147 | |||
148 | target_include_directories(${TARGET_NAME} | ||
149 | SYSTEM PUBLIC | ||
150 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | ||
151 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | ||
152 | "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include") | ||
153 | |||
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 | ||
155 | index efead7271..732abee2d 100644 | ||
156 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | ||
157 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | ||
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 () | ||
168 | endif () | ||
169 | |||
170 | list(APPEND EXPORT_DEPENDENCIES | ||
171 | - ${PUGI} | ||
172 | ${NGRAPH_LIBRARIES} | ||
173 | - gtest | ||
174 | - gtest_main | ||
175 | ) | ||
176 | |||
177 | set(TARGET_NAME commonTestUtils) | ||
178 | @@ -74,7 +71,6 @@ function(add_common_utils ADD_TARGET_NAME) | ||
179 | PUBLIC | ||
180 | ${IE_TESTS_ROOT}/ie_test_utils | ||
181 | $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES> | ||
182 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | ||
183 | PRIVATE | ||
184 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | ||
185 | ) | ||
186 | @@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME) | ||
187 | target_link_libraries(${ADD_TARGET_NAME} | ||
188 | PUBLIC | ||
189 | ${EXPORT_DEPENDENCIES} | ||
190 | + pugixml | ||
191 | ) | ||
192 | endfunction() | ||
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} | ||
208 | diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | ||
209 | index bf915e52d..9e7173db6 100644 | ||
210 | --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt | ||
211 | +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | ||
212 | @@ -23,7 +23,6 @@ function(add_helpers target_name) | ||
213 | "${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> | ||
216 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | ||
217 | "${IE_MAIN_SOURCE_DIR}/src/vpu/" | ||
218 | PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") | ||
219 | |||
220 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | ||
221 | index f94453e06..b3c25daf4 100644 | ||
222 | --- a/inference-engine/thirdparty/CMakeLists.txt | ||
223 | +++ b/inference-engine/thirdparty/CMakeLists.txt | ||
224 | @@ -38,28 +38,16 @@ function(build_with_lto) | ||
225 | function(ie_build_pugixml) | ||
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() | ||
231 | |||
232 | ie_build_pugixml() | ||
233 | add_subdirectory(stb_lib) | ||
234 | - add_subdirectory(ade) | ||
235 | add_subdirectory(fluid/modules/gapi) | ||
236 | |||
237 | - target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") | ||
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 | - | ||
245 | - ie_developer_export_targets(ade fluid pugixml) | ||
246 | - if(TARGET pugixml_mt) | ||
247 | - ie_developer_export_targets(pugixml_mt) | ||
248 | - set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty) | ||
249 | - endif() | ||
250 | - | ||
251 | if(ENABLE_MKL_DNN) | ||
252 | set(SDL_cmake_included ON) | ||
253 | include(mkldnn.cmake) | ||
254 | -- | ||
255 | 2.26.2 | ||
256 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch deleted file mode 100644 index a4e58b8e..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 65014a2703a6a3892fdebc86fe1c5a3a589dbf56 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 10 Jun 2020 09:45:48 +0800 | ||
4 | Subject: [PATCH 2/5] cldNN: disable Werror | ||
5 | |||
6 | Don't treat warnings as errors. This just leads to failures every time | ||
7 | we upgrade the compiler. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
16 | diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
17 | index 4b444eca..8610b9b8 100644 | ||
18 | --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
19 | +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
20 | @@ -770,7 +770,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") | ||
21 | MultiProcessorCompilation | ||
22 | DeadCodeEliminate | ||
23 | ExtensionsEnabled | ||
24 | - TreatWarnAsErrorEnabled | ||
25 | WarnLevel4 | ||
26 | NoFastMath | ||
27 | StackProtector | ||
28 | -- | ||
29 | 2.25.4 | ||
30 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch deleted file mode 100644 index ac34fa4f..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch +++ /dev/null | |||
@@ -1,215 +0,0 @@ | |||
1 | From d9adfdc9c802fdb880fb658085854384f90a88c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 11 Jun 2020 14:24:04 +0800 | ||
4 | Subject: [PATCH] cmake installation fixes | ||
5 | |||
6 | Make sure that libraries/samples/binaries are installed correctly. | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | CMakeLists.txt | 14 -------------- | ||
11 | cmake/developer_package.cmake | 10 ++++++---- | ||
12 | .../ie_bridges/c/samples/common/CMakeLists.txt | 2 ++ | ||
13 | inference-engine/samples/CMakeLists.txt | 9 +++------ | ||
14 | .../samples/common/format_reader/CMakeLists.txt | 2 ++ | ||
15 | .../src/inference_engine/CMakeLists.txt | 4 ++-- | ||
16 | .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- | ||
17 | inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++- | ||
18 | .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ | ||
19 | inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++- | ||
20 | 10 files changed, 24 insertions(+), 29 deletions(-) | ||
21 | |||
22 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
23 | index 1f981ed25..2c014ca27 100644 | ||
24 | --- a/CMakeLists.txt | ||
25 | +++ b/CMakeLists.txt | ||
26 | @@ -121,12 +121,8 @@ add_subdirectory(docs) | ||
27 | |||
28 | # install setupvars | ||
29 | |||
30 | -ie_cpack_add_component(setupvars REQUIRED) | ||
31 | |||
32 | if(UNIX) | ||
33 | - install(PROGRAMS scripts/setupvars/setupvars.sh | ||
34 | - DESTINATION bin | ||
35 | - COMPONENT setupvars) | ||
36 | elseif(WIN32) | ||
37 | install(PROGRAMS scripts/setupvars/setupvars.bat | ||
38 | DESTINATION bin | ||
39 | @@ -136,22 +132,12 @@ endif() | ||
40 | # install install_dependencies | ||
41 | |||
42 | if(UNIX) | ||
43 | - ie_cpack_add_component(install_dependencies REQUIRED) | ||
44 | - install(DIRECTORY scripts/install_dependencies/ | ||
45 | - DESTINATION install_dependencies | ||
46 | - COMPONENT install_dependencies) | ||
47 | endif() | ||
48 | |||
49 | # install files for demo | ||
50 | |||
51 | -ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core) | ||
52 | |||
53 | if(UNIX) | ||
54 | - install(DIRECTORY scripts/demo/ | ||
55 | - DESTINATION deployment_tools/demo | ||
56 | - COMPONENT demo_scripts | ||
57 | - USE_SOURCE_PERMISSIONS | ||
58 | - PATTERN *.bat EXCLUDE) | ||
59 | elseif(WIN32) | ||
60 | install(DIRECTORY scripts/demo/ | ||
61 | DESTINATION deployment_tools/demo | ||
62 | diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake | ||
63 | index 5e022244b..6e2cbf44e 100644 | ||
64 | --- a/cmake/developer_package.cmake | ||
65 | +++ b/cmake/developer_package.cmake | ||
66 | @@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH | ||
67 | include(CPackComponent) | ||
68 | unset(IE_CPACK_COMPONENTS_ALL CACHE) | ||
69 | |||
70 | -set(IE_CPACK_IE_DIR deployment_tools/inference_engine) | ||
71 | +if (NOT DEFINED IE_CPACK_IE_DIR) | ||
72 | + set(IE_CPACK_IE_DIR deployment_tools/inference_engine) | ||
73 | +endif() | ||
74 | |||
75 | # Search packages for the host system instead of packages for the target system | ||
76 | # in case of cross compilation these macros should be defined by the toolchain file | ||
77 | @@ -43,8 +45,8 @@ function(ie_cpack_set_library_dir) | ||
78 | set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) | ||
79 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) | ||
80 | else() | ||
81 | - set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) | ||
82 | - set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) | ||
83 | + set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) | ||
84 | + set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) | ||
85 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) | ||
86 | endif() | ||
87 | endfunction() | ||
88 | @@ -147,7 +149,7 @@ endif() | ||
89 | |||
90 | # allow to override default OUTPUT_ROOT root | ||
91 | if(NOT DEFINED OUTPUT_ROOT) | ||
92 | - set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) | ||
93 | + set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) | ||
94 | endif() | ||
95 | |||
96 | # Enable postfixes for Debug/Release builds | ||
97 | diff --git a/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt | ||
98 | index b8d5ddf62..d086478f6 100644 | ||
99 | --- a/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt | ||
100 | +++ b/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt | ||
101 | @@ -29,3 +29,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) | ||
102 | if(COMMAND add_cpplint_target) | ||
103 | add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | ||
104 | endif() | ||
105 | + | ||
106 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
107 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | ||
108 | index 594e581b1..4e95a7808 100644 | ||
109 | --- a/inference-engine/samples/CMakeLists.txt | ||
110 | +++ b/inference-engine/samples/CMakeLists.txt | ||
111 | @@ -34,7 +34,7 @@ endif() | ||
112 | |||
113 | if(IE_MAIN_SOURCE_DIR) | ||
114 | # in case if samples are built from IE repo | ||
115 | - set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR}) | ||
116 | + set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR}) | ||
117 | # hint for find_package(InferenceEngine in the samples folder) | ||
118 | set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") | ||
119 | # hint for find_package(ngraph in the samples folder) | ||
120 | @@ -118,11 +118,6 @@ set (HAVE_INTTYPES_H 1) | ||
121 | set (INTTYPES_FORMAT C99) | ||
122 | set (BUILD_TESTING OFF) | ||
123 | |||
124 | -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") | ||
125 | - add_subdirectory(thirdparty/gflags) | ||
126 | - set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) | ||
127 | -endif() | ||
128 | - | ||
129 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
130 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") | ||
131 | endif() | ||
132 | @@ -239,6 +234,8 @@ macro(ie_add_sample) | ||
133 | add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} | ||
134 | CUSTOM_FILTERS ${custom_filters}) | ||
135 | endif() | ||
136 | + | ||
137 | + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) | ||
138 | endmacro() | ||
139 | |||
140 | # collect all samples subdirectories | ||
141 | diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
142 | index 48dbed9f2..76532fd04 100644 | ||
143 | --- a/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
144 | +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
145 | @@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | ||
146 | |||
147 | set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} | ||
148 | FOLDER cpp_samples) | ||
149 | + | ||
150 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
151 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | ||
152 | index 4ae0d5607..b9ee12498 100644 | ||
153 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | ||
154 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | ||
155 | @@ -265,8 +265,8 @@ install(TARGETS ${TARGET_NAME} | ||
156 | install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" | ||
157 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" | ||
158 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" | ||
159 | - DESTINATION ${IE_CPACK_IE_DIR}/share | ||
160 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine | ||
161 | COMPONENT core) | ||
162 | install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml | ||
163 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
164 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
165 | COMPONENT core) | ||
166 | diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
167 | index bf30d127c..6ed8c4081 100644 | ||
168 | --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
169 | +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
170 | @@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME} | ||
171 | # install | ||
172 | |||
173 | install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules | ||
174 | - DESTINATION ${IE_CPACK_IE_DIR}/external | ||
175 | + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d | ||
176 | COMPONENT myriad) | ||
177 | diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
178 | index 9ec5ad025..45c62571a 100644 | ||
179 | --- a/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
180 | +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
181 | @@ -22,4 +22,6 @@ addIeTargetTest( | ||
182 | ADD_CPPLINT | ||
183 | LABELS | ||
184 | CPU | ||
185 | -) | ||
186 | \ No newline at end of file | ||
187 | +) | ||
188 | + | ||
189 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
190 | diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
191 | index 3eb21a434..09ba9225a 100644 | ||
192 | --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
193 | +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
194 | @@ -15,3 +15,5 @@ addIeTargetTest( | ||
195 | LABELS | ||
196 | IE | ||
197 | ) | ||
198 | + | ||
199 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
200 | diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
201 | index 072103292..117cc9ee1 100644 | ||
202 | --- a/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
203 | +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
204 | @@ -26,4 +26,6 @@ addIeTargetTest( | ||
205 | LABELS | ||
206 | VPU | ||
207 | MYRIAD | ||
208 | -) | ||
209 | \ No newline at end of file | ||
210 | +) | ||
211 | + | ||
212 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
213 | -- | ||
214 | 2.26.2 | ||
215 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch deleted file mode 100644 index 1a54a124..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From ed444bf9f4dda442bd2da51140f45631163e0e55 Mon Sep 17 00:00:00 2001 | ||
2 | From: Vladimir Zinoviev <vladimir.zinoviev@intel.com> | ||
3 | Date: Sun, 14 Jun 2020 18:54:36 +0300 | ||
4 | Subject: [PATCH] [CLDNN] Fix std::runtime_error missing (#871) | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/ed444bf9f4dda442bd2da51140f45631163e0e55] | ||
7 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
8 | --- | ||
9 | .../thirdparty/clDNN/kernel_selector/common/tensor_type.h | 1 + | ||
10 | 1 file changed, 1 insertion(+) | ||
11 | |||
12 | diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h | ||
13 | index 3dbdfd0b22..2226f1a874 100644 | ||
14 | --- a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h | ||
15 | +++ b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h | ||
16 | @@ -25,6 +25,7 @@ | ||
17 | #include <array> | ||
18 | #include <string> | ||
19 | #include <utility> | ||
20 | +#include <stdexcept> | ||
21 | |||
22 | namespace kernel_selector { | ||
23 | #define KERNEL_SELECTOR_TENSOR_DIM_MAX 9 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch deleted file mode 100644 index d47d273c..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From f201d67c965318ebe49f0d38ea36e530c35a4701 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 10 Jun 2020 09:50:19 +0800 | ||
4 | Subject: [PATCH] cldnn: fix inclusion of headers | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 2 +- | ||
11 | inference-engine/src/cldnn_engine/CMakeLists.txt | 1 + | ||
12 | .../thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 2 +- | ||
13 | 3 files changed, 3 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | ||
16 | index fce7d8f17..827e5764a 100644 | ||
17 | --- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | ||
18 | +++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | ||
19 | @@ -21,4 +21,4 @@ | ||
20 | # pragma GCC system_header | ||
21 | #endif | ||
22 | |||
23 | -#include <CL/cl2.hpp> | ||
24 | +#include <cl2.hpp> | ||
25 | diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt | ||
26 | index eeb9b5c80..32a283ba4 100644 | ||
27 | --- a/inference-engine/src/cldnn_engine/CMakeLists.txt | ||
28 | +++ b/inference-engine/src/cldnn_engine/CMakeLists.txt | ||
29 | @@ -33,6 +33,7 @@ target_include_directories(${TARGET_NAME} PRIVATE | ||
30 | ${CMAKE_CURRENT_SOURCE_DIR} | ||
31 | $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> | ||
32 | ${CLDNN__IOCL_ICD_INCDIRS} | ||
33 | + ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp | ||
34 | ${CLDNN_TOP_FOLDER}) | ||
35 | |||
36 | # install | ||
37 | diff --git a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | ||
38 | index c67c81726..5ca48c597 100644 | ||
39 | --- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | ||
40 | +++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | ||
41 | @@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel; | ||
42 | typedef cl_va_api_device_source_intel cl_device_source_intel; | ||
43 | typedef cl_va_api_device_set_intel cl_device_set_intel; | ||
44 | #endif | ||
45 | -#include <CL/cl_intel_planar_yuv.h> | ||
46 | +#include <CL/cl_ext_intel.h> | ||
47 | #include "cl_intel_usm_defs.h" | ||
48 | |||
49 | #include <memory> | ||
50 | -- | ||
51 | 2.25.4 | ||
52 | |||