summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch38
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch62
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb45
-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.patch256
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch30
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch215
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch23
-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/open-model-zoo/0001-use-oe-gflags.patch115
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb61
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb124
12 files changed, 145 insertions, 921 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch
new file mode 100644
index 00000000..4474aa3c
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch
@@ -0,0 +1,38 @@
1From ef56be8e6bf2ea273cbeb960f3131164e7b517b6 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 18 May 2022 12:24:03 +0800
4Subject: [PATCH] CMakeLists: disable Werror
5
6gcc12 highlights minor warnings that cause the build to fail. Ignore
7those until they aren't fixed upstream.
8
9Upstream-Status: Inappropriate
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 CMakeLists.txt | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/CMakeLists.txt b/CMakeLists.txt
17index 418483f7..c019fea0 100644
18--- a/CMakeLists.txt
19+++ b/CMakeLists.txt
20@@ -146,7 +146,7 @@ else()
21 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
22 if(LNX_BUILD)
23 #A few warnings yet to resolve under esx
24- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror")
25+ #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror")
26 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Werror")
27 endif()
28 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb")
29@@ -791,4 +791,4 @@ if(ESX_BUILD)
30 include(CMake/esx.cmake)
31 endif()
32
33-add_subdirectory(src/os/nvm_api_sample)
34\ No newline at end of file
35+add_subdirectory(src/os/nvm_api_sample)
36--
372.35.3
38
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
new file mode 100644
index 00000000..8a734ed2
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
@@ -0,0 +1,62 @@
1Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut
2 builds
3Upstream-Status: Backport
4Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
5---
6 MdePkg/Include/Base.h | 12 ++++++++++++
7 1 file changed, 12 insertions(+)
8
9Index: edk2/MdePkg/Include/Base.h
10===================================================================
11--- edk2.orig/MdePkg/Include/Base.h
12+++ edk2/MdePkg/Include/Base.h
13@@ -316,8 +316,12 @@ struct _LIST_ENTRY {
14 #define NULL __null
15 #endif
16 #else
17+#ifndef OS_BUILD
18+#ifndef UNIT_TEST_UEFI_BUILD
19 #define NULL ((VOID *) 0)
20 #endif
21+#endif
22+#endif
23
24 //
25 // Null character
26@@ -813,6 +817,8 @@ typedef UINTN *BASE_LIST;
27 // Section 2.3.1 of the UEFI 2.3 Specification.
28 //
29
30+#ifndef OS_BUILD
31+#ifndef UNIT_TEST_UEFI_BUILD
32 STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");
33 STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");
34 STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");
35@@ -841,7 +847,8 @@ STATIC_ASSERT (ALIGNOF (CHAR16) == size
36 STATIC_ASSERT (ALIGNOF (INTN) == sizeof (INTN), "Alignment of INTN does not meet UEFI Specification Data Type requirements");
37 STATIC_ASSERT (ALIGNOF (UINTN) == sizeof (UINTN), "Alignment of UINTN does not meet UEFI Specification Data Type requirements");
38 STATIC_ASSERT (ALIGNOF (VOID *) == sizeof (VOID *), "Alignment of VOID * does not meet UEFI Specification Data Type requirements");
39-
40+#endif
41+#endif
42 //
43 // The following three enum types are used to verify that the compiler
44 // configuration for enum types is compliant with Section 2.3.1 of the
45@@ -861,6 +868,8 @@ typedef enum {
46 __VerifyInt32EnumValue = 0x7fffffff
47 } __VERIFY_INT32_ENUM_SIZE;
48
49+#ifndef OS_BUILD
50+#ifndef UNIT_TEST_UEFI_BUILD
51 STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
52 STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
53 STATIC_ASSERT (sizeof (__VERIFY_INT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
54@@ -868,6 +877,8 @@ STATIC_ASSERT (sizeof (__VERIFY_INT32_EN
55 STATIC_ASSERT (ALIGNOF (__VERIFY_UINT8_ENUM_SIZE) == sizeof (__VERIFY_UINT8_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
56 STATIC_ASSERT (ALIGNOF (__VERIFY_UINT16_ENUM_SIZE) == sizeof (__VERIFY_UINT16_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
57 STATIC_ASSERT (ALIGNOF (__VERIFY_INT32_ENUM_SIZE) == sizeof (__VERIFY_INT32_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
58+#endif
59+#endif
60
61 /**
62 Macro that returns a pointer to the data structure that contains a specified field of
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
new file mode 100644
index 00000000..7b95ffe4
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
@@ -0,0 +1,45 @@
1SUMMARY = "Utility for managing Intel Optane DC persistent memory modules"
2DESCRIPTION = "Utility for configuring and managing Intel Optane Persistent \
3Memory modules (PMem). It supports functionality to: \
4Discover DCPMMs on the platform. \
5Provision the platform memory configuration. \
6View and update the firmware on DCPMMs. \
7Configure data-at-rest security on DCPMMs. \
8Track health and performance of DCPMMs. \
9Debug and troubleshoot DCPMMs."
10
11HOMEPAGE = "https://github.com/intel/ipmctl"
12BUGTRACKER = "https://github.com/intel/ipmctl/issues"
13
14LICENSE = "BSD-3-Clause | BSD-2-Clause"
15LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \
16 file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08"
17
18SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master_3_0;name=ipmctl; \
19 git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/edk2;branch=master \
20 file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \
21 file://0001-CMakeLists-disable-Werror.patch \
22"
23
24SRCREV_ipmctl = "a71f2fb1c90dd07f9862b71c789881132193e8f9"
25#tag edk2-stable202408
26SRCREV_edk2 = "b158dad150bf02879668f72ce306445250838201"
27SRCREV_FORMAT = "ipmctl_edk2"
28
29inherit cmake dos2unix
30
31DEPENDS = "ndctl pkgconfig-native"
32
33EXTRA_OECMAKE = "-DRELEASE=ON"
34
35do_configure:prepend() {
36 for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do
37 ln -sf edk2/${dir} ${S}
38 done
39}
40
41do_install:append() {
42 # Remove /var/log/ipmctl as anything created in /var/log will not be
43 # available when tmpfs is mounted at /var/volatile/log.
44 rm -rf ${D}${localstatedir}/log
45}
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 3fff5607..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ /dev/null
@@ -1,256 +0,0 @@
1From cc44429f0e55efa0fa142cc043e83123e3b376e4 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] 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/CMakeLists.txt | 2 +-
14 inference-engine/cmake/ie_parallel.cmake | 10 ++-------
15 .../src/inference_engine/CMakeLists.txt | 22 +------------------
16 .../src/legacy_api/CMakeLists.txt | 3 +--
17 .../src/vpu/graph_transformer/CMakeLists.txt | 1 -
18 .../common_test_utils/CMakeLists.txt | 7 ++----
19 .../unit_test_utils/CMakeLists.txt | 3 +--
20 .../tests_deprecated/helpers/CMakeLists.txt | 1 -
21 inference-engine/thirdparty/CMakeLists.txt | 14 +-----------
22 10 files changed, 9 insertions(+), 71 deletions(-)
23
24diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
25index 2a5a74db6..9cc9a6c94 100644
26--- a/cmake/dependencies.cmake
27+++ b/cmake/dependencies.cmake
28@@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING)
29
30 set(protoc_version "3.7.1")
31 if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux)
32- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
33- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
34- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64")
35- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
36 else()
37 message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation")
38 endif()
39
40- reset_deps_cache(SYSTEM_PROTOC)
41-
42- message("${SYSTEM_PROTOC_ROOT}/bin")
43- find_program(
44- SYSTEM_PROTOC
45- NAMES protoc
46- PATHS "${SYSTEM_PROTOC_ROOT}/bin"
47- NO_DEFAULT_PATH)
48- if(NOT SYSTEM_PROTOC)
49- message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
50- endif()
51-
52- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
53 endif()
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)
67diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
68index 0f3c41e0a..b3b2dfdab 100644
69--- a/inference-engine/cmake/ie_parallel.cmake
70+++ b/inference-engine/cmake/ie_parallel.cmake
71@@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
72 set(IE_THREAD_DEFINE "IE_THREAD_SEQ")
73
74 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
75- find_package(TBB COMPONENTS tbb tbbmalloc)
76- if (TBB_FOUND)
77- set(IE_THREAD_DEFINE "IE_THREAD_TBB")
78- ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS})
79- else ()
80- ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \
81- SEQ method will be used for ${TARGET_NAME}")
82- endif ()
83+ set(IE_THREAD_DEFINE "IE_THREAD_TBB")
84+ target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc)
85 elseif (THREADING STREQUAL "OMP")
86 if (WIN32)
87 set(omp_lib_name libiomp5md)
88diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
89index 4ae0d5607..4106cf8b4 100644
90--- a/inference-engine/src/inference_engine/CMakeLists.txt
91+++ b/inference-engine/src/inference_engine/CMakeLists.txt
92@@ -124,8 +124,7 @@ if(NGRAPH_ONNX_IMPORT_ENABLE)
93 target_compile_definitions(${TARGET_NAME}_obj PRIVATE ONNX_IMPORT_ENABLE)
94 endif()
95
96-target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
97- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
98+target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
99
100 target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
101 $<TARGET_PROPERTY:${TARGET_NAME}_reader_api,INTERFACE_INCLUDE_DIRECTORIES>
102@@ -233,25 +232,6 @@ list(APPEND core_components ngraph)
103 if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
104 ie_cpack_add_component(tbb REQUIRED)
105 list(APPEND core_components tbb)
106-
107- install(DIRECTORY "${TBB}/include"
108- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
109- COMPONENT tbb)
110- install(DIRECTORY "${TBB}/lib"
111- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
112- COMPONENT tbb)
113- if(EXISTS "${TBB}/bin")
114- install(DIRECTORY "${TBB}/bin"
115- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
116- COMPONENT tbb)
117- endif()
118- install(FILES "${TBB}/LICENSE"
119- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
120- COMPONENT tbb)
121- install(FILES "${TBB}/cmake/TBBConfig.cmake"
122- "${TBB}/cmake/TBBConfigVersion.cmake"
123- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake
124- COMPONENT tbb)
125 endif()
126
127 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
128diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt
129index 85524310b..dc25cae2f 100644
130--- a/inference-engine/src/legacy_api/CMakeLists.txt
131+++ b/inference-engine/src/legacy_api/CMakeLists.txt
132@@ -33,8 +33,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CM
133 ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl
134 $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
135 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
136- $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
137- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
138+ $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
139
140 # Create shared library
141
142diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
143index 982d3c7fa..db881246c 100644
144--- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
145+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
146@@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
147
148 target_include_directories(${TARGET_NAME}
149 SYSTEM PUBLIC
150- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
151 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
152 "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include")
153
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
155index efead7271..732abee2d 100644
156--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
157+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
158@@ -23,7 +23,7 @@ function(add_gtest_libraries)
159 PROPERTIES FOLDER thirdparty)
160 endfunction()
161
162-add_gtest_libraries()
163+#add_gtest_libraries()
164
165 if (MSVC)
166 set(PUGI pugixml_mt)
167@@ -32,10 +32,7 @@ else ()
168 endif ()
169
170 list(APPEND EXPORT_DEPENDENCIES
171- ${PUGI}
172 ${NGRAPH_LIBRARIES}
173- gtest
174- gtest_main
175 )
176
177 set(TARGET_NAME commonTestUtils)
178@@ -74,7 +71,6 @@ function(add_common_utils ADD_TARGET_NAME)
179 PUBLIC
180 ${IE_TESTS_ROOT}/ie_test_utils
181 $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
182- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
183 PRIVATE
184 $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
185 )
186@@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME)
187 target_link_libraries(${ADD_TARGET_NAME}
188 PUBLIC
189 ${EXPORT_DEPENDENCIES}
190+ pugixml
191 )
192 endfunction()
193
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}
208diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
209index bf915e52d..9e7173db6 100644
210--- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt
211+++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
212@@ -23,7 +23,6 @@ function(add_helpers target_name)
213 "${IE_MAIN_SOURCE_DIR}/src/inference_engine"
214 $<TARGET_PROPERTY:inference_engine_ir_reader,INTERFACE_INCLUDE_DIRECTORIES>
215 $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES>
216- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
217 "${IE_MAIN_SOURCE_DIR}/src/vpu/"
218 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
219
220diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
221index f94453e06..b3c25daf4 100644
222--- a/inference-engine/thirdparty/CMakeLists.txt
223+++ b/inference-engine/thirdparty/CMakeLists.txt
224@@ -38,28 +38,16 @@ function(build_with_lto)
225 function(ie_build_pugixml)
226 set(BUILD_TESTS_current ${BUILD_TESTS})
227 set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
228- add_subdirectory(pugixml)
229 set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE)
230 endfunction()
231
232 ie_build_pugixml()
233 add_subdirectory(stb_lib)
234- add_subdirectory(ade)
235 add_subdirectory(fluid/modules/gapi)
236
237- target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
238-
239- set_target_properties(pugixml ade fluid stb_image
240+ set_target_properties(fluid stb_image
241 PROPERTIES FOLDER thirdparty)
242
243- # developer package
244-
245- ie_developer_export_targets(ade fluid pugixml)
246- if(TARGET pugixml_mt)
247- ie_developer_export_targets(pugixml_mt)
248- set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty)
249- endif()
250-
251 if(ENABLE_MKL_DNN)
252 set(SDL_cmake_included ON)
253 include(mkldnn.cmake)
254--
2552.26.2
256
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch
deleted file mode 100644
index a4e58b8e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 65014a2703a6a3892fdebc86fe1c5a3a589dbf56 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:45:48 +0800
4Subject: [PATCH 2/5] cldNN: disable Werror
5
6Don't treat warnings as errors. This just leads to failures every time
7we upgrade the compiler.
8
9Upstream-Status: Inappropriate
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
17index 4b444eca..8610b9b8 100644
18--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
19+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
20@@ -770,7 +770,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
21 MultiProcessorCompilation
22 DeadCodeEliminate
23 ExtensionsEnabled
24- TreatWarnAsErrorEnabled
25 WarnLevel4
26 NoFastMath
27 StackProtector
28--
292.25.4
30
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
deleted file mode 100644
index ac34fa4f..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
+++ /dev/null
@@ -1,215 +0,0 @@
1From d9adfdc9c802fdb880fb658085854384f90a88c2 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] cmake installation fixes
5
6Make sure that libraries/samples/binaries are installed correctly.
7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9---
10 CMakeLists.txt | 14 --------------
11 cmake/developer_package.cmake | 10 ++++++----
12 .../ie_bridges/c/samples/common/CMakeLists.txt | 2 ++
13 inference-engine/samples/CMakeLists.txt | 9 +++------
14 .../samples/common/format_reader/CMakeLists.txt | 2 ++
15 .../src/inference_engine/CMakeLists.txt | 4 ++--
16 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
17 inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++-
18 .../tests/unit/inference_engine/CMakeLists.txt | 2 ++
19 inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++-
20 10 files changed, 24 insertions(+), 29 deletions(-)
21
22diff --git a/CMakeLists.txt b/CMakeLists.txt
23index 1f981ed25..2c014ca27 100644
24--- a/CMakeLists.txt
25+++ b/CMakeLists.txt
26@@ -121,12 +121,8 @@ add_subdirectory(docs)
27
28 # install setupvars
29
30-ie_cpack_add_component(setupvars REQUIRED)
31
32 if(UNIX)
33- install(PROGRAMS scripts/setupvars/setupvars.sh
34- DESTINATION bin
35- COMPONENT setupvars)
36 elseif(WIN32)
37 install(PROGRAMS scripts/setupvars/setupvars.bat
38 DESTINATION bin
39@@ -136,22 +132,12 @@ endif()
40 # install install_dependencies
41
42 if(UNIX)
43- ie_cpack_add_component(install_dependencies REQUIRED)
44- install(DIRECTORY scripts/install_dependencies/
45- DESTINATION install_dependencies
46- COMPONENT install_dependencies)
47 endif()
48
49 # install files for demo
50
51-ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core)
52
53 if(UNIX)
54- install(DIRECTORY scripts/demo/
55- DESTINATION deployment_tools/demo
56- COMPONENT demo_scripts
57- USE_SOURCE_PERMISSIONS
58- PATTERN *.bat EXCLUDE)
59 elseif(WIN32)
60 install(DIRECTORY scripts/demo/
61 DESTINATION deployment_tools/demo
62diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
63index 5e022244b..6e2cbf44e 100644
64--- a/cmake/developer_package.cmake
65+++ b/cmake/developer_package.cmake
66@@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH
67 include(CPackComponent)
68 unset(IE_CPACK_COMPONENTS_ALL CACHE)
69
70-set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
71+if (NOT DEFINED IE_CPACK_IE_DIR)
72+ set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
73+endif()
74
75 # Search packages for the host system instead of packages for the target system
76 # in case of cross compilation these macros should be defined by the toolchain file
77@@ -43,8 +45,8 @@ function(ie_cpack_set_library_dir)
78 set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
79 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
80 else()
81- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
82- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
83+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
84+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
85 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
86 endif()
87 endfunction()
88@@ -147,7 +149,7 @@ endif()
89
90 # allow to override default OUTPUT_ROOT root
91 if(NOT DEFINED OUTPUT_ROOT)
92- set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
93+ set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
94 endif()
95
96 # Enable postfixes for Debug/Release builds
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})
107diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
108index 594e581b1..4e95a7808 100644
109--- a/inference-engine/samples/CMakeLists.txt
110+++ b/inference-engine/samples/CMakeLists.txt
111@@ -34,7 +34,7 @@ endif()
112
113 if(IE_MAIN_SOURCE_DIR)
114 # in case if samples are built from IE repo
115- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
116+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
117 # hint for find_package(InferenceEngine in the samples folder)
118 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
119 # hint for find_package(ngraph in the samples folder)
120@@ -118,11 +118,6 @@ set (HAVE_INTTYPES_H 1)
121 set (INTTYPES_FORMAT C99)
122 set (BUILD_TESTING OFF)
123
124-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
125- add_subdirectory(thirdparty/gflags)
126- set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
127-endif()
128-
129 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
130 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
131 endif()
132@@ -239,6 +234,8 @@ macro(ie_add_sample)
133 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME}
134 CUSTOM_FILTERS ${custom_filters})
135 endif()
136+
137+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
138 endmacro()
139
140 # collect all samples subdirectories
141diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
142index 48dbed9f2..76532fd04 100644
143--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
144+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
145@@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
146
147 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}
148 FOLDER cpp_samples)
149+
150+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
151diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
152index 4ae0d5607..b9ee12498 100644
153--- a/inference-engine/src/inference_engine/CMakeLists.txt
154+++ b/inference-engine/src/inference_engine/CMakeLists.txt
155@@ -265,8 +265,8 @@ install(TARGETS ${TARGET_NAME}
156 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
157 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
158 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
159- DESTINATION ${IE_CPACK_IE_DIR}/share
160+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
161 COMPONENT core)
162 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
163- DESTINATION ${IE_CPACK_RUNTIME_PATH}
164+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
165 COMPONENT core)
166diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
167index bf30d127c..6ed8c4081 100644
168--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
169+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
170@@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME}
171 # install
172
173 install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
174- DESTINATION ${IE_CPACK_IE_DIR}/external
175+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
176 COMPONENT myriad)
177diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
178index 9ec5ad025..45c62571a 100644
179--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
180+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
181@@ -22,4 +22,6 @@ addIeTargetTest(
182 ADD_CPPLINT
183 LABELS
184 CPU
185-)
186\ No newline at end of file
187+)
188+
189+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
190diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
191index 3eb21a434..09ba9225a 100644
192--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
193+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
194@@ -15,3 +15,5 @@ addIeTargetTest(
195 LABELS
196 IE
197 )
198+
199+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
200diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
201index 072103292..117cc9ee1 100644
202--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
203+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
204@@ -26,4 +26,6 @@ addIeTargetTest(
205 LABELS
206 VPU
207 MYRIAD
208-)
209\ No newline at end of file
210+)
211+
212+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
213--
2142.26.2
215
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch
deleted file mode 100644
index 1a54a124..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From ed444bf9f4dda442bd2da51140f45631163e0e55 Mon Sep 17 00:00:00 2001
2From: Vladimir Zinoviev <vladimir.zinoviev@intel.com>
3Date: Sun, 14 Jun 2020 18:54:36 +0300
4Subject: [PATCH] [CLDNN] Fix std::runtime_error missing (#871)
5
6Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/ed444bf9f4dda442bd2da51140f45631163e0e55]
7Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
8---
9 .../thirdparty/clDNN/kernel_selector/common/tensor_type.h | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
13index 3dbdfd0b22..2226f1a874 100644
14--- a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
15+++ b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
16@@ -25,6 +25,7 @@
17 #include <array>
18 #include <string>
19 #include <utility>
20+#include <stdexcept>
21
22 namespace kernel_selector {
23 #define KERNEL_SELECTOR_TENSOR_DIM_MAX 9
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch
deleted file mode 100644
index d47d273c..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From f201d67c965318ebe49f0d38ea36e530c35a4701 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] 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 fce7d8f17..827e5764a 100644
17--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
18+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
19@@ -21,4 +21,4 @@
20 # pragma GCC system_header
21 #endif
22
23-#include <CL/cl2.hpp>
24+#include <cl2.hpp>
25diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
26index eeb9b5c80..32a283ba4 100644
27--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
28+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
29@@ -33,6 +33,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
30 ${CMAKE_CURRENT_SOURCE_DIR}
31 $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
32 ${CLDNN__IOCL_ICD_INCDIRS}
33+ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp
34 ${CLDNN_TOP_FOLDER})
35
36 # install
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 c67c81726..5ca48c597 100644
39--- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
40+++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
41@@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel;
42 typedef cl_va_api_device_source_intel cl_device_source_intel;
43 typedef cl_va_api_device_set_intel cl_device_set_intel;
44 #endif
45-#include <CL/cl_intel_planar_yuv.h>
46+#include <CL/cl_ext_intel.h>
47 #include "cl_intel_usm_defs.h"
48
49 #include <memory>
50--
512.25.4
52
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
deleted file mode 100644
index a938b942..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
+++ /dev/null
@@ -1,115 +0,0 @@
1From d63d1a1291a2715b7d70ed88c4d764b22e6f2f4d Mon Sep 17 00:00:00 2001
2From: Liwei Song <liwei.song@windriver.com>
3Date: Fri, 22 May 2020 15:47:44 +0800
4Subject: [PATCH] use meta-oe gflags
5
6gflags is available in meta-oe, use this one instead of the thirdparty
7one in open-model-zoo
8
9Upstream-Status: Inappropriate [meta-intel specific]
10
11Signed-off-by: Liwei Song <liwei.song@windriver.com>
12---
13 CMakeLists.txt | 8 ++++----
14 multi_channel/common/CMakeLists.txt | 2 +-
15 multi_channel/face_detection_demo/CMakeLists.txt | 2 +-
16 multi_channel/human_pose_estimation_demo/CMakeLists.txt | 2 +-
17 multi_channel/object_detection_demo_yolov3/CMakeLists.txt | 2 +-
18 5 files changed, 8 insertions(+), 8 deletions(-)
19
20diff --git a/CMakeLists.txt b/CMakeLists.txt
21index 40b549f..dfdbf93 100644
22--- a/CMakeLists.txt
23+++ b/CMakeLists.txt
24@@ -89,12 +89,10 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
25 endif()
26 ####################################
27
28-set (GFLAGS_IS_SUBPROJECT TRUE)
29+set (GFLAGS_IS_SUBPROJECT FALSE)
30 set (HAVE_SYS_STAT_H 1)
31 set (HAVE_INTTYPES_H 1)
32
33-add_subdirectory(thirdparty/gflags)
34-
35 if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
36 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
37 endif()
38@@ -177,7 +175,7 @@ macro(ie_add_sample)
39 target_include_directories(${IE_SAMPLE_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../common")
40
41 target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${OpenCV_LIBRARIES} ${InferenceEngine_LIBRARIES}
42- ${IE_SAMPLE_DEPENDENCIES} gflags)
43+ ${IE_SAMPLE_DEPENDENCIES} ${GFLAGS_LIBRARIES})
44
45 if(UNIX)
46 target_link_libraries(${IE_SAMPLE_NAME} PRIVATE pthread)
47@@ -198,11 +196,13 @@ endmacro()
48 # use this flag if you need to throw custom message in case if the IE package is not found.
49 if (IE_NOT_FOUND_MESSAGE)
50 find_package(InferenceEngine 2.0 QUIET)
51+ find_package(gflags 2.2 QUIET)
52 if (NOT(InferenceEngine_FOUND))
53 message(FATAL_ERROR ${IE_NOT_FOUND_MESSAGE})
54 endif()
55 else()
56 find_package(InferenceEngine 2.0 REQUIRED)
57+ find_package(gflags 2.2 REQUIRED)
58 endif()
59
60 find_package(ngraph REQUIRED)
61diff --git a/multi_channel/common/CMakeLists.txt b/multi_channel/common/CMakeLists.txt
62index d5e5d93..c33afbb 100644
63--- a/multi_channel/common/CMakeLists.txt
64+++ b/multi_channel/common/CMakeLists.txt
65@@ -110,7 +110,7 @@ endif()
66
67 target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
68
69-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES})
70+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES})
71
72 if(UNIX)
73 target_link_libraries( ${TARGET_NAME} pthread)
74diff --git a/multi_channel/face_detection_demo/CMakeLists.txt b/multi_channel/face_detection_demo/CMakeLists.txt
75index 5b497fc..78c518e 100644
76--- a/multi_channel/face_detection_demo/CMakeLists.txt
77+++ b/multi_channel/face_detection_demo/CMakeLists.txt
78@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
79 endif()
80 endif()
81
82-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common)
83+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common)
84
85 if(UNIX)
86 target_link_libraries( ${TARGET_NAME} pthread)
87diff --git a/multi_channel/human_pose_estimation_demo/CMakeLists.txt b/multi_channel/human_pose_estimation_demo/CMakeLists.txt
88index 7fe4823..7e76796 100644
89--- a/multi_channel/human_pose_estimation_demo/CMakeLists.txt
90+++ b/multi_channel/human_pose_estimation_demo/CMakeLists.txt
91@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
92 endif()
93 endif()
94
95-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common)
96+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common)
97
98 if(UNIX)
99 target_link_libraries( ${TARGET_NAME} pthread)
100diff --git a/multi_channel/object_detection_demo_yolov3/CMakeLists.txt b/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
101index e959349..cf1de4a 100644
102--- a/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
103+++ b/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
104@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
105 endif()
106 endif()
107
108-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} ngraph::ngraph common)
109+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} ngraph::ngraph common)
110
111 if(UNIX)
112 target_link_libraries( ${TARGET_NAME} pthread)
113--
1142.25.4
115
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb
deleted file mode 100644
index 31bdb412..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb
+++ /dev/null
@@ -1,61 +0,0 @@
1SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository"
2HOMEPAGE = "https://github.com/opencv/open_model_zoo"
3DESCRIPTION = "This repository includes optimized deep learning \
4models and a set of demos to expedite development of high-performance \
5deep learning inference applications."
6
7SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master \
8 file://0001-use-oe-gflags.patch \
9 "
10
11SRCREV = "366130da8fc27dd4d896639cb526a079acc07831"
12
13LICENSE = "Apache-2.0"
14LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
15"
16
17inherit cmake
18
19S = "${WORKDIR}/git/demos"
20
21DEPENDS += "openvino-inference-engine opencv gflags"
22
23RDEPENDS_${PN} += " \
24 python3-decorator \
25 python3-defusedxml \
26 python3-networkx \
27 python3-protobuf \
28 python3-test-generator \
29 python3-requests \
30 python3-pyyaml \
31"
32
33COMPATIBLE_HOST = '(x86_64).*-linux'
34
35EXTRA_OECMAKE += " \
36 -DIE_MAIN_SOURCE_DIR=${B} \
37 -DENABLE_SAMPLES=ON \
38 -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \
39 -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \
40 -DIE_C_API_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_c_api.so \
41 -DIE_LEGACY_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_legacy.so \
42 -DIE_NN_BUILDER_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_nn_builder.so \
43 -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \
44"
45
46do_configure_prepend(){
47 mkdir -p ${WORKDIR}/InferenceEngine/share
48 cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/
49}
50
51do_install(){
52 install -d ${D}${libdir}
53 install -d ${D}${bindir}
54 install -d ${D}${datadir}/openvino/open-model-zoo/tools
55 cp -rf ${WORKDIR}/build/intel64/Release/lib/*.a ${D}${libdir}
56 cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir}
57 cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo
58 cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools
59}
60
61FILES_${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb
deleted file mode 100644
index c2863e65..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb
+++ /dev/null
@@ -1,124 +0,0 @@
1SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
2HOMEPAGE = "https://github.com/opencv/dldt"
3DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
4deep learning models through a high-level C++ Inference Engine API \
5integrated with application logic."
6
7SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2020/4;lfs=0 \
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/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma248x/firmware_pcie-ma248x_1223.zip;name=ma248x \
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 \
12 file://0001-inference-engine-use-system-installed-packages.patch \
13 file://0002-cldNN-disable-Werror.patch \
14 file://0003-inference-engine-installation-fixes.patch \
15 file://0004-fix-compilation-errors.patch \
16 file://0005-cldnn-fix-inclusion-of-headers.patch \
17 file://0001-dont-install-licenses-and-version-file.patch;patchdir=ngraph \
18 "
19
20SRCREV = "023e7c2c3f8a8ac83564db09799d2049115d9cf6"
21SRCREV_mkl = "2706f56ebab54415be48add2751072065f4b52ab"
22
23SRC_URI[ma2450.sha256sum] = "4dc246bd12d7a21c1b10ac3e090b30043777c4ea862e1e4119536ba03c5878ef"
24SRC_URI[ma248x.sha256sum] = "64dd77ecd2f7172421414a388a87be4e6271894a982a58b3829f9de1a1869abd"
25SRC_URI[ma2x8x.sha256sum] = "d1d209221c1389a9a04e14ffeeaff1c3308f6ab105c7bd22f0e300df01cce4d8"
26
27LICENSE = "Apache-2.0 & ISSL & MIT"
28LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
29 file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \
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 \
32"
33LICENSE_${PN}-vpu-firmware = "ISSL"
34
35inherit cmake python3native
36
37S = "${WORKDIR}/git"
38
39EXTRA_OECMAKE += " \
40 -DENABLE_OPENCV=0 \
41 -DENABLE_PLUGIN_RPATH=0 \
42 -DENABLE_GNA=0 \
43 -DPYTHON_EXECUTABLE=${PYTHON} \
44 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
45 -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \
46 -DENABLE_SAMPLES=1 \
47 -DIE_CPACK_IE_DIR=${prefix} \
48 -DNGRAPH_UNIT_TEST_ENABLE=FALSE \
49 -DNGRAPH_TEST_UTIL_ENABLE=FALSE \
50 -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \
51 -DNGRAPH_JSON_ENABLE=FALSE \
52 -DTREAT_WARNING_AS_ERROR=FALSE \
53 -DENABLE_SPEECH_DEMO=FALSE \
54 -DENABLE_DATA=FALSE \
55 "
56
57DEPENDS += "libusb1 \
58 ade \
59 opencv \
60 pugixml \
61 protobuf-native \
62 tbb \
63 onednn \
64 "
65
66COMPATIBLE_HOST = '(x86_64).*-linux'
67COMPATIBLE_HOST_libc-musl = "null"
68
69PACKAGECONFIG ?= "vpu"
70PACKAGECONFIG[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"
71PACKAGECONFIG[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"
72PACKAGECONFIG[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"
73PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
74
75do_install_append() {
76 if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then
77 install -m0644 ${WORKDIR}/mvnc/usb-ma2450.mvcmd ${D}${libdir}/
78 install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/
79 install -m0644 ${WORKDIR}/mvnc/pcie-ma248x.mvcmd ${D}${libdir}/
80 fi
81
82 if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
83 install -d ${D}${datadir}/inference_engine
84 mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/
85
86 install -d ${D}${PYTHON_SITEPACKAGES_DIR}
87 mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/
88 mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/
89
90 rm -rf ${D}${prefix}/python
91 rm -rf ${D}${prefix}/deployment_tools
92 fi
93
94 # Remove the samples source directory. We install the built samples.
95 rm -rf ${D}/usr/samples
96}
97
98# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
99# instead of RSS
100SSTATE_SCAN_FILES_append = " *.cmake"
101
102FILES_${PN}-dev = "${includedir} \
103 ${libdir}/cmake \
104 "
105
106FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \
107 ${datadir}/openvino \
108 ${libdir}/custom_kernels \
109 ${libdir}/plugins.xml \
110 ${libdir}/cache.json \
111 "
112
113# Move inference engine samples into a separate package
114PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware"
115
116FILES_${PN}-samples = "${datadir}/inference_engine \
117 ${bindir} \
118 "
119FILES_${PN}-vpu-firmware += "${libdir}/*.mvcmd"
120
121# Package for inference engine python API
122PACKAGES =+ "${PN}-${PYTHON_PN}"
123
124FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-07 17:21:40 +0000