summaryrefslogtreecommitdiffstats
path: root/dynamic-layers
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-08-06 10:03:33 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2020-08-14 09:48:04 +0800
commit1937c72e021c7aeb66d3941cce950887f5b0ec93 (patch)
tree69b5f833a5a67c25f275c964b8269ae3accc60e0 /dynamic-layers
parentc783be47b2b7b3e92c652a78bb6c6684ae07bca2 (diff)
downloadmeta-intel-1937c72e021c7aeb66d3941cce950887f5b0ec93.tar.gz
openvino-inference-engine: upgrade 2020.3 -> 2020.4
For release notes, see: https://software.intel.com/content/www/us/en/develop/articles/openvino-relnotes.html The recipe has been changed to: - disable unit tests as they rely on an older version of googletest. - remove a patch as it was merged upstream. - backport a patch instead of using a local version. - refresh other patches. - download mkl-dnn separately instead of using the submodule. The project downloads a lot of other modules as well and we don't want/use those. - not download lfs documentation content. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch130
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch37
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch97
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch24
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch16
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest8
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.3.0.bb)54
7 files changed, 173 insertions, 193 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
index d1379de5..3fff5607 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
@@ -1,7 +1,7 @@
1From e7730e68795c8ed0b9e1772ddc21ec931da462d0 Mon Sep 17 00:00:00 2001 1From cc44429f0e55efa0fa142cc043e83123e3b376e4 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:43:55 +0800 3Date: Wed, 10 Jun 2020 09:43:55 +0800
4Subject: [PATCH 1/5] inference-engine: use system installed packages 4Subject: [PATCH] inference-engine: use system installed packages
5 5
6Use installed versions of pugixml, ade, protobuf and tbb. 6Use installed versions of pugixml, ade, protobuf and tbb.
7 7
@@ -10,17 +10,19 @@ Upstream-Status: Pending
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11--- 11---
12 cmake/dependencies.cmake | 17 -------------- 12 cmake/dependencies.cmake | 17 --------------
13 inference-engine/CMakeLists.txt | 2 +-
13 inference-engine/cmake/ie_parallel.cmake | 10 ++------- 14 inference-engine/cmake/ie_parallel.cmake | 10 ++-------
14 .../src/inference_engine/CMakeLists.txt | 22 +------------------ 15 .../src/inference_engine/CMakeLists.txt | 22 +------------------
15 .../src/legacy_api/CMakeLists.txt | 3 +-- 16 .../src/legacy_api/CMakeLists.txt | 3 +--
16 .../src/vpu/graph_transformer/CMakeLists.txt | 1 - 17 .../src/vpu/graph_transformer/CMakeLists.txt | 1 -
17 .../common_test_utils/CMakeLists.txt | 3 +-- 18 .../common_test_utils/CMakeLists.txt | 7 ++----
19 .../unit_test_utils/CMakeLists.txt | 3 +--
18 .../tests_deprecated/helpers/CMakeLists.txt | 1 - 20 .../tests_deprecated/helpers/CMakeLists.txt | 1 -
19 inference-engine/thirdparty/CMakeLists.txt | 11 +--------- 21 inference-engine/thirdparty/CMakeLists.txt | 14 +-----------
20 8 files changed, 6 insertions(+), 62 deletions(-) 22 10 files changed, 9 insertions(+), 71 deletions(-)
21 23
22diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake 24diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
23index 2a5a74db..9cc9a6c9 100644 25index 2a5a74db6..9cc9a6c94 100644
24--- a/cmake/dependencies.cmake 26--- a/cmake/dependencies.cmake
25+++ b/cmake/dependencies.cmake 27+++ b/cmake/dependencies.cmake
26@@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING) 28@@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING)
@@ -49,8 +51,21 @@ index 2a5a74db..9cc9a6c9 100644
49- 51-
50- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") 52- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
51 endif() 53 endif()
54diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
55index 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)
52diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake 67diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
53index 0f3c41e0..b3b2dfda 100644 68index 0f3c41e0a..b3b2dfdab 100644
54--- a/inference-engine/cmake/ie_parallel.cmake 69--- a/inference-engine/cmake/ie_parallel.cmake
55+++ b/inference-engine/cmake/ie_parallel.cmake 70+++ b/inference-engine/cmake/ie_parallel.cmake
56@@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME) 71@@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
@@ -71,20 +86,20 @@ index 0f3c41e0..b3b2dfda 100644
71 if (WIN32) 86 if (WIN32)
72 set(omp_lib_name libiomp5md) 87 set(omp_lib_name libiomp5md)
73diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt 88diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
74index c8cd4b27..d98ba55d 100644 89index 4ae0d5607..4106cf8b4 100644
75--- a/inference-engine/src/inference_engine/CMakeLists.txt 90--- a/inference-engine/src/inference_engine/CMakeLists.txt
76+++ b/inference-engine/src/inference_engine/CMakeLists.txt 91+++ b/inference-engine/src/inference_engine/CMakeLists.txt
77@@ -117,8 +117,7 @@ add_library(${TARGET_NAME}_obj OBJECT 92@@ -124,8 +124,7 @@ if(NGRAPH_ONNX_IMPORT_ENABLE)
78 93 target_compile_definitions(${TARGET_NAME}_obj PRIVATE ONNX_IMPORT_ENABLE)
79 target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API) 94 endif()
80 95
81-target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> 96-target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
82- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) 97- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
83+target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) 98+target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
84 99
85 target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" 100 target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
86 $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>) 101 $<TARGET_PROPERTY:${TARGET_NAME}_reader_api,INTERFACE_INCLUDE_DIRECTORIES>
87@@ -257,25 +256,6 @@ list(APPEND core_components ngraph) 102@@ -233,25 +232,6 @@ list(APPEND core_components ngraph)
88 if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") 103 if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
89 ie_cpack_add_component(tbb REQUIRED) 104 ie_cpack_add_component(tbb REQUIRED)
90 list(APPEND core_components tbb) 105 list(APPEND core_components tbb)
@@ -111,21 +126,21 @@ index c8cd4b27..d98ba55d 100644
111 126
112 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) 127 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
113diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt 128diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt
114index d54c5906..90920ab3 100644 129index 85524310b..dc25cae2f 100644
115--- a/inference-engine/src/legacy_api/CMakeLists.txt 130--- a/inference-engine/src/legacy_api/CMakeLists.txt
116+++ b/inference-engine/src/legacy_api/CMakeLists.txt 131+++ b/inference-engine/src/legacy_api/CMakeLists.txt
117@@ -33,8 +33,7 @@ target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE 132@@ -33,8 +33,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CM
118 133 ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl
119 target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src 134 $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
120 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> 135 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
121- $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> 136- $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
122- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) 137- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
123+ $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) 138+ $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
124 139
125 function(nn_builder_disable_warnings) 140 # Create shared library
126 disable_deprecated_warnings() 141
127diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt 142diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
128index 982d3c7f..db881246 100644 143index 982d3c7fa..db881246c 100644
129--- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt 144--- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
130+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt 145+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
131@@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) 146@@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
@@ -137,18 +152,30 @@ index 982d3c7f..db881246 100644
137 "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include") 152 "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include")
138 153
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 154diff --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 155index efead7271..732abee2d 100644
141--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt 156--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
142+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt 157+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
143@@ -28,7 +28,6 @@ else () 158@@ -23,7 +23,7 @@ function(add_gtest_libraries)
159 PROPERTIES FOLDER thirdparty)
160 endfunction()
161
162-add_gtest_libraries()
163+#add_gtest_libraries()
164
165 if (MSVC)
166 set(PUGI pugixml_mt)
167@@ -32,10 +32,7 @@ else ()
144 endif () 168 endif ()
145 169
146 list(APPEND EXPORT_DEPENDENCIES 170 list(APPEND EXPORT_DEPENDENCIES
147- ${PUGI} 171- ${PUGI}
148 ${NGRAPH_LIBRARIES} 172 ${NGRAPH_LIBRARIES}
149 gtest 173- gtest
150 gtest_main 174- gtest_main
151@@ -70,7 +69,6 @@ function(add_common_utils ADD_TARGET_NAME) 175 )
176
177 set(TARGET_NAME commonTestUtils)
178@@ -74,7 +71,6 @@ function(add_common_utils ADD_TARGET_NAME)
152 PUBLIC 179 PUBLIC
153 ${IE_TESTS_ROOT}/ie_test_utils 180 ${IE_TESTS_ROOT}/ie_test_utils
154 $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES> 181 $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
@@ -156,7 +183,7 @@ index 8a4ffd42..5bee450a 100644
156 PRIVATE 183 PRIVATE
157 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> 184 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
158 ) 185 )
159@@ -80,6 +78,7 @@ function(add_common_utils ADD_TARGET_NAME) 186@@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME)
160 target_link_libraries(${ADD_TARGET_NAME} 187 target_link_libraries(${ADD_TARGET_NAME}
161 PUBLIC 188 PUBLIC
162 ${EXPORT_DEPENDENCIES} 189 ${EXPORT_DEPENDENCIES}
@@ -164,43 +191,66 @@ index 8a4ffd42..5bee450a 100644
164 ) 191 )
165 endfunction() 192 endfunction()
166 193
194diff --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
195index 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}
167diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt 208diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
168index 14265fa9..2482be78 100644 209index bf915e52d..9e7173db6 100644
169--- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt 210--- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt
170+++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt 211+++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
171@@ -23,7 +23,6 @@ function(add_helpers target_name) 212@@ -23,7 +23,6 @@ function(add_helpers target_name)
172 target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
173 "${IE_MAIN_SOURCE_DIR}/src/inference_engine" 213 "${IE_MAIN_SOURCE_DIR}/src/inference_engine"
214 $<TARGET_PROPERTY:inference_engine_ir_reader,INTERFACE_INCLUDE_DIRECTORIES>
174 $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES> 215 $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES>
175- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> 216- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
176 "${IE_MAIN_SOURCE_DIR}/src/vpu/" 217 "${IE_MAIN_SOURCE_DIR}/src/vpu/"
177 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") 218 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
178 219
179diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt 220diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
180index ebf32c71..56b6bcb0 100644 221index f94453e06..b3c25daf4 100644
181--- a/inference-engine/thirdparty/CMakeLists.txt 222--- a/inference-engine/thirdparty/CMakeLists.txt
182+++ b/inference-engine/thirdparty/CMakeLists.txt 223+++ b/inference-engine/thirdparty/CMakeLists.txt
183@@ -35,19 +35,10 @@ function(build_with_lto) 224@@ -38,28 +38,16 @@ function(build_with_lto)
184 add_subdirectory(clDNN) 225 function(ie_build_pugixml)
185 endif() 226 set(BUILD_TESTS_current ${BUILD_TESTS})
227 set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
228- add_subdirectory(pugixml)
229 set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE)
230 endfunction()
186 231
187- add_subdirectory(pugixml) 232 ie_build_pugixml()
188 add_subdirectory(stb_lib) 233 add_subdirectory(stb_lib)
189- add_subdirectory(ade) 234- add_subdirectory(ade)
190 add_subdirectory(fluid/modules/gapi) 235 add_subdirectory(fluid/modules/gapi)
191 236
192- # developer package
193-
194- target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") 237- target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
195- 238-
239- set_target_properties(pugixml ade fluid stb_image
240+ set_target_properties(fluid stb_image
241 PROPERTIES FOLDER thirdparty)
242
243- # developer package
244-
196- ie_developer_export_targets(ade fluid pugixml) 245- ie_developer_export_targets(ade fluid pugixml)
197- if(TARGET pugixml_mt) 246- if(TARGET pugixml_mt)
198- ie_developer_export_targets(pugixml_mt) 247- ie_developer_export_targets(pugixml_mt)
248- set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty)
199- endif() 249- endif()
200+ ie_developer_export_targets(fluid) 250-
201 endfunction() 251 if(ENABLE_MKL_DNN)
202 252 set(SDL_cmake_included ON)
203 build_with_lto() 253 include(mkldnn.cmake)
204-- 254--
2052.25.4 2552.26.2
206 256
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch
deleted file mode 100644
index 057eff23..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 91d72cc97138e5349e36bba9329ae29dee814388 Mon Sep 17 00:00:00 2001
2From: Liwei Song <liwei.song@windriver.com>
3Date: Tue, 2 Jun 2020 09:55:49 +0000
4Subject: [PATCH] mkldnn_memory_solver.hpp: include stdint.h to avoid build
5 error
6
7fix the following compile error:
8
9inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp:60:9: error: 'int64_t' does not name a type
10| 60 | int64_t size;
11| | ^~~~~~~
12
13include stdint.h to fix this.
14
15Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/729]
16
17Signed-off-by: Liwei Song <liwei.song@windriver.com>
18---
19 inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp | 2 ++
20 1 file changed, 2 insertions(+)
21
22diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp b/inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp
23index 2c236a307276..aa52d29b310d 100644
24--- a/inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp
25+++ b/inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp
26@@ -10,6 +10,8 @@
27
28 #include "ie_api.h"
29
30+#include <stdint.h>
31+
32 #include <vector>
33 #include <map>
34
35--
362.24.1
37
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
index 5fa1b2ec..ac34fa4f 100644
--- 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
@@ -1,26 +1,29 @@
1From 0838608d9c2b09a845efbdde88a09e151ac9ff7d Mon Sep 17 00:00:00 2001 1From d9adfdc9c802fdb880fb658085854384f90a88c2 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 11 Jun 2020 14:24:04 +0800 3Date: Thu, 11 Jun 2020 14:24:04 +0800
4Subject: [PATCH] fixes 4Subject: [PATCH] cmake installation fixes
5
6Make sure that libraries/samples/binaries are installed correctly.
5 7
6Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
7--- 9---
8 CMakeLists.txt | 14 -------------- 10 CMakeLists.txt | 14 --------------
9 cmake/developer_package.cmake | 10 ++++++---- 11 cmake/developer_package.cmake | 10 ++++++----
10 inference-engine/samples/CMakeLists.txt | 8 +++----- 12 .../ie_bridges/c/samples/common/CMakeLists.txt | 2 ++
13 inference-engine/samples/CMakeLists.txt | 9 +++------
11 .../samples/common/format_reader/CMakeLists.txt | 2 ++ 14 .../samples/common/format_reader/CMakeLists.txt | 2 ++
12 .../src/inference_engine/CMakeLists.txt | 4 ++-- 15 .../src/inference_engine/CMakeLists.txt | 4 ++--
13 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- 16 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
14 inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++- 17 inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++-
15 .../tests/unit/inference_engine/CMakeLists.txt | 4 +++- 18 .../tests/unit/inference_engine/CMakeLists.txt | 2 ++
16 inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++- 19 inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++-
17 9 files changed, 23 insertions(+), 29 deletions(-) 20 10 files changed, 24 insertions(+), 29 deletions(-)
18 21
19diff --git a/CMakeLists.txt b/CMakeLists.txt 22diff --git a/CMakeLists.txt b/CMakeLists.txt
20index 902d3289..f1bfb3f5 100644 23index 1f981ed25..2c014ca27 100644
21--- a/CMakeLists.txt 24--- a/CMakeLists.txt
22+++ b/CMakeLists.txt 25+++ b/CMakeLists.txt
23@@ -123,12 +123,8 @@ add_subdirectory(docs) 26@@ -121,12 +121,8 @@ add_subdirectory(docs)
24 27
25 # install setupvars 28 # install setupvars
26 29
@@ -33,7 +36,7 @@ index 902d3289..f1bfb3f5 100644
33 elseif(WIN32) 36 elseif(WIN32)
34 install(PROGRAMS scripts/setupvars/setupvars.bat 37 install(PROGRAMS scripts/setupvars/setupvars.bat
35 DESTINATION bin 38 DESTINATION bin
36@@ -138,22 +134,12 @@ endif() 39@@ -136,22 +132,12 @@ endif()
37 # install install_dependencies 40 # install install_dependencies
38 41
39 if(UNIX) 42 if(UNIX)
@@ -57,10 +60,10 @@ index 902d3289..f1bfb3f5 100644
57 install(DIRECTORY scripts/demo/ 60 install(DIRECTORY scripts/demo/
58 DESTINATION deployment_tools/demo 61 DESTINATION deployment_tools/demo
59diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake 62diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
60index 23cd9b2d..24c33711 100644 63index 5e022244b..6e2cbf44e 100644
61--- a/cmake/developer_package.cmake 64--- a/cmake/developer_package.cmake
62+++ b/cmake/developer_package.cmake 65+++ b/cmake/developer_package.cmake
63@@ -7,7 +7,9 @@ set(CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake/download" ${CMAKE_MODUL 66@@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH
64 include(CPackComponent) 67 include(CPackComponent)
65 unset(IE_CPACK_COMPONENTS_ALL CACHE) 68 unset(IE_CPACK_COMPONENTS_ALL CACHE)
66 69
@@ -71,7 +74,7 @@ index 23cd9b2d..24c33711 100644
71 74
72 # Search packages for the host system instead of packages for the target system 75 # 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 76 # 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) 77@@ -43,8 +45,8 @@ function(ie_cpack_set_library_dir)
75 set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) 78 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) 79 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
77 else() 80 else()
@@ -82,20 +85,30 @@ index 23cd9b2d..24c33711 100644
82 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) 85 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
83 endif() 86 endif()
84 endfunction() 87 endfunction()
85@@ -143,7 +145,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "") 88@@ -147,7 +149,7 @@ endif()
86 set(CMAKE_BUILD_TYPE "Release")
87 endif()
88 89
89-set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) 90 # allow to override default OUTPUT_ROOT root
90+set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) 91 if(NOT DEFINED OUTPUT_ROOT)
92- set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
93+ set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
94 endif()
91 95
92 # Enable postfixes for Debug/Release builds 96 # Enable postfixes for Debug/Release builds
93 set(IE_DEBUG_POSTFIX_WIN "d") 97diff --git a/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt
98index 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})
94diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt 107diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
95index 033a8aab..4a871ca6 100644 108index 594e581b1..4e95a7808 100644
96--- a/inference-engine/samples/CMakeLists.txt 109--- a/inference-engine/samples/CMakeLists.txt
97+++ b/inference-engine/samples/CMakeLists.txt 110+++ b/inference-engine/samples/CMakeLists.txt
98@@ -28,7 +28,7 @@ endif() 111@@ -34,7 +34,7 @@ endif()
99 112
100 if(IE_MAIN_SOURCE_DIR) 113 if(IE_MAIN_SOURCE_DIR)
101 # in case if samples are built from IE repo 114 # in case if samples are built from IE repo
@@ -103,21 +116,22 @@ index 033a8aab..4a871ca6 100644
103+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR}) 116+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
104 # hint for find_package(InferenceEngine in the samples folder) 117 # hint for find_package(InferenceEngine in the samples folder)
105 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") 118 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
106 else() 119 # hint for find_package(ngraph in the samples folder)
107@@ -110,10 +110,6 @@ set (HAVE_INTTYPES_H 1) 120@@ -118,11 +118,6 @@ set (HAVE_INTTYPES_H 1)
108 set (INTTYPES_FORMAT C99) 121 set (INTTYPES_FORMAT C99)
109 set (BUILD_TESTING OFF) 122 set (BUILD_TESTING OFF)
110 123
111-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") 124-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
112- add_subdirectory(thirdparty/gflags) 125- add_subdirectory(thirdparty/gflags)
126- set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
113-endif() 127-endif()
114- 128-
115 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU) 129 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
116 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") 130 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
117 endif() 131 endif()
118@@ -222,6 +218,8 @@ macro(ie_add_sample) 132@@ -239,6 +234,8 @@ macro(ie_add_sample)
119 if(COMMAND add_cpplint_target AND NOT IE_SAMPLE_EXCLUDE_CPPLINT) 133 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME}
120 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME}) 134 CUSTOM_FILTERS ${custom_filters})
121 endif() 135 endif()
122+ 136+
123+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) 137+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
@@ -125,20 +139,20 @@ index 033a8aab..4a871ca6 100644
125 139
126 # collect all samples subdirectories 140 # collect all samples subdirectories
127diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt 141diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
128index 6d935135..fe12eeb7 100644 142index 48dbed9f2..76532fd04 100644
129--- a/inference-engine/samples/common/format_reader/CMakeLists.txt 143--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
130+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt 144+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
131@@ -40,3 +40,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" 145@@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
132 "${CMAKE_CURRENT_SOURCE_DIR}/..")
133 146
134 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) 147 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}
148 FOLDER cpp_samples)
135+ 149+
136+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) 150+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 151diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
138index c8cd4b27..babe8ff5 100644 152index 4ae0d5607..b9ee12498 100644
139--- a/inference-engine/src/inference_engine/CMakeLists.txt 153--- a/inference-engine/src/inference_engine/CMakeLists.txt
140+++ b/inference-engine/src/inference_engine/CMakeLists.txt 154+++ b/inference-engine/src/inference_engine/CMakeLists.txt
141@@ -289,8 +289,8 @@ install(TARGETS ${TARGET_NAME} ${TARGET_NAME}_nn_builder 155@@ -265,8 +265,8 @@ install(TARGETS ${TARGET_NAME}
142 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" 156 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
143 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" 157 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
144 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" 158 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
@@ -150,7 +164,7 @@ index c8cd4b27..babe8ff5 100644
150+ DESTINATION ${CMAKE_INSTALL_LIBDIR} 164+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
151 COMPONENT core) 165 COMPONENT core)
152diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 166diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
153index b35910f6..304d6d40 100644 167index bf30d127c..6ed8c4081 100644
154--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 168--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
155+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 169+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
156@@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME} 170@@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME}
@@ -161,7 +175,7 @@ index b35910f6..304d6d40 100644
161+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d 175+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
162 COMPONENT myriad) 176 COMPONENT myriad)
163diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt 177diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
164index 9ec5ad02..45c62571 100644 178index 9ec5ad025..45c62571a 100644
165--- a/inference-engine/tests/unit/cpu/CMakeLists.txt 179--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
166+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt 180+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
167@@ -22,4 +22,6 @@ addIeTargetTest( 181@@ -22,4 +22,6 @@ addIeTargetTest(
@@ -174,23 +188,20 @@ index 9ec5ad02..45c62571 100644
174+ 188+
175+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) 189+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 190diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
177index 55e52b59..9d383d74 100644 191index 3eb21a434..09ba9225a 100644
178--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt 192--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
179+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt 193+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
180@@ -12,4 +12,6 @@ addIeTargetTest( 194@@ -15,3 +15,5 @@ addIeTargetTest(
181 ADD_CPPLINT
182 LABELS 195 LABELS
183 INFERENCE_ENGINE 196 IE
184-) 197 )
185\ No newline at end of file
186+)
187+ 198+
188+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) 199+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 200diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
190index 39fb1d5a..5ce82b5f 100644 201index 072103292..117cc9ee1 100644
191--- a/inference-engine/tests/unit/vpu/CMakeLists.txt 202--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
192+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt 203+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
193@@ -23,4 +23,6 @@ addIeTargetTest( 204@@ -26,4 +26,6 @@ addIeTargetTest(
194 LABELS 205 LABELS
195 VPU 206 VPU
196 MYRIAD 207 MYRIAD
@@ -200,5 +211,5 @@ index 39fb1d5a..5ce82b5f 100644
200+ 211+
201+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) 212+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
202-- 213--
2032.25.4 2142.26.2
204 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
index 8169f9fb..1a54a124 100644
--- 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
@@ -1,25 +1,16 @@
1From deec5feef34f86eb5616252e2e5b685b6555f561 Mon Sep 17 00:00:00 2001 1From ed444bf9f4dda442bd2da51140f45631163e0e55 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Vladimir Zinoviev <vladimir.zinoviev@intel.com>
3Date: Wed, 10 Jun 2020 09:49:03 +0800 3Date: Sun, 14 Jun 2020 18:54:36 +0300
4Subject: [PATCH 4/5] fix compilation errors 4Subject: [PATCH] [CLDNN] Fix std::runtime_error missing (#871)
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 5
6Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/ed444bf9f4dda442bd2da51140f45631163e0e55]
16Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 7Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
17--- 8---
18 .../thirdparty/clDNN/kernel_selector/common/tensor_type.h | 1 + 9 .../thirdparty/clDNN/kernel_selector/common/tensor_type.h | 1 +
19 1 file changed, 1 insertion(+) 10 1 file changed, 1 insertion(+)
20 11
21diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h 12diff --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 13index 3dbdfd0b22..2226f1a874 100644
23--- a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h 14--- a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
24+++ b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h 15+++ b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
25@@ -25,6 +25,7 @@ 16@@ -25,6 +25,7 @@
@@ -30,6 +21,3 @@ index 7f05b67f..641a4c9b 100644
30 21
31 namespace kernel_selector { 22 namespace kernel_selector {
32 #define KERNEL_SELECTOR_TENSOR_DIM_MAX 9 23 #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
index 1b842da2..d47d273c 100644
--- 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
@@ -1,7 +1,7 @@
1From 0d0810481186fc443fe65a6119ddcc71ba21e814 Mon Sep 17 00:00:00 2001 1From f201d67c965318ebe49f0d38ea36e530c35a4701 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:50:19 +0800 3Date: Wed, 10 Jun 2020 09:50:19 +0800
4Subject: [PATCH 5/5] cldnn: fix inclusion of headers 4Subject: [PATCH] cldnn: fix inclusion of headers
5 5
6Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
7 7
@@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
13 3 files changed, 3 insertions(+), 2 deletions(-) 13 3 files changed, 3 insertions(+), 2 deletions(-)
14 14
15diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp 15diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
16index fce7d8f1..827e5764 100644 16index fce7d8f17..827e5764a 100644
17--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp 17--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
18+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp 18+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
19@@ -21,4 +21,4 @@ 19@@ -21,4 +21,4 @@
@@ -23,19 +23,19 @@ index fce7d8f1..827e5764 100644
23-#include <CL/cl2.hpp> 23-#include <CL/cl2.hpp>
24+#include <cl2.hpp> 24+#include <cl2.hpp>
25diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt 25diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
26index de56ed8e..c81453ab 100644 26index eeb9b5c80..32a283ba4 100644
27--- a/inference-engine/src/cldnn_engine/CMakeLists.txt 27--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
28+++ b/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) 29@@ -33,6 +33,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
30 target_include_directories(${TARGET_NAME} PRIVATE
31 ${CMAKE_CURRENT_SOURCE_DIR} 30 ${CMAKE_CURRENT_SOURCE_DIR}
31 $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
32 ${CLDNN__IOCL_ICD_INCDIRS} 32 ${CLDNN__IOCL_ICD_INCDIRS}
33+ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp 33+ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp
34 ${CLDNN_TOP_FOLDER}) 34 ${CLDNN_TOP_FOLDER})
35 35
36 # copy default global xml file describing the custom kernels and the *.cl files 36 # install
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 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 38index c67c81726..5ca48c597 100644
39--- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp 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 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; 41@@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel;
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
deleted file mode 100644
index 0b995ccb..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
+++ /dev/null
@@ -1,8 +0,0 @@
1#!/bin/sh
2
3for i in cpu ie vpu
4do
5 ./$i"UnitTests" |sed \
6 -e 's|\[.*OK.*\]\(.*\)|PASS:\1|' \
7 -e 's|\[.*FAILED.*\]\(.*\)|FAIL:\1|'
8done
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.3.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb
index 41964728..c2863e65 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.3.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb
@@ -4,37 +4,35 @@ 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 = "gitsm://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2020/3 \ 7SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2020/4;lfs=0 \
8 https://download.01.org/opencv/2020/openvinotoolkit/2020.3/inference_engine/firmware_usb-ma2450_1119.zip;name=ma2450 \ 8 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2450/firmware_usb-ma2450_1223.zip;name=ma2450 \
9 https://download.01.org/opencv/2020/openvinotoolkit/2020.3/inference_engine/firmware_pcie-ma248x_1119.zip;name=ma248x \ 9 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma248x/firmware_pcie-ma248x_1223.zip;name=ma248x \
10 https://download.01.org/opencv/2020/openvinotoolkit/2020.3/inference_engine/firmware_usb-ma2x8x_1119.zip;name=ma2x8x \ 10 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1223.zip;name=ma2x8x \
11 git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \
11 file://0001-inference-engine-use-system-installed-packages.patch \ 12 file://0001-inference-engine-use-system-installed-packages.patch \
12 file://0002-cldNN-disable-Werror.patch \ 13 file://0002-cldNN-disable-Werror.patch \
13 file://0003-inference-engine-installation-fixes.patch \ 14 file://0003-inference-engine-installation-fixes.patch \
14 file://0004-fix-compilation-errors.patch \ 15 file://0004-fix-compilation-errors.patch \
15 file://0005-cldnn-fix-inclusion-of-headers.patch \ 16 file://0005-cldnn-fix-inclusion-of-headers.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 \ 17 file://0001-dont-install-licenses-and-version-file.patch;patchdir=ngraph \
18 file://run-ptest \
19 " 18 "
20 19
21SRCREV = "2fe9b1523058e282ad374db7dc1b3538c7d2dd27" 20SRCREV = "023e7c2c3f8a8ac83564db09799d2049115d9cf6"
21SRCREV_mkl = "2706f56ebab54415be48add2751072065f4b52ab"
22 22
23SRC_URI[ma2450.sha256sum] = "9b8f61954751343995dde9d714134e5082dbaadffb0c7c33d41ce84c1296a20e" 23SRC_URI[ma2450.sha256sum] = "4dc246bd12d7a21c1b10ac3e090b30043777c4ea862e1e4119536ba03c5878ef"
24SRC_URI[ma248x.sha256sum] = "338940db127b16231e0afa948c83ed576458b130dd2a0a593c5edb29d9637f35" 24SRC_URI[ma248x.sha256sum] = "64dd77ecd2f7172421414a388a87be4e6271894a982a58b3829f9de1a1869abd"
25SRC_URI[ma2x8x.sha256sum] = "94cd485105de47ef3f747baec1261a1254ddf30e308807948dd8b0176ecdfebf" 25SRC_URI[ma2x8x.sha256sum] = "d1d209221c1389a9a04e14ffeeaff1c3308f6ab105c7bd22f0e300df01cce4d8"
26 26
27LICENSE = "Apache-2.0 & ISSL & MIT" 27LICENSE = "Apache-2.0 & ISSL & MIT"
28LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ 28LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
29 file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \ 29 file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \
30 file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ 30 file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
31 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 \
34" 32"
35LICENSE_${PN}-vpu-firmware = "ISSL" 33LICENSE_${PN}-vpu-firmware = "ISSL"
36 34
37inherit cmake ptest python3native 35inherit cmake python3native
38 36
39S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
40 38
@@ -45,23 +43,15 @@ EXTRA_OECMAKE += " \
45 -DPYTHON_EXECUTABLE=${PYTHON} \ 43 -DPYTHON_EXECUTABLE=${PYTHON} \
46 -DCMAKE_BUILD_TYPE=RelWithDebInfo \ 44 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
47 -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \ 45 -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \
48 -DENABLE_TESTS="${@bb.utils.contains('PTEST_ENABLED', '1', '1', '0', d)}" \
49 -DBUILD_GMOCK=1 \
50 -DBUILD_GTEST=0 \
51 -DINSTALL_GMOCK=0 \
52 -DINSTALL_GTEST=0 \
53 -DENABLE_SAMPLES=1 \ 46 -DENABLE_SAMPLES=1 \
54 -DENABLE_NGRAPH=ON \
55 -DENABLE_MKL_DNN=ON \
56 -DIE_CPACK_IE_DIR=${prefix} \ 47 -DIE_CPACK_IE_DIR=${prefix} \
57 -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ 48 -DNGRAPH_UNIT_TEST_ENABLE=FALSE \
58 -DNGRAPH_TEST_UTIL_ENABLE=FALSE \ 49 -DNGRAPH_TEST_UTIL_ENABLE=FALSE \
59 -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \ 50 -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \
60 -DNGRAPH_JSON_ENABLE=FALSE \ 51 -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 \ 52 -DTREAT_WARNING_AS_ERROR=FALSE \
53 -DENABLE_SPEECH_DEMO=FALSE \
54 -DENABLE_DATA=FALSE \
65 " 55 "
66 56
67DEPENDS += "libusb1 \ 57DEPENDS += "libusb1 \
@@ -70,7 +60,7 @@ DEPENDS += "libusb1 \
70 pugixml \ 60 pugixml \
71 protobuf-native \ 61 protobuf-native \
72 tbb \ 62 tbb \
73 ${@bb.utils.contains('PTEST_ENABLED', '1', 'gflags', '', d)} \ 63 onednn \
74 " 64 "
75 65
76COMPATIBLE_HOST = '(x86_64).*-linux' 66COMPATIBLE_HOST = '(x86_64).*-linux'
@@ -89,10 +79,6 @@ do_install_append() {
89 install -m0644 ${WORKDIR}/mvnc/pcie-ma248x.mvcmd ${D}${libdir}/ 79 install -m0644 ${WORKDIR}/mvnc/pcie-ma248x.mvcmd ${D}${libdir}/
90 fi 80 fi
91 81
92 if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'true', 'false', d)}; then
93 cp -r ${S}/inference-engine/src/cldnn_engine/cldnn_global_custom_kernels ${D}${libdir}/
94 fi
95
96 if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then 82 if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
97 install -d ${D}${datadir}/inference_engine 83 install -d ${D}${datadir}/inference_engine
98 mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/ 84 mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/
@@ -109,15 +95,6 @@ do_install_append() {
109 rm -rf ${D}/usr/samples 95 rm -rf ${D}/usr/samples
110} 96}
111 97
112do_install_ptest_base_prepend() {
113 # While not a Makefile based project that strictly falls into the category of
114 # what ptest helps with, adding the unit tests here as ptest would help.
115 # Create a dummy Makefile so installation doesn't fail.
116 touch ${WORKDIR}/Makefile
117
118 mv ${D}${bindir}/*UnitTests ${D}${PTEST_PATH}/
119}
120
121# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR 98# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
122# instead of RSS 99# instead of RSS
123SSTATE_SCAN_FILES_append = " *.cmake" 100SSTATE_SCAN_FILES_append = " *.cmake"
@@ -128,7 +105,6 @@ FILES_${PN}-dev = "${includedir} \
128 105
129FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \ 106FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \
130 ${datadir}/openvino \ 107 ${datadir}/openvino \
131 ${libdir}/cldnn_global_custom_kernels \
132 ${libdir}/custom_kernels \ 108 ${libdir}/custom_kernels \
133 ${libdir}/plugins.xml \ 109 ${libdir}/plugins.xml \
134 ${libdir}/cache.json \ 110 ${libdir}/cache.json \