summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-06-05 01:26:01 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2020-06-11 15:35:56 +0800
commit78386dd80bcc9b740c181ce4718af7e0b328f85a (patch)
treebf5c92b798890fafb3bb0f8b05ebf60d75ef1b97 /dynamic-layers/openembedded-layer/recipes-support
parent7006412eb1535e55598d337a1ca7705410ba37a9 (diff)
downloadmeta-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')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch383
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch45
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch206
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch30
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch204
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch35
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch52
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest17
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.3.0.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb)46
9 files changed, 609 insertions, 409 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch
deleted file mode 100644
index c4c7bd01..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch
+++ /dev/null
@@ -1,383 +0,0 @@
1From 1c78ff3ff1f77c78a618f7a780985cef1933bb2b Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Mon, 13 Apr 2020 15:20:28 +0800
4Subject: [PATCH] Installation and build fixes
5
6- Install libs, samples and binaries at appropriate places.
7- Use system installed pugixml, ade, gflags, ngraph, opencl-headers
8and icd-loader.
9- Disable usage of Werror.
10- Use find_library to look for tbb instead of looking for cmake module.
11
12Upstream-Status: Inappropriate [OS-specific]
13
14Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
15---
16 CMakeLists.txt | 2 --
17 cmake/developer_package.cmake | 8 +++++---
18 cmake/os_flags.cmake | 1 -
19 inference-engine/CMakeLists.txt | 7 ++-----
20 inference-engine/cmake/ie_parallel.cmake | 10 ++--------
21 .../include/gpu/gpu_ocl_wrapper.hpp | 2 +-
22 inference-engine/samples/CMakeLists.txt | 8 +++-----
23 .../samples/common/format_reader/CMakeLists.txt | 2 ++
24 .../src/cldnn_engine/CMakeLists.txt | 1 +
25 .../src/inference_engine/CMakeLists.txt | 17 +----------------
26 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
27 .../tests/mock_engine/CMakeLists.txt | 2 ++
28 inference-engine/tests/unit/CMakeLists.txt | 2 ++
29 inference-engine/thirdparty/CMakeLists.txt | 4 +---
30 .../clDNN/CMakeCompilerLinkerOpts.txt | 2 --
31 .../thirdparty/clDNN/CMakeLists.txt | 1 -
32 .../clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 2 +-
33 .../tools/compile_tool/CMakeLists.txt | 2 +-
34 .../tools/vpu/vpu_compile/CMakeLists.txt | 4 ++--
35 .../tools/vpu/vpu_perfcheck/CMakeLists.txt | 2 +-
36 20 files changed, 28 insertions(+), 53 deletions(-)
37
38diff --git a/CMakeLists.txt b/CMakeLists.txt
39index e48cee57..e9598455 100644
40--- a/CMakeLists.txt
41+++ b/CMakeLists.txt
42@@ -120,8 +120,6 @@ function(build_ngraph)
43 endif()
44
45 ie_cpack_add_component(ngraph)
46-
47- add_subdirectory(ngraph)
48 endfunction()
49
50 build_ngraph()
51diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
52index e59edb2b..35672cac 100644
53--- a/cmake/developer_package.cmake
54+++ b/cmake/developer_package.cmake
55@@ -5,7 +5,9 @@
56 include(CPackComponent)
57 unset(IE_CPACK_COMPONENTS_ALL CACHE)
58
59-set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
60+if (NOT DEFINED IE_CPACK_IE_DIR)
61+ set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
62+endif()
63
64 function(ie_cpack_set_library_dir)
65 string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} ARCH)
66@@ -18,7 +20,7 @@ function(ie_cpack_set_library_dir)
67 if(WIN32)
68 set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/$<CONFIG>/${ARCH} PARENT_SCOPE)
69 else()
70- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
71+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
72 endif()
73 endfunction()
74
75@@ -99,7 +101,7 @@ if(UNIX)
76 SET(LIB_DL ${CMAKE_DL_LIBS})
77 endif()
78
79-set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
80+set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
81
82 # Enable postfixes for Debug/Release builds
83 set(IE_DEBUG_POSTFIX_WIN "d")
84diff --git a/cmake/os_flags.cmake b/cmake/os_flags.cmake
85index 6f70768f..40141aca 100644
86--- a/cmake/os_flags.cmake
87+++ b/cmake/os_flags.cmake
88@@ -139,7 +139,6 @@ if(WIN32)
89 else()
90 # TODO: enable for C sources as well
91 # ie_add_compiler_flags(-Werror)
92- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
93 ie_add_compiler_flags(-ffunction-sections -fdata-sections)
94 ie_add_compiler_flags(-fvisibility=hidden)
95 ie_add_compiler_flags(-fdiagnostics-show-option)
96diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
97index d5feedb4..1ee656a1 100644
98--- a/inference-engine/CMakeLists.txt
99+++ b/inference-engine/CMakeLists.txt
100@@ -123,12 +123,13 @@ install(FILES samples/CMakeLists.txt
101
102 # install Python samples
103
104+if (ENABLE_PYTHON)
105 ie_cpack_add_component(python_samples REQUIRED DEPENDS core)
106
107 install(DIRECTORY ${ie_python_api_SOURCE_DIR}/sample/
108 DESTINATION ${IE_CPACK_IE_DIR}/samples/python
109 COMPONENT python_samples)
110-
111+endif()
112 # Custom target to build only Inference Engine Developer Package targets
113
114 add_custom_target(ie_dev_targets ALL DEPENDS inference_engine HeteroPlugin)
115@@ -136,10 +137,6 @@ add_custom_target(ie_dev_targets ALL DEPENDS inference_engine HeteroPlugin)
116 # Developer package
117 ie_developer_export_targets(format_reader)
118
119-if (ENABLE_NGRAPH)
120- ie_developer_export_targets(${NGRAPH_LIBRARIES})
121-endif()
122-
123 export(TARGETS ${IEDeveloperPackageTargets} NAMESPACE IE::
124 APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
125
126diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
127index 9ea885be..71733fd9 100644
128--- a/inference-engine/cmake/ie_parallel.cmake
129+++ b/inference-engine/cmake/ie_parallel.cmake
130@@ -42,14 +42,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
131 set(IE_THREAD_DEFINE "IE_THREAD_SEQ")
132
133 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
134- find_package(TBB COMPONENTS tbb tbbmalloc)
135- if (TBB_FOUND)
136- set(IE_THREAD_DEFINE "IE_THREAD_TBB")
137- ie_target_link_libraries(${TARGET_NAME} PUBLIC ${TBB_IMPORTED_TARGETS})
138- else ()
139- ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \
140- SEQ method will be used for ${TARGET_NAME}")
141- endif ()
142+ set(IE_THREAD_DEFINE "IE_THREAD_TBB")
143+ target_link_libraries(${TARGET_NAME} PUBLIC tbb tbbmalloc)
144 elseif (THREADING STREQUAL "OMP")
145 if (WIN32)
146 set(omp_lib_name libiomp5md)
147diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
148index fce7d8f1..827e5764 100644
149--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
150+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
151@@ -21,4 +21,4 @@
152 # pragma GCC system_header
153 #endif
154
155-#include <CL/cl2.hpp>
156+#include <cl2.hpp>
157diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
158index f355e7b9..d24c7c78 100644
159--- a/inference-engine/samples/CMakeLists.txt
160+++ b/inference-engine/samples/CMakeLists.txt
161@@ -24,7 +24,7 @@ endif()
162
163 if(IE_MAIN_SOURCE_DIR)
164 # in case if samples are built from IE repo
165- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
166+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
167 # hint for find_package(InferenceEngine in the samples folder)
168 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
169 else()
170@@ -91,10 +91,6 @@ set (HAVE_INTTYPES_H 1)
171 set (INTTYPES_FORMAT C99)
172 set (BUILD_TESTING OFF)
173
174-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
175- add_subdirectory(thirdparty/gflags)
176-endif()
177-
178 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
179 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
180 endif()
181@@ -203,6 +199,8 @@ macro(ie_add_sample)
182 if(COMMAND add_cpplint_target AND NOT IE_SAMPLE_EXCLUDE_CPPLINT)
183 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME})
184 endif()
185+
186+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
187 endmacro()
188
189 # collect all samples subdirectories
190diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
191index 6d935135..fe12eeb7 100644
192--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
193+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
194@@ -40,3 +40,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
195 "${CMAKE_CURRENT_SOURCE_DIR}/..")
196
197 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
198+
199+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
200diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
201index 43344e7f..50beda23 100644
202--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
203+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
204@@ -32,6 +32,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
205 ${CMAKE_CURRENT_SOURCE_DIR}
206 ${CLDNN__IOCL_ICD_INCDIRS}
207 ${CLDNN_TOP_FOLDER}
208+ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp
209 ${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src)
210
211 # copy default global xml file describing the custom kernels and the *.cl files
212diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
213index 54e264c8..e3809654 100644
214--- a/inference-engine/src/inference_engine/CMakeLists.txt
215+++ b/inference-engine/src/inference_engine/CMakeLists.txt
216@@ -292,20 +292,6 @@ if(threading_tbb)
217 ie_cpack_add_component(tbb REQUIRED)
218 list(APPEND core_components tbb)
219
220- install(DIRECTORY "${TBB}/include"
221- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
222- COMPONENT tbb)
223- install(DIRECTORY "${TBB}/lib"
224- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
225- COMPONENT tbb)
226- if(EXISTS "${TBB}/bin")
227- install(DIRECTORY "${TBB}/bin"
228- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
229- COMPONENT tbb)
230- endif()
231- install(FILES "${TBB}/LICENSE"
232- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
233- COMPONENT tbb)
234 endif()
235
236 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
237@@ -318,10 +304,9 @@ install(TARGETS ${TARGET_NAME} ${TARGET_NAME}_nn_builder
238 LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH}
239 COMPONENT core)
240 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
241- "${OpenVINO_BINARY_DIR}/share/ie_rh_decoder.cmake"
242 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
243 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
244- DESTINATION ${IE_CPACK_IE_DIR}/share
245+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
246 COMPONENT core)
247 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
248 DESTINATION ${IE_CPACK_LIBRARY_PATH}
249diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
250index 32cb534a..858ffefc 100644
251--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
252+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
253@@ -41,5 +41,5 @@ target_link_libraries(${TARGET_NAME}
254 # install
255
256 install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
257- DESTINATION deployment_tools/inference_engine/external
258+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
259 COMPONENT myriad)
260diff --git a/inference-engine/tests/mock_engine/CMakeLists.txt b/inference-engine/tests/mock_engine/CMakeLists.txt
261index f3fb53e1..09fb66ce 100644
262--- a/inference-engine/tests/mock_engine/CMakeLists.txt
263+++ b/inference-engine/tests/mock_engine/CMakeLists.txt
264@@ -38,3 +38,5 @@ target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLU
265 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD 11)
266 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
267 set_property(TARGET ${TARGET_NAME} PROPERTY COMPILE_PDB_NAME ${TARGET_NAME})
268+
269+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
270diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
271index a5c945ae..eabe70d3 100644
272--- a/inference-engine/tests/unit/CMakeLists.txt
273+++ b/inference-engine/tests/unit/CMakeLists.txt
274@@ -187,3 +187,5 @@ add_test(NAME ${TARGET_NAME}
275 COMMAND ${TARGET_NAME})
276
277 add_dependencies(${TARGET_NAME} mock_engine)
278+
279+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
280diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
281index ec22761d..3962d924 100644
282--- a/inference-engine/thirdparty/CMakeLists.txt
283+++ b/inference-engine/thirdparty/CMakeLists.txt
284@@ -35,14 +35,12 @@ function(build_with_lto)
285 add_subdirectory(clDNN)
286 endif()
287
288- add_subdirectory(pugixml)
289 add_subdirectory(stb_lib)
290- add_subdirectory(ade)
291 add_subdirectory(fluid/modules/gapi)
292
293 # developer package
294
295- ie_developer_export_targets(ade fluid pugixml)
296+ ie_developer_export_targets(fluid)
297 if(TARGET pugixml_mt)
298 ie_developer_export_targets(pugixml_mt)
299 endif()
300diff --git a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
301index 6b799cdd..91755b35 100644
302--- a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
303+++ b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
304@@ -206,7 +206,6 @@ elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
305 ALIAS RttiDisabled "-fno-rtti"
306 ALIAS RttiEnabled "-frtti"
307 ALIAS TreatWarnAsErrorDisabled TreatWarnAsError REMOVE_GROUP
308- ALIAS TreatWarnAsErrorEnabled "-Werror" "-pedantic-errors"
309 ALIAS WarnLevel0 "-w"
310 ALIAS WarnLevel1 WarnLevels REMOVE_GROUP
311 ALIAS WarnLevel2 "-Wall"
312@@ -290,7 +289,6 @@ elseif((CMAKE_C_COMPILER_ID MATCHES "^Clang$") OR (CMAKE_CXX_COMPILER_ID MATCHES
313 ALIAS RttiDisabled "-fno-rtti"
314 ALIAS RttiEnabled Rtti REMOVE_GROUP
315 ALIAS TreatWarnAsErrorDisabled TreatWarnAsError REMOVE_GROUP
316- ALIAS TreatWarnAsErrorEnabled "-Werror"
317 ALIAS WarnLevel0 "-w"
318 ALIAS WarnLevel1 WarnLevels REMOVE_GROUP
319 ALIAS WarnLevel2 "-Wall"
320diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
321index b08c2744..42ca79e6 100644
322--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
323+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
324@@ -767,7 +767,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
325 MultiProcessorCompilation
326 DeadCodeEliminate
327 ExtensionsEnabled
328- TreatWarnAsErrorEnabled
329 WarnLevel4
330 NoFastMath
331 StackProtector
332diff --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
333index a9e379bd..8b822223 100644
334--- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
335+++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
336@@ -30,7 +30,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel;
337 typedef cl_va_api_device_source_intel cl_device_source_intel;
338 typedef cl_va_api_device_set_intel cl_device_set_intel;
339 #endif
340-#include <CL/cl_intel_planar_yuv.h>
341+#include <CL/cl_ext_intel.h>
342
343 namespace cl {
344 typedef CL_API_ENTRY cl_int(CL_API_CALL *PFN_clEnqueueAcquireMediaSurfacesINTEL)(
345diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
346index 25168bac..1c57116f 100644
347--- a/inference-engine/tools/compile_tool/CMakeLists.txt
348+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
349@@ -48,5 +48,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
350 # install
351
352 install(TARGETS compile_tool
353- RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH}
354+ RUNTIME DESTINATION bin
355 COMPONENT core)
356diff --git a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
357index 4123de6f..52179fac 100644
358--- a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
359+++ b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
360@@ -50,5 +50,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
361 # install
362
363 install(TARGETS ${TARGET_NAME}
364- RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH}
365- COMPONENT myriad)
366\ No newline at end of file
367+ RUNTIME DESTINATION bin
368+ COMPONENT myriad)
369diff --git a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
370index a7a801d4..b8f9e26f 100644
371--- a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
372+++ b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
373@@ -55,6 +55,6 @@ if(ENABLE_MYRIAD)
374 add_perfcheck_target(myriad_perfcheck myriadPlugin)
375
376 install(TARGETS myriad_perfcheck
377- RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH}
378+ RUNTIME DESTINATION bin
379 COMPONENT myriad)
380 endif()
381--
3822.25.2
383
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
new file mode 100644
index 00000000..e5ff530a
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
@@ -0,0 +1,45 @@
1From 5d0f3782ba264880b3bb5b96b6d78e2581aa6efd Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 9 Jun 2020 11:35:59 +0800
4Subject: [PATCH] don't install licenses and version
5
6Upstream-Status: Inappropriate
7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9---
10 CMakeLists.txt | 13 ++-----------
11 1 file changed, 2 insertions(+), 11 deletions(-)
12
13diff --git a/CMakeLists.txt b/CMakeLists.txt
14index c347cb465d..d0ec643eb0 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
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
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--
442.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
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 @@
1From e7730e68795c8ed0b9e1772ddc21ec931da462d0 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 1/5] 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/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
22diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
23index 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()
52diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
53index 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)
73diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
74index 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})
113diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt
114index 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()
127diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
128index 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
139diff --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
140index 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
167diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
168index 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
179diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
180index 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--
2052.25.4
206
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
new file mode 100644
index 00000000..a4e58b8e
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch
@@ -0,0 +1,30 @@
1From 65014a2703a6a3892fdebc86fe1c5a3a589dbf56 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:45:48 +0800
4Subject: [PATCH 2/5] cldNN: disable Werror
5
6Don't treat warnings as errors. This just leads to failures every time
7we upgrade the compiler.
8
9Upstream-Status: Inappropriate
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
17index 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--
292.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
new file mode 100644
index 00000000..5fa1b2ec
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
@@ -0,0 +1,204 @@
1From 0838608d9c2b09a845efbdde88a09e151ac9ff7d Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 11 Jun 2020 14:24:04 +0800
4Subject: [PATCH] fixes
5
6Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
7---
8 CMakeLists.txt | 14 --------------
9 cmake/developer_package.cmake | 10 ++++++----
10 inference-engine/samples/CMakeLists.txt | 8 +++-----
11 .../samples/common/format_reader/CMakeLists.txt | 2 ++
12 .../src/inference_engine/CMakeLists.txt | 4 ++--
13 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
14 inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++-
15 .../tests/unit/inference_engine/CMakeLists.txt | 4 +++-
16 inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++-
17 9 files changed, 23 insertions(+), 29 deletions(-)
18
19diff --git a/CMakeLists.txt b/CMakeLists.txt
20index 902d3289..f1bfb3f5 100644
21--- a/CMakeLists.txt
22+++ b/CMakeLists.txt
23@@ -123,12 +123,8 @@ add_subdirectory(docs)
24
25 # install setupvars
26
27-ie_cpack_add_component(setupvars REQUIRED)
28
29 if(UNIX)
30- install(PROGRAMS scripts/setupvars/setupvars.sh
31- DESTINATION bin
32- COMPONENT setupvars)
33 elseif(WIN32)
34 install(PROGRAMS scripts/setupvars/setupvars.bat
35 DESTINATION bin
36@@ -138,22 +134,12 @@ endif()
37 # install install_dependencies
38
39 if(UNIX)
40- ie_cpack_add_component(install_dependencies REQUIRED)
41- install(DIRECTORY scripts/install_dependencies/
42- DESTINATION install_dependencies
43- COMPONENT install_dependencies)
44 endif()
45
46 # install files for demo
47
48-ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core)
49
50 if(UNIX)
51- install(DIRECTORY scripts/demo/
52- DESTINATION deployment_tools/demo
53- COMPONENT demo_scripts
54- USE_SOURCE_PERMISSIONS
55- PATTERN *.bat EXCLUDE)
56 elseif(WIN32)
57 install(DIRECTORY scripts/demo/
58 DESTINATION deployment_tools/demo
59diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
60index 23cd9b2d..24c33711 100644
61--- a/cmake/developer_package.cmake
62+++ b/cmake/developer_package.cmake
63@@ -7,7 +7,9 @@ set(CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake/download" ${CMAKE_MODUL
64 include(CPackComponent)
65 unset(IE_CPACK_COMPONENTS_ALL CACHE)
66
67-set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
68+if (NOT DEFINED IE_CPACK_IE_DIR)
69+ set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
70+endif()
71
72 # Search packages for the host system instead of packages for the target system
73 # in case of cross compilation these macros should be defined by the toolchain file
74@@ -40,8 +42,8 @@ function(ie_cpack_set_library_dir)
75 set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
76 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
77 else()
78- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
79- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
80+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
81+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
82 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
83 endif()
84 endfunction()
85@@ -143,7 +145,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "")
86 set(CMAKE_BUILD_TYPE "Release")
87 endif()
88
89-set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
90+set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
91
92 # Enable postfixes for Debug/Release builds
93 set(IE_DEBUG_POSTFIX_WIN "d")
94diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
95index 033a8aab..4a871ca6 100644
96--- a/inference-engine/samples/CMakeLists.txt
97+++ b/inference-engine/samples/CMakeLists.txt
98@@ -28,7 +28,7 @@ endif()
99
100 if(IE_MAIN_SOURCE_DIR)
101 # in case if samples are built from IE repo
102- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
103+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
104 # hint for find_package(InferenceEngine in the samples folder)
105 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
106 else()
107@@ -110,10 +110,6 @@ set (HAVE_INTTYPES_H 1)
108 set (INTTYPES_FORMAT C99)
109 set (BUILD_TESTING OFF)
110
111-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
112- add_subdirectory(thirdparty/gflags)
113-endif()
114-
115 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
116 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
117 endif()
118@@ -222,6 +218,8 @@ macro(ie_add_sample)
119 if(COMMAND add_cpplint_target AND NOT IE_SAMPLE_EXCLUDE_CPPLINT)
120 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME})
121 endif()
122+
123+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
124 endmacro()
125
126 # collect all samples subdirectories
127diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
128index 6d935135..fe12eeb7 100644
129--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
130+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
131@@ -40,3 +40,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
132 "${CMAKE_CURRENT_SOURCE_DIR}/..")
133
134 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
135+
136+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
137diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
138index c8cd4b27..babe8ff5 100644
139--- a/inference-engine/src/inference_engine/CMakeLists.txt
140+++ b/inference-engine/src/inference_engine/CMakeLists.txt
141@@ -289,8 +289,8 @@ install(TARGETS ${TARGET_NAME} ${TARGET_NAME}_nn_builder
142 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
143 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
144 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
145- DESTINATION ${IE_CPACK_IE_DIR}/share
146+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
147 COMPONENT core)
148 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
149- DESTINATION ${IE_CPACK_RUNTIME_PATH}
150+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
151 COMPONENT core)
152diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
153index b35910f6..304d6d40 100644
154--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
155+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
156@@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME}
157 # install
158
159 install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
160- DESTINATION ${IE_CPACK_IE_DIR}/external
161+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
162 COMPONENT myriad)
163diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
164index 9ec5ad02..45c62571 100644
165--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
166+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
167@@ -22,4 +22,6 @@ addIeTargetTest(
168 ADD_CPPLINT
169 LABELS
170 CPU
171-)
172\ No newline at end of file
173+)
174+
175+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
176diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
177index 55e52b59..9d383d74 100644
178--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
179+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
180@@ -12,4 +12,6 @@ addIeTargetTest(
181 ADD_CPPLINT
182 LABELS
183 INFERENCE_ENGINE
184-)
185\ No newline at end of file
186+)
187+
188+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
189diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
190index 39fb1d5a..5ce82b5f 100644
191--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
192+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
193@@ -23,4 +23,6 @@ addIeTargetTest(
194 LABELS
195 VPU
196 MYRIAD
197-)
198\ No newline at end of file
199+)
200+
201+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
202--
2032.25.4
204
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
new file mode 100644
index 00000000..8169f9fb
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch
@@ -0,0 +1,35 @@
1From deec5feef34f86eb5616252e2e5b685b6555f561 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:49:03 +0800
4Subject: [PATCH 4/5] fix compilation errors
5
6Fixes errors like:
7
8build/tmp/work/skylake-64-poky-linux/dldt-inference-engine/2020r1-r0/git/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h:295:28:
9error: 'runtime_error' is not a member of 'std'
10 295 | throw std::runtime_error("Tensor pitches didn't
11set correctly");
12 |
13
14Upstream-Status: Pending
15
16Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
17---
18 .../thirdparty/clDNN/kernel_selector/common/tensor_type.h | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
22index 7f05b67f..641a4c9b 100644
23--- a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
24+++ b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
25@@ -25,6 +25,7 @@
26 #include <array>
27 #include <string>
28 #include <utility>
29+#include <stdexcept>
30
31 namespace kernel_selector {
32 #define KERNEL_SELECTOR_TENSOR_DIM_MAX 9
33--
342.25.4
35
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
new file mode 100644
index 00000000..1b842da2
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch
@@ -0,0 +1,52 @@
1From 0d0810481186fc443fe65a6119ddcc71ba21e814 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:50:19 +0800
4Subject: [PATCH 5/5] cldnn: fix inclusion of headers
5
6Upstream-Status: Inappropriate
7
8Signed-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
15diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
16index fce7d8f1..827e5764 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>
25diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
26index de56ed8e..c81453ab 100644
27--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
28+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
29@@ -31,6 +31,7 @@ set (CLDNN_TOP_FOLDER ${IE_MAIN_SOURCE_DIR}/thirdparty/clDNN)
30 target_include_directories(${TARGET_NAME} PRIVATE
31 ${CMAKE_CURRENT_SOURCE_DIR}
32 ${CLDNN__IOCL_ICD_INCDIRS}
33+ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp
34 ${CLDNN_TOP_FOLDER})
35
36 # copy default global xml file describing the custom kernels and the *.cl files
37diff --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
38index 8f668b18..a1d24438 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--
512.25.4
52
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
index 92f238a9..0b995ccb 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
@@ -1,13 +1,8 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# InferenceEngineUnitTests requires libmock_engine.so, since they are 3for i in cpu ie vpu
4# installed in the same directory we will need to set LD_LIBRARY_PATH 4do
5# so that libmock_engine.so is picked up correctly. We also assume that 5 ./$i"UnitTests" |sed \
6# this script is only execute within the same directory where it is 6 -e 's|\[.*OK.*\]\(.*\)|PASS:\1|' \
7# installed. 7 -e 's|\[.*FAILED.*\]\(.*\)|FAIL:\1|'
8 8done
9export LD_LIBRARY_PATH=.
10
11./InferenceEngineUnitTests |sed \
12 -e 's|\[.*OK.*\]\(.*\)|PASS:\1|' \
13 -e 's|\[.*FAILED.*\]\(.*\)|FAIL:\1|'
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.3.0.bb
index ea13f392..41964728 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.3.0.bb
@@ -4,27 +4,33 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
4deep learning models through a high-level C++ Inference Engine API \ 4deep learning models through a high-level C++ Inference Engine API \
5integrated with application logic." 5integrated with application logic."
6 6
7SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2020 \ 7SRC_URI = "gitsm://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2020/3 \
8 https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_usb-ma2450_942_R10.15.zip;name=ma2450 \ 8 https://download.01.org/opencv/2020/openvinotoolkit/2020.3/inference_engine/firmware_usb-ma2450_1119.zip;name=ma2450 \
9 https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_pcie-ma248x_942_R10.15.zip;name=ma248x \ 9 https://download.01.org/opencv/2020/openvinotoolkit/2020.3/inference_engine/firmware_pcie-ma248x_1119.zip;name=ma248x \
10 https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_usb-ma2x8x_942_R10.15.zip;name=ma2x8x \ 10 https://download.01.org/opencv/2020/openvinotoolkit/2020.3/inference_engine/firmware_usb-ma2x8x_1119.zip;name=ma2x8x \
11 file://0001-Installation-and-build-fixes.patch \ 11 file://0001-inference-engine-use-system-installed-packages.patch \
12 file://0002-cldNN-disable-Werror.patch \
13 file://0003-inference-engine-installation-fixes.patch \
14 file://0004-fix-compilation-errors.patch \
15 file://0005-cldnn-fix-inclusion-of-headers.patch \
12 file://0001-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch \ 16 file://0001-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch \
17 file://0001-dont-install-licenses-and-version-file.patch;patchdir=ngraph \
13 file://run-ptest \ 18 file://run-ptest \
14 " 19 "
15 20
16SRCREV = "b2140c083a068a63591e8c2e9b5f6b240790519d" 21SRCREV = "2fe9b1523058e282ad374db7dc1b3538c7d2dd27"
17 22
18SRC_URI[ma2450.sha256sum] = "32747515f0a387a8f878a88670aefe2788132fa24828b3775df791144627d9f6" 23SRC_URI[ma2450.sha256sum] = "9b8f61954751343995dde9d714134e5082dbaadffb0c7c33d41ce84c1296a20e"
19SRC_URI[ma248x.sha256sum] = "f32cd6396d0e6f0e4b24c8ee15e9f0b1b493ebbfc0f03371ca732f75b763d4a2" 24SRC_URI[ma248x.sha256sum] = "338940db127b16231e0afa948c83ed576458b130dd2a0a593c5edb29d9637f35"
20SRC_URI[ma2x8x.sha256sum] = "c00f77692bfdccf92f32233b3dd1189f51dee73c15d79f35a612c7ba841d9c8d" 25SRC_URI[ma2x8x.sha256sum] = "94cd485105de47ef3f747baec1261a1254ddf30e308807948dd8b0176ecdfebf"
21 26
22LICENSE = "Apache-2.0 & ISSL & MIT" 27LICENSE = "Apache-2.0 & ISSL & MIT"
23LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ 28LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
24 file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \ 29 file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \
25 file://inference-engine/tests/libs/gtest/googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
26 file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ 30 file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
27 file://inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/LICENSE.txt;md5=88b295a48d2b3244ba65d3c055472c8a \ 31 file://inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/LICENSE.txt;md5=88b295a48d2b3244ba65d3c055472c8a \
32 file://inference-engine/tests/ie_test_utils/common_test_utils/gtest/googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
33 file://inference-engine/tests/ie_test_utils/common_test_utils/gtest/googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
28" 34"
29LICENSE_${PN}-vpu-firmware = "ISSL" 35LICENSE_${PN}-vpu-firmware = "ISSL"
30 36
@@ -37,7 +43,7 @@ EXTRA_OECMAKE += " \
37 -DENABLE_PLUGIN_RPATH=0 \ 43 -DENABLE_PLUGIN_RPATH=0 \
38 -DENABLE_GNA=0 \ 44 -DENABLE_GNA=0 \
39 -DPYTHON_EXECUTABLE=${PYTHON} \ 45 -DPYTHON_EXECUTABLE=${PYTHON} \
40 -DCMAKE_BUILD_TYPE=DebugWithRelInfo \ 46 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
41 -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \ 47 -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \
42 -DENABLE_TESTS="${@bb.utils.contains('PTEST_ENABLED', '1', '1', '0', d)}" \ 48 -DENABLE_TESTS="${@bb.utils.contains('PTEST_ENABLED', '1', '1', '0', d)}" \
43 -DBUILD_GMOCK=1 \ 49 -DBUILD_GMOCK=1 \
@@ -48,13 +54,21 @@ EXTRA_OECMAKE += " \
48 -DENABLE_NGRAPH=ON \ 54 -DENABLE_NGRAPH=ON \
49 -DENABLE_MKL_DNN=ON \ 55 -DENABLE_MKL_DNN=ON \
50 -DIE_CPACK_IE_DIR=${prefix} \ 56 -DIE_CPACK_IE_DIR=${prefix} \
57 -DNGRAPH_UNIT_TEST_ENABLE=FALSE \
58 -DNGRAPH_TEST_UTIL_ENABLE=FALSE \
59 -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \
60 -DNGRAPH_JSON_ENABLE=FALSE \
61 -DNGRAPH_NATIVE_ARCH_ENABLE=FALSE \
62 -DNGRAPH_NOP_ENABLE=FALSE \
63 -DNGRAPH_GENERIC_CPU_ENABLE=FALSE \
64 -DTREAT_WARNING_AS_ERROR=FALSE \
51 " 65 "
52 66
53DEPENDS += "libusb1 \ 67DEPENDS += "libusb1 \
54 ade \ 68 ade \
55 opencv \ 69 opencv \
56 pugixml \ 70 pugixml \
57 ngraph \ 71 protobuf-native \
58 tbb \ 72 tbb \
59 ${@bb.utils.contains('PTEST_ENABLED', '1', 'gflags', '', d)} \ 73 ${@bb.utils.contains('PTEST_ENABLED', '1', 'gflags', '', d)} \
60 " 74 "
@@ -63,7 +77,7 @@ COMPATIBLE_HOST = '(x86_64).*-linux'
63COMPATIBLE_HOST_libc-musl = "null" 77COMPATIBLE_HOST_libc-musl = "null"
64 78
65PACKAGECONFIG ?= "vpu" 79PACKAGECONFIG ?= "vpu"
66PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, opencl-icd-loader libva, intel-compute-runtime" 80PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, ocl-icd opencl-headers libva, intel-compute-runtime"
67PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native, python3 python3-numpy python3-opencv python3-progress python3-cython" 81PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native, python3 python3-numpy python3-opencv python3-progress python3-cython"
68PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2450_FILE=../mvnc/usb-ma2450.mvcmd -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA248X_FILE=../mvnc/pcie-ma248x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware" 82PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2450_FILE=../mvnc/usb-ma2450.mvcmd -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA248X_FILE=../mvnc/pcie-ma248x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware"
69PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" 83PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
@@ -85,8 +99,10 @@ do_install_append() {
85 99
86 install -d ${D}${PYTHON_SITEPACKAGES_DIR} 100 install -d ${D}${PYTHON_SITEPACKAGES_DIR}
87 mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ 101 mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/
102 mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/
88 103
89 rm -rf ${D}${prefix}/python 104 rm -rf ${D}${prefix}/python
105 rm -rf ${D}${prefix}/deployment_tools
90 fi 106 fi
91 107
92 # Remove the samples source directory. We install the built samples. 108 # Remove the samples source directory. We install the built samples.
@@ -98,8 +114,8 @@ do_install_ptest_base_prepend() {
98 # what ptest helps with, adding the unit tests here as ptest would help. 114 # what ptest helps with, adding the unit tests here as ptest would help.
99 # Create a dummy Makefile so installation doesn't fail. 115 # Create a dummy Makefile so installation doesn't fail.
100 touch ${WORKDIR}/Makefile 116 touch ${WORKDIR}/Makefile
101 mv ${D}${bindir}/InferenceEngineUnitTests ${D}${PTEST_PATH}/ 117
102 mv ${D}${libdir}/libmock_engine.so ${D}${PTEST_PATH}/ 118 mv ${D}${bindir}/*UnitTests ${D}${PTEST_PATH}/
103} 119}
104 120
105# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR 121# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-02-01 20:55:57 +0000