summaryrefslogtreecommitdiffstats
path: root/dynamic-layers
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-12-28 10:21:51 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2020-12-29 16:35:15 +0800
commit7aeed42101fd3eaa3a0d7b91254d1919213794c5 (patch)
tree33fe2f941599ae403ae4b7d79a6925ab2056d506 /dynamic-layers
parent1fe615d8faed1e9a31a51cee1e35b44fb3d74052 (diff)
downloadmeta-intel-7aeed42101fd3eaa3a0d7b91254d1919213794c5.tar.gz
openvino: upgrade 2021.1 -> 2021.2
For release notes, see: https://software.intel.com/content/www/us/en/develop/articles/openvino-relnotes.html Refresh patches and use the now available option to build against system version of pugixml. 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-dont-install-licenses-and-version-file.patch32
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch200
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch80
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch18
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb)22
5 files changed, 125 insertions, 227 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
index 88aab623..2a2c8b87 100644
--- 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
@@ -1,4 +1,4 @@
1From 92df2822c7bc50275bb6a170820e04408db50040 Mon Sep 17 00:00:00 2001 1From a60710c910e6c995aef9dd36757bf040bf24acf5 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 9 Jun 2020 11:35:59 +0800 3Date: Tue, 9 Jun 2020 11:35:59 +0800
4Subject: [PATCH] don't install licenses and version 4Subject: [PATCH] don't install licenses and version
@@ -7,15 +7,15 @@ Upstream-Status: Inappropriate
7 7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9--- 9---
10 ngraph/CMakeLists.txt | 13 ++----------- 10 ngraph/CMakeLists.txt | 6 ++----
11 ngraph/test/runtime/CMakeLists.txt | 2 ++ 11 ngraph/test/runtime/CMakeLists.txt | 2 ++
12 2 files changed, 4 insertions(+), 11 deletions(-) 12 2 files changed, 4 insertions(+), 4 deletions(-)
13 13
14diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt 14diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
15index 4eb969f02..c52aec2ec 100644 15index 99f32a6181..b90aa382b9 100644
16--- a/ngraph/CMakeLists.txt 16--- a/ngraph/CMakeLists.txt
17+++ b/ngraph/CMakeLists.txt 17+++ b/ngraph/CMakeLists.txt
18@@ -496,7 +496,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) 18@@ -490,7 +490,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
19 install(EXPORT ngraphTargets 19 install(EXPORT ngraphTargets
20 FILE ngraphTargets.cmake 20 FILE ngraphTargets.cmake
21 NAMESPACE ngraph:: 21 NAMESPACE ngraph::
@@ -24,7 +24,7 @@ index 4eb969f02..c52aec2ec 100644
24 COMPONENT ngraph) 24 COMPONENT ngraph)
25 25
26 configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in 26 configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in
27@@ -509,15 +509,6 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) 27@@ -503,7 +503,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
28 28
29 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake 29 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
30 ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake 30 ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake
@@ -32,25 +32,23 @@ index 4eb969f02..c52aec2ec 100644
32+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph 32+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
33 COMPONENT ngraph) 33 COMPONENT ngraph)
34 endif() 34 endif()
35
36@@ -518,5 +518,3 @@ add_subdirectory(test)
37 if (NGRAPH_PYTHON_BUILD_ENABLE)
38 add_subdirectory(python)
39 endif()
35- 40-
36-install(DIRECTORY
37- ${CMAKE_CURRENT_SOURCE_DIR}/licenses
38- DESTINATION "${NGRAPH_COMPONENT_PREFIX}."
39- COMPONENT ngraph
40-)
41-
42-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph)
43-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) 41-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph)
44diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt 42diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt
45index e37aba8b7..83ed2efbd 100644 43index d27ea8090c..17a3843f7d 100644
46--- a/ngraph/test/runtime/CMakeLists.txt 44--- a/ngraph/test/runtime/CMakeLists.txt
47+++ b/ngraph/test/runtime/CMakeLists.txt 45+++ b/ngraph/test/runtime/CMakeLists.txt
48@@ -68,3 +68,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) 46@@ -80,3 +80,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
49 47
50 add_subdirectory(interpreter) 48 add_subdirectory(interpreter)
51 add_subdirectory(ie) 49 add_subdirectory(ie)
52+ 50+
53+install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) 51+install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB})
54-- 52--
552.26.2 532.29.2
56 54
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 bbf186df..1f64ce21 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,42 +1,39 @@
1From 7e2525fbe9a051197d76fe1ceb94b857eae33409 Mon Sep 17 00:00:00 2001 1From a8b6a2e251c42a393218174c6737208760d2e1c1 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] 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 ade, protobuf and tbb.
7 7
8Upstream-Status: Pending 8Upstream-Status: Pending
9 9
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 | 18 ------------------
13 inference-engine/CMakeLists.txt | 2 +- 13 inference-engine/CMakeLists.txt | 2 +-
14 inference-engine/cmake/ie_parallel.cmake | 7 +----- 14 inference-engine/cmake/ie_parallel.cmake | 7 +------
15 .../src/inference_engine/CMakeLists.txt | 23 +------------------ 15 .../src/inference_engine/CMakeLists.txt | 19 -------------------
16 .../src/legacy_api/CMakeLists.txt | 3 +-- 16 .../common_test_utils/CMakeLists.txt | 4 +---
17 .../src/vpu/graph_transformer/CMakeLists.txt | 1 -
18 .../common_test_utils/CMakeLists.txt | 7 ++----
19 .../unit_test_utils/CMakeLists.txt | 3 +-- 17 .../unit_test_utils/CMakeLists.txt | 3 +--
20 .../tests_deprecated/helpers/CMakeLists.txt | 1 - 18 inference-engine/thirdparty/CMakeLists.txt | 5 ++---
21 inference-engine/thirdparty/CMakeLists.txt | 14 +---------- 19 7 files changed, 6 insertions(+), 52 deletions(-)
22 10 files changed, 8 insertions(+), 70 deletions(-)
23 20
24diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake 21diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
25index 2a5a74db6..9cc9a6c94 100644 22index 6a44c8769e..a128eb63a1 100644
26--- a/cmake/dependencies.cmake 23--- a/cmake/dependencies.cmake
27+++ b/cmake/dependencies.cmake 24+++ b/cmake/dependencies.cmake
28@@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING) 25@@ -13,25 +13,7 @@ if(CMAKE_CROSSCOMPILING AND NGRAPH_ONNX_IMPORT_ENABLE)
29 26
30 set(protoc_version "3.7.1") 27 set(protoc_version "3.7.1")
31 if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux) 28 if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux)
32- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT 29- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
33- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" 30- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
34- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64") 31- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64")
35- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) 32- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
36 else() 33 else()
37 message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation") 34 message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation")
38 endif() 35 endif()
39 36-
40- reset_deps_cache(SYSTEM_PROTOC) 37- reset_deps_cache(SYSTEM_PROTOC)
41- 38-
42- message("${SYSTEM_PROTOC_ROOT}/bin") 39- message("${SYSTEM_PROTOC_ROOT}/bin")
@@ -52,10 +49,10 @@ index 2a5a74db6..9cc9a6c94 100644
52- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") 49- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
53 endif() 50 endif()
54diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt 51diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
55index 7f45ab021..db85e8690 100644 52index a3e4f74c40..76b09683dd 100644
56--- a/inference-engine/CMakeLists.txt 53--- a/inference-engine/CMakeLists.txt
57+++ b/inference-engine/CMakeLists.txt 54+++ b/inference-engine/CMakeLists.txt
58@@ -57,7 +57,7 @@ function(ie_developer_export) 55@@ -56,7 +56,7 @@ function(ie_developer_export)
59 APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") 56 APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
60 57
61 # Custom target to build only Inference Engine Developer Package targets 58 # Custom target to build only Inference Engine Developer Package targets
@@ -65,10 +62,10 @@ index 7f45ab021..db85e8690 100644
65 endfunction() 62 endfunction()
66 63
67diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake 64diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
68index 7fd77ccc0..143dcf669 100644 65index f8988aa105..28e79417f4 100644
69--- a/inference-engine/cmake/ie_parallel.cmake 66--- a/inference-engine/cmake/ie_parallel.cmake
70+++ b/inference-engine/cmake/ie_parallel.cmake 67+++ b/inference-engine/cmake/ie_parallel.cmake
71@@ -62,13 +62,8 @@ function(set_ie_threading_interface_for TARGET_NAME) 68@@ -67,13 +67,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
72 set(IE_THREAD_DEFINE "IE_THREAD_SEQ") 69 set(IE_THREAD_DEFINE "IE_THREAD_SEQ")
73 70
74 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") 71 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
@@ -76,37 +73,19 @@ index 7fd77ccc0..143dcf669 100644
76 set(IE_THREAD_DEFINE "IE_THREAD_TBB") 73 set(IE_THREAD_DEFINE "IE_THREAD_TBB")
77- ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS}) 74- ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS})
78- else () 75- else ()
79- ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \ 76- ext_message(WARNING "TBB was not found by the configured TBB_DIR path.\
80- SEQ method will be used for ${TARGET_NAME}") 77- SEQ method will be used for ${TARGET_NAME}")
81- endif () 78- endif ()
82+ target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) 79+ target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc)
83 elseif (THREADING STREQUAL "OMP") 80 elseif (THREADING STREQUAL "OMP")
84 if (WIN32) 81 if (WIN32)
85 set(omp_lib_name libiomp5md) 82 set(omp_lib_name libiomp5md)
86diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt 83diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
87index 9ab888983..105e666a3 100644 84index f012a038a2..3bba22215e 100644
88--- a/inference-engine/src/inference_engine/CMakeLists.txt 85--- a/inference-engine/src/inference_engine/CMakeLists.txt
89+++ b/inference-engine/src/inference_engine/CMakeLists.txt 86+++ b/inference-engine/src/inference_engine/CMakeLists.txt
90@@ -127,7 +127,6 @@ target_include_directories(${TARGET_NAME}_common_obj PRIVATE 87@@ -216,25 +216,6 @@ list(APPEND core_components ngraph)
91 $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>) 88 if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP})
92
93 target_include_directories(${TARGET_NAME}_common_obj SYSTEM PRIVATE
94- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
95 $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
96
97 # Create object library
98@@ -139,8 +138,7 @@ add_library(${TARGET_NAME}_obj OBJECT
99
100 target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API)
101
102-target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
103- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
104+target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
105
106 target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
107 "${IE_MAIN_SOURCE_DIR}/src/readers/ir_reader" # for ie_ir_version.hpp
108@@ -233,25 +231,6 @@ list(APPEND core_components ngraph)
109 if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
110 ie_cpack_add_component(tbb REQUIRED) 89 ie_cpack_add_component(tbb REQUIRED)
111 list(APPEND core_components tbb) 90 list(APPEND core_components tbb)
112- 91-
@@ -131,37 +110,11 @@ index 9ab888983..105e666a3 100644
131 endif() 110 endif()
132 111
133 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) 112 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
134diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt
135index ed87a073a..adc970a09 100644
136--- a/inference-engine/src/legacy_api/CMakeLists.txt
137+++ b/inference-engine/src/legacy_api/CMakeLists.txt
138@@ -39,8 +39,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE
139 ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl
140 $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
141 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
142- $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
143- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
144+ $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
145
146 # Create shared library
147
148diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
149index a45437453..7a67a8226 100644
150--- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
151+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
152@@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
153
154 target_include_directories(${TARGET_NAME}
155 SYSTEM PUBLIC
156- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
157 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
158 "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include")
159
160diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt 113diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
161index efead7271..732abee2d 100644 114index ca58264bd5..11df150845 100644
162--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt 115--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
163+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt 116+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
164@@ -23,7 +23,7 @@ function(add_gtest_libraries) 117@@ -26,7 +26,7 @@ function(add_gtest_libraries)
165 PROPERTIES FOLDER thirdparty) 118 PROPERTIES FOLDER thirdparty)
166 endfunction() 119 endfunction()
167 120
@@ -170,93 +123,50 @@ index efead7271..732abee2d 100644
170 123
171 if (MSVC) 124 if (MSVC)
172 set(PUGI pugixml_mt) 125 set(PUGI pugixml_mt)
173@@ -32,10 +32,7 @@ else () 126@@ -37,8 +37,6 @@ endif ()
174 endif ()
175
176 list(APPEND EXPORT_DEPENDENCIES 127 list(APPEND EXPORT_DEPENDENCIES
177- ${PUGI} 128 ${PUGI}
178 ${NGRAPH_LIBRARIES} 129 ${NGRAPH_LIBRARIES}
179- gtest 130- gtest
180- gtest_main 131- gtest_main
181 ) 132 )
182 133
183 set(TARGET_NAME commonTestUtils) 134 set(TARGET_NAME commonTestUtils)
184@@ -74,7 +71,6 @@ function(add_common_utils ADD_TARGET_NAME)
185 PUBLIC
186 ${IE_TESTS_ROOT}/ie_test_utils
187 $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
188- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
189 PRIVATE
190 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
191 )
192@@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME)
193 target_link_libraries(${ADD_TARGET_NAME}
194 PUBLIC
195 ${EXPORT_DEPENDENCIES}
196+ pugixml
197 )
198 endfunction()
199
200diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt 135diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
201index dbb0f4e5b..9586d651d 100644 136index 5413d13895..3f2803750f 100644
202--- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt 137--- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
203+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt 138+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
204@@ -9,8 +9,7 @@ add_subdirectory(mocks/mock_engine) 139@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine)
140
205 list(APPEND EXPORT_DEPENDENCIES 141 list(APPEND EXPORT_DEPENDENCIES
206 commonTestUtils_s 142 commonTestUtils_s
207 inference_engine_s 143- inference_engine_s
208- inference_engine_lp_transformations
209- gmock) 144- gmock)
210+ inference_engine_lp_transformations) 145+ inference_engine_s)
211 146
212 addIeTarget( 147 addIeTarget(
213 NAME ${TARGET_NAME} 148 NAME ${TARGET_NAME}
214diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
215index 2bc668965..e44ab9d5d 100644
216--- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt
217+++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
218@@ -22,7 +22,6 @@ function(add_helpers target_name)
219 target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
220 "${IE_MAIN_SOURCE_DIR}/src/inference_engine"
221 $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES>
222- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
223 "${IE_MAIN_SOURCE_DIR}/src/vpu/"
224 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
225
226diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt 149diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
227index a2550bfaa..0eb616415 100644 150index fa2a4d02d8..67d3b7ad05 100644
228--- a/inference-engine/thirdparty/CMakeLists.txt 151--- a/inference-engine/thirdparty/CMakeLists.txt
229+++ b/inference-engine/thirdparty/CMakeLists.txt 152+++ b/inference-engine/thirdparty/CMakeLists.txt
230@@ -51,28 +51,16 @@ function(build_with_lto) 153@@ -62,14 +62,13 @@ else()
231 function(ie_build_pugixml) 154 endif()
232 set(BUILD_TESTS_current ${BUILD_TESTS})
233 set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
234- add_subdirectory(pugixml)
235 set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE)
236 endfunction()
237 155
238 ie_build_pugixml() 156 add_subdirectory(stb_lib)
239 add_subdirectory(stb_lib) 157-add_subdirectory(ade)
240- add_subdirectory(ade) 158 add_subdirectory(fluid/modules/gapi)
241 add_subdirectory(fluid/modules/gapi)
242 159
243- target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") 160-set_target_properties(ade fluid stb_image PROPERTIES FOLDER thirdparty)
244- 161+set_target_properties(fluid stb_image PROPERTIES FOLDER thirdparty)
245- set_target_properties(pugixml ade fluid stb_image
246+ set_target_properties(fluid stb_image
247 PROPERTIES FOLDER thirdparty)
248 162
249- # developer package 163 # developer package
250- 164
251- ie_developer_export_targets(ade fluid pugixml) 165-ie_developer_export_targets(ade fluid)
252- if(TARGET pugixml_mt) 166+ie_developer_export_targets(fluid)
253- ie_developer_export_targets(pugixml_mt) 167
254- set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty) 168 if (NOT USE_SYSTEM_PUGIXML)
255- endif() 169 set_target_properties(pugixml PROPERTIES FOLDER thirdparty)
256-
257 if(ENABLE_MKL_DNN)
258 set(SDL_cmake_included ON)
259 include(mkldnn.cmake)
260-- 170--
2612.26.2 1712.29.2
262 172
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 9c91ac4d..52049eb0 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,4 +1,4 @@
1From 5bec3199ec6fd8f784cd688159f768a732c9ad69 Mon Sep 17 00:00:00 2001 1From cb9a755218ff033c8c42e9dc46a845310a3331fa 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] cmake installation fixes 4Subject: [PATCH] cmake installation fixes
@@ -14,17 +14,17 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14 .../samples/common/format_reader/CMakeLists.txt | 2 ++ 14 .../samples/common/format_reader/CMakeLists.txt | 2 ++
15 .../src/inference_engine/CMakeLists.txt | 4 ++-- 15 .../src/inference_engine/CMakeLists.txt | 4 ++--
16 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- 16 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
17 inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++- 17 inference-engine/tests/unit/cpu/CMakeLists.txt | 2 ++
18 .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ 18 .../tests/unit/inference_engine/CMakeLists.txt | 2 ++
19 inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++- 19 inference-engine/tests/unit/vpu/CMakeLists.txt | 2 ++
20 inference-engine/tools/compile_tool/CMakeLists.txt | 2 +- 20 inference-engine/tools/compile_tool/CMakeLists.txt | 2 +-
21 11 files changed, 25 insertions(+), 30 deletions(-) 21 11 files changed, 23 insertions(+), 28 deletions(-)
22 22
23diff --git a/CMakeLists.txt b/CMakeLists.txt 23diff --git a/CMakeLists.txt b/CMakeLists.txt
24index 18ed02ee5..18f6094f3 100644 24index 5c3585a3e9..2b8c99f862 100644
25--- a/CMakeLists.txt 25--- a/CMakeLists.txt
26+++ b/CMakeLists.txt 26+++ b/CMakeLists.txt
27@@ -143,12 +143,8 @@ add_subdirectory(docs) 27@@ -176,12 +176,8 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
28 28
29 # install setupvars 29 # install setupvars
30 30
@@ -37,7 +37,7 @@ index 18ed02ee5..18f6094f3 100644
37 elseif(WIN32) 37 elseif(WIN32)
38 install(PROGRAMS scripts/setupvars/setupvars.bat 38 install(PROGRAMS scripts/setupvars/setupvars.bat
39 DESTINATION bin 39 DESTINATION bin
40@@ -158,22 +154,12 @@ endif() 40@@ -191,22 +187,12 @@ endif()
41 # install install_dependencies 41 # install install_dependencies
42 42
43 if(UNIX) 43 if(UNIX)
@@ -61,10 +61,10 @@ index 18ed02ee5..18f6094f3 100644
61 install(DIRECTORY scripts/demo/ 61 install(DIRECTORY scripts/demo/
62 DESTINATION deployment_tools/demo 62 DESTINATION deployment_tools/demo
63diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake 63diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
64index 86137c384..af011c361 100644 64index cda7afd294..ec51636e96 100644
65--- a/cmake/developer_package.cmake 65--- a/cmake/developer_package.cmake
66+++ b/cmake/developer_package.cmake 66+++ b/cmake/developer_package.cmake
67@@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH 67@@ -29,7 +29,9 @@ list(APPEND CMAKE_MODULE_PATH
68 include(CPackComponent) 68 include(CPackComponent)
69 unset(IE_CPACK_COMPONENTS_ALL CACHE) 69 unset(IE_CPACK_COMPONENTS_ALL CACHE)
70 70
@@ -75,18 +75,18 @@ index 86137c384..af011c361 100644
75 75
76 # Search packages for the host system instead of packages for the target system 76 # Search packages for the host system instead of packages for the target system
77 # in case of cross compilation these macros should be defined by the toolchain file 77 # in case of cross compilation these macros should be defined by the toolchain file
78@@ -43,8 +45,8 @@ function(ie_cpack_set_library_dir) 78@@ -55,8 +57,8 @@ function(ie_cpack_set_library_dir)
79 set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) 79 set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
80 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) 80 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
81 else() 81 else()
82- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) 82- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
83- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) 83- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
84+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) 84+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
85+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) 85+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
86 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) 86 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
87 endif() 87 endif()
88 endfunction() 88 endfunction()
89@@ -147,7 +149,7 @@ endif() 89@@ -151,7 +153,7 @@ endif()
90 90
91 # allow to override default OUTPUT_ROOT root 91 # allow to override default OUTPUT_ROOT root
92 if(NOT DEFINED OUTPUT_ROOT) 92 if(NOT DEFINED OUTPUT_ROOT)
@@ -96,7 +96,7 @@ index 86137c384..af011c361 100644
96 96
97 # Enable postfixes for Debug/Release builds 97 # Enable postfixes for Debug/Release builds
98diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt 98diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
99index b8d5ddf62..d086478f6 100644 99index b8d5ddf622..d086478f6d 100644
100--- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt 100--- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
101+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt 101+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
102@@ -29,3 +29,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) 102@@ -29,3 +29,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples)
@@ -106,7 +106,7 @@ index b8d5ddf62..d086478f6 100644
106+ 106+
107+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) 107+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
108diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt 108diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
109index 4dda7eecd..04e1b9c3e 100644 109index 236c17e6af..22f410d1fd 100644
110--- a/inference-engine/samples/CMakeLists.txt 110--- a/inference-engine/samples/CMakeLists.txt
111+++ b/inference-engine/samples/CMakeLists.txt 111+++ b/inference-engine/samples/CMakeLists.txt
112@@ -34,7 +34,7 @@ endif() 112@@ -34,7 +34,7 @@ endif()
@@ -118,7 +118,7 @@ index 4dda7eecd..04e1b9c3e 100644
118 # hint for find_package(InferenceEngine in the samples folder) 118 # hint for find_package(InferenceEngine in the samples folder)
119 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") 119 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
120 # hint for find_package(ngraph in the samples folder) 120 # hint for find_package(ngraph in the samples folder)
121@@ -122,11 +122,6 @@ set (HAVE_INTTYPES_H 1) 121@@ -118,11 +118,6 @@ set (HAVE_INTTYPES_H 1)
122 set (INTTYPES_FORMAT C99) 122 set (INTTYPES_FORMAT C99)
123 set (BUILD_TESTING OFF) 123 set (BUILD_TESTING OFF)
124 124
@@ -130,7 +130,7 @@ index 4dda7eecd..04e1b9c3e 100644
130 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") 130 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
131 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") 131 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
132 endif() 132 endif()
133@@ -250,6 +245,8 @@ macro(ie_add_sample) 133@@ -245,6 +240,8 @@ macro(ie_add_sample)
134 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} 134 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME}
135 CUSTOM_FILTERS ${custom_filters}) 135 CUSTOM_FILTERS ${custom_filters})
136 endif() 136 endif()
@@ -140,7 +140,7 @@ index 4dda7eecd..04e1b9c3e 100644
140 140
141 # collect all samples subdirectories 141 # collect all samples subdirectories
142diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt 142diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
143index 48dbed9f2..76532fd04 100644 143index 48dbed9f2b..76532fd047 100644
144--- a/inference-engine/samples/common/format_reader/CMakeLists.txt 144--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
145+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt 145+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
146@@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" 146@@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -150,10 +150,10 @@ index 48dbed9f2..76532fd04 100644
150+ 150+
151+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) 151+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
152diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt 152diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
153index 105e666a3..5c2f70575 100644 153index 3bba22215e..b6f6b7b203 100644
154--- a/inference-engine/src/inference_engine/CMakeLists.txt 154--- a/inference-engine/src/inference_engine/CMakeLists.txt
155+++ b/inference-engine/src/inference_engine/CMakeLists.txt 155+++ b/inference-engine/src/inference_engine/CMakeLists.txt
156@@ -244,8 +244,8 @@ install(TARGETS ${TARGET_NAME} 156@@ -229,8 +229,8 @@ install(TARGETS ${TARGET_NAME}
157 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" 157 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
158 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" 158 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
159 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" 159 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
@@ -165,10 +165,10 @@ index 105e666a3..5c2f70575 100644
165+ DESTINATION ${CMAKE_INSTALL_LIBDIR} 165+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
166 COMPONENT core) 166 COMPONENT core)
167diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 167diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
168index aeebe4e04..310eb6231 100644 168index 889f2e6e66..67de9c3a32 100644
169--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 169--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
170+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 170+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
171@@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME} 171@@ -50,5 +50,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
172 # install 172 # install
173 173
174 install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules 174 install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
@@ -176,20 +176,17 @@ index aeebe4e04..310eb6231 100644
176+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d 176+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
177 COMPONENT myriad) 177 COMPONENT myriad)
178diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt 178diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
179index d7acf8908..be4ae4a76 100644 179index c9a92b4857..2b4fcc4d01 100644
180--- a/inference-engine/tests/unit/cpu/CMakeLists.txt 180--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
181+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt 181+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
182@@ -24,4 +24,6 @@ addIeTargetTest( 182@@ -25,3 +25,5 @@ addIeTargetTest(
183 ADD_CPPLINT 183 ie_faster_build(${TARGET_NAME}
184 LABELS 184 UNITY
185 CPU 185 )
186-)
187\ No newline at end of file
188+)
189+ 186+
190+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) 187+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
191diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt 188diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
192index e4613f032..5fe9e7089 100644 189index 76cc67cca1..04ff11cc05 100644
193--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt 190--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
194+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt 191+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
195@@ -26,3 +26,5 @@ addIeTargetTest( 192@@ -26,3 +26,5 @@ addIeTargetTest(
@@ -199,20 +196,17 @@ index e4613f032..5fe9e7089 100644
199+ 196+
200+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) 197+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
201diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt 198diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
202index a4106753d..091339e17 100644 199index 215562f2af..215ec9f4fb 100644
203--- a/inference-engine/tests/unit/vpu/CMakeLists.txt 200--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
204+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt 201+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
205@@ -27,4 +27,6 @@ addIeTargetTest( 202@@ -35,3 +35,5 @@ addIeTargetTest(
206 LABELS
207 VPU 203 VPU
208 MYRIAD 204 MYRIAD
209-) 205 )
210\ No newline at end of file
211+)
212+ 206+
213+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) 207+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
214diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt 208diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
215index 58614d3ce..9dfa068e4 100644 209index 58614d3ced..9dfa068e4d 100644
216--- a/inference-engine/tools/compile_tool/CMakeLists.txt 210--- a/inference-engine/tools/compile_tool/CMakeLists.txt
217+++ b/inference-engine/tools/compile_tool/CMakeLists.txt 211+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
218@@ -49,7 +49,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) 212@@ -49,7 +49,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
@@ -225,5 +219,5 @@ index 58614d3ce..9dfa068e4 100644
225 219
226 install(FILES README.md 220 install(FILES README.md
227-- 221--
2282.26.2 2222.29.2
229 223
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 ad4d8e8a..d4819077 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,4 +1,4 @@
1From 74b6af221e7e2663687654e6eb2d68a5c7158af9 Mon Sep 17 00:00:00 2001 1From aa515686548d74a68456b9ba7a295b6ae4be343a 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] cldnn: fix inclusion of headers 4Subject: [PATCH] cldnn: fix inclusion of headers
@@ -6,6 +6,7 @@ Subject: [PATCH] cldnn: fix inclusion of headers
6Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
7 7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9
9--- 10---
10 inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 2 +- 11 inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 2 +-
11 inference-engine/src/cldnn_engine/CMakeLists.txt | 1 + 12 inference-engine/src/cldnn_engine/CMakeLists.txt | 1 +
@@ -13,30 +14,30 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
13 3 files changed, 3 insertions(+), 2 deletions(-) 14 3 files changed, 3 insertions(+), 2 deletions(-)
14 15
15diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp 16diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
16index 282dcd844..0d5d4084c 100644 17index 68ccf3217..c5b0ce6be 100644
17--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp 18--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
18+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp 19+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
19@@ -22,7 +22,7 @@ 20@@ -39,7 +39,7 @@
20 # pragma GCC system_header 21 # pragma GCC system_header
21 #endif 22 #endif
22 23
23-#include <CL/cl2.hpp> 24-#include <CL/cl2.hpp>
24+#include <cl2.hpp> 25+#include <cl2.hpp>
25 26
26 #if defined __GNUC__ 27 #ifdef __GNUC__
27 # pragma GCC diagnostic pop 28 # pragma GCC diagnostic pop
28diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt 29diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
29index cdc0de406..70883465b 100644 30index 7e15abbed..46d43e0e5 100644
30--- a/inference-engine/src/cldnn_engine/CMakeLists.txt 31--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
31+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt 32+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
32@@ -33,6 +33,7 @@ target_include_directories(${TARGET_NAME} PRIVATE 33@@ -31,6 +31,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
33 ${CMAKE_CURRENT_SOURCE_DIR} 34 ${CMAKE_CURRENT_SOURCE_DIR}
34 $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> 35 $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
35 ${CLDNN__IOCL_ICD_INCDIRS} 36 ${CLDNN__IOCL_ICD_INCDIRS}
36+ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp 37+ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp
37 ${CLDNN_TOP_FOLDER}) 38 ${CLDNN_TOP_FOLDER})
38 39
39 # install 40 set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
40diff --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 41diff --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
41index 97608c30a..3a04096c0 100644 42index 97608c30a..3a04096c0 100644
42--- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp 43--- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
@@ -50,6 +51,3 @@ index 97608c30a..3a04096c0 100644
50 #include "cl_intel_usm_defs.h" 51 #include "cl_intel_usm_defs.h"
51 52
52 #include <memory> 53 #include <memory>
53--
542.26.2
55
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb
index a2cc2467..568072d7 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb
@@ -4,10 +4,9 @@ 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/openvinotoolkit/openvino.git;protocol=git;branch=releases/2021/1;lfs=0 \ 7SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2021/2;lfs=0 \
8 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2450/firmware_usb-ma2450_1381.zip;name=ma2450 \ 8 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1522.zip;name=usb_ma2x8x \
9 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma248x/firmware_pcie-ma248x_1381.zip;name=ma248x \ 9 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1522.zip;name=pcie_ma2x8x \
10 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1381.zip;name=ma2x8x \
11 git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ 10 git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \
12 file://0001-inference-engine-use-system-installed-packages.patch \ 11 file://0001-inference-engine-use-system-installed-packages.patch \
13 file://0002-cldNN-disable-Werror.patch \ 12 file://0002-cldNN-disable-Werror.patch \
@@ -16,12 +15,11 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=rel
16 file://0001-dont-install-licenses-and-version-file.patch \ 15 file://0001-dont-install-licenses-and-version-file.patch \
17 " 16 "
18 17
19SRCREV = "f557dca475cb54dcfc9026fbaad0d93ddb85015c" 18SRCREV = "4795391b73381660b69b4cd3986c7a0bf902e868"
20SRCREV_mkl = "6547f0b6aac2725bd4e36197e19fb1a6f2ee2f51" 19SRCREV_mkl = "5ef085d5af65e8966e03cdfcbaa65761d61a5c9a"
21 20
22SRC_URI[ma2450.sha256sum] = "d310d60c9ab5dd8979fa03151f54c889d2fc1e4f178636f83b6756c3fee72745" 21SRC_URI[usb_ma2x8x.sha256sum] = "95a93144f0bbfe6e35d3830e93e6b63e1e109f849a6a7c307cae9030e3a662aa"
23SRC_URI[ma248x.sha256sum] = "3c6c5f365bee1b114d08c0fc8ac1e655beee9dfe05fe1508cb8079eb12975204" 22SRC_URI[pcie_ma2x8x.sha256sum] = "6d061d21d90f1919ef375138066ba7a20ceb663901d2729d9cb1b639169df5da"
24SRC_URI[ma2x8x.sha256sum] = "35389d365287055beacb3dfbc041a3b71f9c09493a942ee5d6ad03a4a2c8127a"
25 23
26LICENSE = "Apache-2.0 & ISSL & MIT" 24LICENSE = "Apache-2.0 & ISSL & MIT"
27LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ 25LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
@@ -51,6 +49,7 @@ EXTRA_OECMAKE += " \
51 -DTREAT_WARNING_AS_ERROR=FALSE \ 49 -DTREAT_WARNING_AS_ERROR=FALSE \
52 -DENABLE_SPEECH_DEMO=FALSE \ 50 -DENABLE_SPEECH_DEMO=FALSE \
53 -DENABLE_DATA=FALSE \ 51 -DENABLE_DATA=FALSE \
52 -DUSE_SYSTEM_PUGIXML=TRUE \
54 " 53 "
55 54
56DEPENDS += "libusb1 \ 55DEPENDS += "libusb1 \
@@ -68,14 +67,13 @@ COMPATIBLE_HOST_libc-musl = "null"
68PACKAGECONFIG ?= "vpu" 67PACKAGECONFIG ?= "vpu"
69PACKAGECONFIG[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" 68PACKAGECONFIG[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"
70PACKAGECONFIG[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" 69PACKAGECONFIG[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"
71PACKAGECONFIG[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" 70PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware"
72PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" 71PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
73 72
74do_install_append() { 73do_install_append() {
75 if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then 74 if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then
76 install -m0644 ${WORKDIR}/mvnc/usb-ma2450.mvcmd ${D}${libdir}/
77 install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/ 75 install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/
78 install -m0644 ${WORKDIR}/mvnc/pcie-ma248x.mvcmd ${D}${libdir}/ 76 install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.mvcmd ${D}${libdir}/
79 fi 77 fi
80 78
81 if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then 79 if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then