summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch86
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch45
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch206
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch37
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch30
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch33
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch204
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch45
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch35
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch52
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest8
11 files changed, 164 insertions, 617 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
new file mode 100644
index 00000000..7f5b46c6
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
@@ -0,0 +1,86 @@
1From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 29 Nov 2023 12:42:57 +0530
4Subject: [PATCH] cmake: yocto specific tweaks to the build process
5
6* Dont try to detect glibc version as that doesn't work when cross compiling.
7* Dont try to detect CXX11_ABI
8* Install sample binaries as well.
9* Dont try to write triggers for CPack. We package ourselves.
10* Fix the installation path for Python modules when baselib = lib64.
11
12Upstream-Status: Inappropriate
13
14Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
15---
16 cmake/developer_package/packaging/rpm/rpm.cmake | 2 +-
17 cmake/developer_package/target_flags.cmake | 4 ++--
18 samples/cpp/CMakeLists.txt | 6 +++---
19 src/bindings/python/CMakeLists.txt | 2 +-
20 4 files changed, 7 insertions(+), 7 deletions(-)
21
22diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
23index 99f11730983..1a1f61fcd3d 100644
24--- a/cmake/developer_package/packaging/rpm/rpm.cmake
25+++ b/cmake/developer_package/packaging/rpm/rpm.cmake
26@@ -156,7 +156,7 @@ ov_rpm_specific_settings()
27 # needed to add triggers for packages with libraries
28 set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers")
29 set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n")
30-file(WRITE "${def_triggers}" "${triggers_content}")
31+#file(WRITE "${def_triggers}" "${triggers_content}")
32
33 #
34 # Functions helpful for packaging your modules with RPM cpack
35diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
36index d047a1aebd9..4e8ca68c60f 100644
37--- a/cmake/developer_package/target_flags.cmake
38+++ b/cmake/developer_package/target_flags.cmake
39@@ -149,7 +149,7 @@ function(ov_glibc_version)
40 endif()
41 endfunction()
42
43-ov_glibc_version()
44+#ov_glibc_version()
45
46 #
47 # Detects default value for _GLIBCXX_USE_CXX11_ABI for current compiler
48@@ -160,4 +160,4 @@ macro(ov_get_glibcxx_use_cxx11_abi)
49 endif()
50 endmacro()
51
52-ov_get_glibcxx_use_cxx11_abi()
53+#ov_get_glibcxx_use_cxx11_abi()
54diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
55index 4d33bff944e..3e7f1458578 100644
56--- a/samples/cpp/CMakeLists.txt
57+++ b/samples/cpp/CMakeLists.txt
58@@ -206,9 +206,9 @@ macro(ov_add_sample)
59 target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES})
60
61 install(TARGETS ${SAMPLE_NAME}
62- RUNTIME DESTINATION samples_bin/
63- COMPONENT samples_bin
64- EXCLUDE_FROM_ALL)
65+ DESTINATION ${CMAKE_INSTALL_BINDIR}
66+ COMPONENT samples_bin)
67+
68
69 # create global target with all samples / demo apps
70 if(NOT TARGET ov_samples)
71diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
72index 6cf43ec3fed..d539b9d003f 100644
73--- a/src/bindings/python/CMakeLists.txt
74+++ b/src/bindings/python/CMakeLists.txt
75@@ -320,7 +320,7 @@ if(ENABLE_PYTHON_PACKAGING)
76 # install OpenVINO Python API
77
78 set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}")
79- set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}")
80+ set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}")
81 set(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
82 set(openvino_meta_info_file "${install_lib}/${openvino_meta_info_subdir}/PKG-INFO")
83
84--
852.34.1
86
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
deleted file mode 100644
index 185a475b..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From a7ee6a27135fef24a398690d9280aca79315fa25 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 9 Jun 2020 11:35:59 +0800
4Subject: [PATCH] don't install licenses and version
5
6Upstream-Status: Inappropriate
7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9---
10 CMakeLists.txt | 13 ++-----------
11 1 file changed, 2 insertions(+), 11 deletions(-)
12
13diff --git a/CMakeLists.txt b/CMakeLists.txt
14index c347cb465d..9f57a5ed9c 100644
15--- a/CMakeLists.txt
16+++ b/CMakeLists.txt
17@@ -641,7 +641,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
18 install(EXPORT ngraphTargets
19 FILE ngraphTargets.cmake
20 NAMESPACE ngraph::
21- DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake
22+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
23 COMPONENT ngraph)
24
25 configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in
26@@ -654,15 +654,6 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
27
28 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
29 ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake
30- DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake
31+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
32 COMPONENT ngraph)
33 endif()
34-
35-install(DIRECTORY
36- ${CMAKE_CURRENT_SOURCE_DIR}/licenses
37- DESTINATION "${NGRAPH_COMPONENT_PREFIX}."
38- COMPONENT ngraph
39-)
40-
41-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph)
42-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph)
43--
442.25.4
45
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
deleted file mode 100644
index d1379de5..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ /dev/null
@@ -1,206 +0,0 @@
1From e7730e68795c8ed0b9e1772ddc21ec931da462d0 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:43:55 +0800
4Subject: [PATCH 1/5] inference-engine: use system installed packages
5
6Use installed versions of pugixml, ade, protobuf and tbb.
7
8Upstream-Status: Pending
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 cmake/dependencies.cmake | 17 --------------
13 inference-engine/cmake/ie_parallel.cmake | 10 ++-------
14 .../src/inference_engine/CMakeLists.txt | 22 +------------------
15 .../src/legacy_api/CMakeLists.txt | 3 +--
16 .../src/vpu/graph_transformer/CMakeLists.txt | 1 -
17 .../common_test_utils/CMakeLists.txt | 3 +--
18 .../tests_deprecated/helpers/CMakeLists.txt | 1 -
19 inference-engine/thirdparty/CMakeLists.txt | 11 +---------
20 8 files changed, 6 insertions(+), 62 deletions(-)
21
22diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
23index 2a5a74db..9cc9a6c9 100644
24--- a/cmake/dependencies.cmake
25+++ b/cmake/dependencies.cmake
26@@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING)
27
28 set(protoc_version "3.7.1")
29 if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux)
30- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
31- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
32- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64")
33- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
34 else()
35 message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation")
36 endif()
37
38- reset_deps_cache(SYSTEM_PROTOC)
39-
40- message("${SYSTEM_PROTOC_ROOT}/bin")
41- find_program(
42- SYSTEM_PROTOC
43- NAMES protoc
44- PATHS "${SYSTEM_PROTOC_ROOT}/bin"
45- NO_DEFAULT_PATH)
46- if(NOT SYSTEM_PROTOC)
47- message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
48- endif()
49-
50- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
51 endif()
52diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
53index 0f3c41e0..b3b2dfda 100644
54--- a/inference-engine/cmake/ie_parallel.cmake
55+++ b/inference-engine/cmake/ie_parallel.cmake
56@@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
57 set(IE_THREAD_DEFINE "IE_THREAD_SEQ")
58
59 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
60- find_package(TBB COMPONENTS tbb tbbmalloc)
61- if (TBB_FOUND)
62- set(IE_THREAD_DEFINE "IE_THREAD_TBB")
63- ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS})
64- else ()
65- ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \
66- SEQ method will be used for ${TARGET_NAME}")
67- endif ()
68+ set(IE_THREAD_DEFINE "IE_THREAD_TBB")
69+ target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc)
70 elseif (THREADING STREQUAL "OMP")
71 if (WIN32)
72 set(omp_lib_name libiomp5md)
73diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
74index c8cd4b27..d98ba55d 100644
75--- a/inference-engine/src/inference_engine/CMakeLists.txt
76+++ b/inference-engine/src/inference_engine/CMakeLists.txt
77@@ -117,8 +117,7 @@ add_library(${TARGET_NAME}_obj OBJECT
78
79 target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API)
80
81-target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
82- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
83+target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
84
85 target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
86 $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
87@@ -257,25 +256,6 @@ list(APPEND core_components ngraph)
88 if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
89 ie_cpack_add_component(tbb REQUIRED)
90 list(APPEND core_components tbb)
91-
92- install(DIRECTORY "${TBB}/include"
93- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
94- COMPONENT tbb)
95- install(DIRECTORY "${TBB}/lib"
96- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
97- COMPONENT tbb)
98- if(EXISTS "${TBB}/bin")
99- install(DIRECTORY "${TBB}/bin"
100- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
101- COMPONENT tbb)
102- endif()
103- install(FILES "${TBB}/LICENSE"
104- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
105- COMPONENT tbb)
106- install(FILES "${TBB}/cmake/TBBConfig.cmake"
107- "${TBB}/cmake/TBBConfigVersion.cmake"
108- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake
109- COMPONENT tbb)
110 endif()
111
112 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
113diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt
114index d54c5906..90920ab3 100644
115--- a/inference-engine/src/legacy_api/CMakeLists.txt
116+++ b/inference-engine/src/legacy_api/CMakeLists.txt
117@@ -33,8 +33,7 @@ target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE
118
119 target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src
120 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
121- $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
122- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
123+ $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
124
125 function(nn_builder_disable_warnings)
126 disable_deprecated_warnings()
127diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
128index 982d3c7f..db881246 100644
129--- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
130+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
131@@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
132
133 target_include_directories(${TARGET_NAME}
134 SYSTEM PUBLIC
135- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
136 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
137 "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include")
138
139diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
140index 8a4ffd42..5bee450a 100644
141--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
142+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
143@@ -28,7 +28,6 @@ else ()
144 endif ()
145
146 list(APPEND EXPORT_DEPENDENCIES
147- ${PUGI}
148 ${NGRAPH_LIBRARIES}
149 gtest
150 gtest_main
151@@ -70,7 +69,6 @@ function(add_common_utils ADD_TARGET_NAME)
152 PUBLIC
153 ${IE_TESTS_ROOT}/ie_test_utils
154 $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
155- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
156 PRIVATE
157 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
158 )
159@@ -80,6 +78,7 @@ function(add_common_utils ADD_TARGET_NAME)
160 target_link_libraries(${ADD_TARGET_NAME}
161 PUBLIC
162 ${EXPORT_DEPENDENCIES}
163+ pugixml
164 )
165 endfunction()
166
167diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
168index 14265fa9..2482be78 100644
169--- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt
170+++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
171@@ -23,7 +23,6 @@ function(add_helpers target_name)
172 target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
173 "${IE_MAIN_SOURCE_DIR}/src/inference_engine"
174 $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES>
175- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
176 "${IE_MAIN_SOURCE_DIR}/src/vpu/"
177 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
178
179diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
180index ebf32c71..56b6bcb0 100644
181--- a/inference-engine/thirdparty/CMakeLists.txt
182+++ b/inference-engine/thirdparty/CMakeLists.txt
183@@ -35,19 +35,10 @@ function(build_with_lto)
184 add_subdirectory(clDNN)
185 endif()
186
187- add_subdirectory(pugixml)
188 add_subdirectory(stb_lib)
189- add_subdirectory(ade)
190 add_subdirectory(fluid/modules/gapi)
191
192- # developer package
193-
194- target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
195-
196- ie_developer_export_targets(ade fluid pugixml)
197- if(TARGET pugixml_mt)
198- ie_developer_export_targets(pugixml_mt)
199- endif()
200+ ie_developer_export_targets(fluid)
201 endfunction()
202
203 build_with_lto()
204--
2052.25.4
206
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/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/0002-cldNN-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch
deleted file mode 100644
index a4e58b8e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 65014a2703a6a3892fdebc86fe1c5a3a589dbf56 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:45:48 +0800
4Subject: [PATCH 2/5] cldNN: disable Werror
5
6Don't treat warnings as errors. This just leads to failures every time
7we upgrade the compiler.
8
9Upstream-Status: Inappropriate
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
17index 4b444eca..8610b9b8 100644
18--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
19+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
20@@ -770,7 +770,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
21 MultiProcessorCompilation
22 DeadCodeEliminate
23 ExtensionsEnabled
24- TreatWarnAsErrorEnabled
25 WarnLevel4
26 NoFastMath
27 StackProtector
28--
292.25.4
30
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
new file mode 100644
index 00000000..8a1464d5
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
@@ -0,0 +1,33 @@
1From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 29 Nov 2023 12:49:35 +0530
4Subject: [PATCH 2/3] cmake: Fix overloaded-virtual error
5
6* Remove -Werror for:
7|git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=]
8| 129 | virtual JitDefinitions GetDefinitions() const = 0;
9| |
10
11Upstream-Status: Pending
12
13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14---
15 src/plugins/intel_gpu/CMakeLists.txt | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt
19index 2f3d9127dde..2fd4f5c1b3c 100644
20--- a/src/plugins/intel_gpu/CMakeLists.txt
21+++ b/src/plugins/intel_gpu/CMakeLists.txt
22@@ -47,7 +47,7 @@ add_subdirectory(thirdparty)
23 include(thirdparty/cmake/rapidjson.cmake)
24
25 if(CMAKE_COMPILER_IS_GNUCXX)
26- ov_add_compiler_flags(-Werror)
27+ #ov_add_compiler_flags(-Werror)
28 endif()
29
30 add_subdirectory(src/runtime)
31--
322.34.1
33
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
deleted file mode 100644
index 5fa1b2ec..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
+++ /dev/null
@@ -1,204 +0,0 @@
1From 0838608d9c2b09a845efbdde88a09e151ac9ff7d Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 11 Jun 2020 14:24:04 +0800
4Subject: [PATCH] fixes
5
6Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
7---
8 CMakeLists.txt | 14 --------------
9 cmake/developer_package.cmake | 10 ++++++----
10 inference-engine/samples/CMakeLists.txt | 8 +++-----
11 .../samples/common/format_reader/CMakeLists.txt | 2 ++
12 .../src/inference_engine/CMakeLists.txt | 4 ++--
13 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
14 inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++-
15 .../tests/unit/inference_engine/CMakeLists.txt | 4 +++-
16 inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++-
17 9 files changed, 23 insertions(+), 29 deletions(-)
18
19diff --git a/CMakeLists.txt b/CMakeLists.txt
20index 902d3289..f1bfb3f5 100644
21--- a/CMakeLists.txt
22+++ b/CMakeLists.txt
23@@ -123,12 +123,8 @@ add_subdirectory(docs)
24
25 # install setupvars
26
27-ie_cpack_add_component(setupvars REQUIRED)
28
29 if(UNIX)
30- install(PROGRAMS scripts/setupvars/setupvars.sh
31- DESTINATION bin
32- COMPONENT setupvars)
33 elseif(WIN32)
34 install(PROGRAMS scripts/setupvars/setupvars.bat
35 DESTINATION bin
36@@ -138,22 +134,12 @@ endif()
37 # install install_dependencies
38
39 if(UNIX)
40- ie_cpack_add_component(install_dependencies REQUIRED)
41- install(DIRECTORY scripts/install_dependencies/
42- DESTINATION install_dependencies
43- COMPONENT install_dependencies)
44 endif()
45
46 # install files for demo
47
48-ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core)
49
50 if(UNIX)
51- install(DIRECTORY scripts/demo/
52- DESTINATION deployment_tools/demo
53- COMPONENT demo_scripts
54- USE_SOURCE_PERMISSIONS
55- PATTERN *.bat EXCLUDE)
56 elseif(WIN32)
57 install(DIRECTORY scripts/demo/
58 DESTINATION deployment_tools/demo
59diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
60index 23cd9b2d..24c33711 100644
61--- a/cmake/developer_package.cmake
62+++ b/cmake/developer_package.cmake
63@@ -7,7 +7,9 @@ set(CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake/download" ${CMAKE_MODUL
64 include(CPackComponent)
65 unset(IE_CPACK_COMPONENTS_ALL CACHE)
66
67-set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
68+if (NOT DEFINED IE_CPACK_IE_DIR)
69+ set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
70+endif()
71
72 # Search packages for the host system instead of packages for the target system
73 # in case of cross compilation these macros should be defined by the toolchain file
74@@ -40,8 +42,8 @@ function(ie_cpack_set_library_dir)
75 set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
76 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
77 else()
78- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
79- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
80+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
81+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
82 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
83 endif()
84 endfunction()
85@@ -143,7 +145,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "")
86 set(CMAKE_BUILD_TYPE "Release")
87 endif()
88
89-set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
90+set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
91
92 # Enable postfixes for Debug/Release builds
93 set(IE_DEBUG_POSTFIX_WIN "d")
94diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
95index 033a8aab..4a871ca6 100644
96--- a/inference-engine/samples/CMakeLists.txt
97+++ b/inference-engine/samples/CMakeLists.txt
98@@ -28,7 +28,7 @@ endif()
99
100 if(IE_MAIN_SOURCE_DIR)
101 # in case if samples are built from IE repo
102- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
103+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
104 # hint for find_package(InferenceEngine in the samples folder)
105 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
106 else()
107@@ -110,10 +110,6 @@ set (HAVE_INTTYPES_H 1)
108 set (INTTYPES_FORMAT C99)
109 set (BUILD_TESTING OFF)
110
111-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
112- add_subdirectory(thirdparty/gflags)
113-endif()
114-
115 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
116 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
117 endif()
118@@ -222,6 +218,8 @@ macro(ie_add_sample)
119 if(COMMAND add_cpplint_target AND NOT IE_SAMPLE_EXCLUDE_CPPLINT)
120 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME})
121 endif()
122+
123+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
124 endmacro()
125
126 # collect all samples subdirectories
127diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
128index 6d935135..fe12eeb7 100644
129--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
130+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
131@@ -40,3 +40,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
132 "${CMAKE_CURRENT_SOURCE_DIR}/..")
133
134 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
135+
136+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
137diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
138index c8cd4b27..babe8ff5 100644
139--- a/inference-engine/src/inference_engine/CMakeLists.txt
140+++ b/inference-engine/src/inference_engine/CMakeLists.txt
141@@ -289,8 +289,8 @@ install(TARGETS ${TARGET_NAME} ${TARGET_NAME}_nn_builder
142 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
143 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
144 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
145- DESTINATION ${IE_CPACK_IE_DIR}/share
146+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
147 COMPONENT core)
148 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
149- DESTINATION ${IE_CPACK_RUNTIME_PATH}
150+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
151 COMPONENT core)
152diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
153index b35910f6..304d6d40 100644
154--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
155+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
156@@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME}
157 # install
158
159 install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
160- DESTINATION ${IE_CPACK_IE_DIR}/external
161+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
162 COMPONENT myriad)
163diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
164index 9ec5ad02..45c62571 100644
165--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
166+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
167@@ -22,4 +22,6 @@ addIeTargetTest(
168 ADD_CPPLINT
169 LABELS
170 CPU
171-)
172\ No newline at end of file
173+)
174+
175+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
176diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
177index 55e52b59..9d383d74 100644
178--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
179+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
180@@ -12,4 +12,6 @@ addIeTargetTest(
181 ADD_CPPLINT
182 LABELS
183 INFERENCE_ENGINE
184-)
185\ No newline at end of file
186+)
187+
188+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
189diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
190index 39fb1d5a..5ce82b5f 100644
191--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
192+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
193@@ -23,4 +23,6 @@ addIeTargetTest(
194 LABELS
195 VPU
196 MYRIAD
197-)
198\ No newline at end of file
199+)
200+
201+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
202--
2032.25.4
204
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
new file mode 100644
index 00000000..bbdeaa2a
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
@@ -0,0 +1,45 @@
1From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 29 Nov 2023 12:55:19 +0530
4Subject: [PATCH 3/3] protobuf: allow target protoc to be built
5
6We can run target binaries using a qemu wrapper so allow these to be
7built and run.
8
9Upstream-Status: Inappropriate
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 cmake/developer_package/frontends/frontends.cmake | 2 +-
14 thirdparty/protobuf/CMakeLists.txt | 2 +-
15 2 files changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
18index f3b5520d6d2..7579f638c5a 100644
19--- a/cmake/developer_package/frontends/frontends.cmake
20+++ b/cmake/developer_package/frontends/frontends.cmake
21@@ -163,7 +163,7 @@ macro(ov_add_frontend)
22 set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h)
23 add_custom_command(
24 OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}"
25- COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file}
26+ COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file}
27 DEPENDS ${PROTOC_DEPENDENCY} ${proto_file}
28 COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}"
29 VERBATIM
30diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt
31index 15f32601f23..36853caf7dc 100644
32--- a/thirdparty/protobuf/CMakeLists.txt
33+++ b/thirdparty/protobuf/CMakeLists.txt
34@@ -31,7 +31,7 @@ unset(HAVE_ZLIB CACHE)
35 if(CMAKE_CROSSCOMPILING OR
36 (APPLE AND (HOST_X86_64 AND AARCH64)) OR
37 (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM))))
38- set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE)
39+ set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
40 else()
41 set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
42 endif()
43--
442.34.1
45
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch
deleted file mode 100644
index 8169f9fb..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From deec5feef34f86eb5616252e2e5b685b6555f561 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:49:03 +0800
4Subject: [PATCH 4/5] fix compilation errors
5
6Fixes errors like:
7
8build/tmp/work/skylake-64-poky-linux/dldt-inference-engine/2020r1-r0/git/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h:295:28:
9error: 'runtime_error' is not a member of 'std'
10 295 | throw std::runtime_error("Tensor pitches didn't
11set correctly");
12 |
13
14Upstream-Status: Pending
15
16Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
17---
18 .../thirdparty/clDNN/kernel_selector/common/tensor_type.h | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
22index 7f05b67f..641a4c9b 100644
23--- a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
24+++ b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
25@@ -25,6 +25,7 @@
26 #include <array>
27 #include <string>
28 #include <utility>
29+#include <stdexcept>
30
31 namespace kernel_selector {
32 #define KERNEL_SELECTOR_TENSOR_DIM_MAX 9
33--
342.25.4
35
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch
deleted file mode 100644
index 1b842da2..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 0d0810481186fc443fe65a6119ddcc71ba21e814 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:50:19 +0800
4Subject: [PATCH 5/5] cldnn: fix inclusion of headers
5
6Upstream-Status: Inappropriate
7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9---
10 inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 2 +-
11 inference-engine/src/cldnn_engine/CMakeLists.txt | 1 +
12 .../thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 2 +-
13 3 files changed, 3 insertions(+), 2 deletions(-)
14
15diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
16index fce7d8f1..827e5764 100644
17--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
18+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
19@@ -21,4 +21,4 @@
20 # pragma GCC system_header
21 #endif
22
23-#include <CL/cl2.hpp>
24+#include <cl2.hpp>
25diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
26index de56ed8e..c81453ab 100644
27--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
28+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
29@@ -31,6 +31,7 @@ set (CLDNN_TOP_FOLDER ${IE_MAIN_SOURCE_DIR}/thirdparty/clDNN)
30 target_include_directories(${TARGET_NAME} PRIVATE
31 ${CMAKE_CURRENT_SOURCE_DIR}
32 ${CLDNN__IOCL_ICD_INCDIRS}
33+ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp
34 ${CLDNN_TOP_FOLDER})
35
36 # copy default global xml file describing the custom kernels and the *.cl files
37diff --git a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
38index 8f668b18..a1d24438 100644
39--- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
40+++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
41@@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel;
42 typedef cl_va_api_device_source_intel cl_device_source_intel;
43 typedef cl_va_api_device_set_intel cl_device_set_intel;
44 #endif
45-#include <CL/cl_intel_planar_yuv.h>
46+#include <CL/cl_ext_intel.h>
47 #include "cl_intel_usm_defs.h"
48
49 #include <memory>
50--
512.25.4
52
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-24 02:21:31 +0000