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.patch (renamed from dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch)55
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0341.bb)24
-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.patch54
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch193
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch36
-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.patch261
-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/open-model-zoo/0001-use-oe-gflags.patch32
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb66
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb54
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb124
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb146
16 files changed, 455 insertions, 822 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_ASSERT-and-NULL-definition-so-we-can-c.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
index 4a3b26c7..11305e83 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
@@ -1,56 +1,50 @@
1From cc0e412ad05574d22938586172c56863666eb2a5 Mon Sep 17 00:00:00 2001 1Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut
2From: Nolan Hergert <nolan.hergert@intel.com> 2 builds
3Date: Mon, 5 Apr 2021 11:15:09 +0800 3Upstream-Status: Backport
4Subject: [PATCH] Ignore STATIC_ASSERT and NULL definition so we can compile in 4Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
5 OS
6
7Upstream-Status: Backport [from ipmctl patches; https://github.com/intel/ipmctl/blob/development/src/os/patches/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch]
8
9Signed-off-by: Nolan Hergert <nolan.hergert@intel.com>
10Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
11--- 5---
12 MdePkg/Include/Base.h | 13 ++++++++++++- 6 MdePkg/Include/Base.h | 12 ++++++++++++
13 1 file changed, 12 insertions(+), 1 deletion(-) 7 1 file changed, 12 insertions(+)
14 8
15diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h 9diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
16index 8e4271f6ea..c39511a064 100644 10index d209e6de28..6e61b8f3d3 100644
17--- a/MdePkg/Include/Base.h 11--- a/MdePkg/Include/Base.h
18+++ b/MdePkg/Include/Base.h 12+++ b/MdePkg/Include/Base.h
19@@ -318,7 +318,11 @@ struct _LIST_ENTRY { 13@@ -316,8 +316,12 @@ struct _LIST_ENTRY {
20 /// 14 #define NULL __null
21 /// NULL pointer (VOID *) 15 #endif
22 /// 16 #else
23+#ifndef OS_BUILD 17+#ifndef OS_BUILD
24+#ifndef UNIT_TEST_UEFI_BUILD 18+#ifndef UNIT_TEST_UEFI_BUILD
25 #define NULL ((VOID *) 0) 19 #define NULL ((VOID *) 0)
20 #endif
26+#endif 21+#endif
27+#endif 22+#endif
28 23
29 // 24 //
30 // Null character 25 // Null character
31@@ -809,7 +813,8 @@ typedef UINTN *BASE_LIST; 26@@ -779,6 +783,8 @@ typedef UINTN *BASE_LIST;
32 // Verify that ProcessorBind.h produced UEFI Data Types that are compliant with
33 // Section 2.3.1 of the UEFI 2.3 Specification. 27 // Section 2.3.1 of the UEFI 2.3 Specification.
34 // 28 //
35- 29
36+#ifndef OS_BUILD 30+#ifndef OS_BUILD
37+#ifndef UNIT_TEST_UEFI_BUILD 31+#ifndef UNIT_TEST_UEFI_BUILD
38 STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements"); 32 STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");
39 STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements"); 33 STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");
40 STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements"); 34 STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");
41@@ -821,6 +826,8 @@ STATIC_ASSERT (sizeof (INT64) == 8, "sizeof (INT64) does not meet UEFI Specifi 35@@ -792,6 +798,8 @@ STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specifi
42 STATIC_ASSERT (sizeof (UINT64) == 8, "sizeof (UINT64) does not meet UEFI Specification Data Type requirements");
43 STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specification Data Type requirements");
44 STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); 36 STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements");
37 STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements");
38 STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements");
45+#endif 39+#endif
46+#endif 40+#endif
47 41
48 // 42 //
49 // The following three enum types are used to verify that the compiler 43 // The following three enum types are used to verify that the compiler
50@@ -841,9 +848,13 @@ typedef enum { 44@@ -812,9 +820,13 @@ typedef enum {
51 __VerifyUint32EnumValue = 0xffffffff 45 __VerifyUint32EnumValue = 0xffffffff
52 } __VERIFY_UINT32_ENUM_SIZE; 46 } __VERIFY_UINT32_ENUM_SIZE;
53 47
54+#ifndef OS_BUILD 48+#ifndef OS_BUILD
55+#ifndef UNIT_TEST_UEFI_BUILD 49+#ifndef UNIT_TEST_UEFI_BUILD
56 STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); 50 STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
@@ -58,9 +52,8 @@ index 8e4271f6ea..c39511a064 100644
58 STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); 52 STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
59+#endif 53+#endif
60+#endif 54+#endif
61 55
62 /** 56 /**
63 Macro that returns a pointer to the data structure that contains a specified field of 57 Macro that returns a pointer to the data structure that contains a specified field of
64-- 58--
652.17.1 592.37.3
66
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0341.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb
index e84d1058..c4743d1c 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0341.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb
@@ -15,25 +15,33 @@ LICENSE = "BSD-3-Clause | BSD-2-Clause"
15LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \ 15LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \
16 file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08" 16 file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08"
17 17
18SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \ 18SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master;name=ipmctl; \
19 git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2; \ 19 git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \
20 file://0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch;patchdir=edk2 \ 20 file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \
21 file://0001-CMakeLists-disable-Werror.patch \
21" 22"
22 23
23SRCREV_ipmctl = "c8134c253a577a89f651d82c3f3ecd19a015c057" 24SRCREV_ipmctl = "c75bd840ea7820c8f93a5488fcff75d08beedd51"
24#tag: edk2-stable202102 25#tag edk2-stable202302
25SRCREV_edk2 = "ef91b07388e1c0a50c604e5350eeda98428ccea6" 26SRCREV_edk2 = "f80f052277c88a67c55e107b550f504eeea947d3"
27SRCREV_FORMAT = "ipmctl_edk2"
26 28
27S = "${WORKDIR}/git" 29S = "${WORKDIR}/git"
28 30
29inherit cmake dos2unix 31inherit cmake dos2unix
30 32
31DEPENDS = "ndctl" 33DEPENDS = "ndctl pkgconfig-native"
32 34
33EXTRA_OECMAKE = "-DRELEASE=ON" 35EXTRA_OECMAKE = "-DRELEASE=ON"
34 36
35do_configure_prepend() { 37do_configure:prepend() {
36 for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do 38 for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do
37 ln -sf edk2/${dir} ${S} 39 ln -sf edk2/${dir} ${S}
38 done 40 done
39} 41}
42
43do_install:append() {
44 # Remove /var/log/ipmctl as anything created in /var/log will not be
45 # available when tmpfs is mounted at /var/volatile/log.
46 rm -rf ${D}${localstatedir}/log
47}
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 3130fb88..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From c6fa6f32077ab554839d6e1e5b46d0778c17b8b1 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 ngraph/CMakeLists.txt | 6 ++----
11 ngraph/test/runtime/CMakeLists.txt | 2 ++
12 2 files changed, 4 insertions(+), 4 deletions(-)
13
14diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
15index 6163c01e4a..74c479c071 100644
16--- a/ngraph/CMakeLists.txt
17+++ b/ngraph/CMakeLists.txt
18@@ -353,7 +353,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
19 install(EXPORT ngraphTargets
20 FILE ngraphTargets.cmake
21 NAMESPACE ngraph::
22- DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake
23+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
24 COMPONENT ngraph)
25 endif()
26
27@@ -367,7 +367,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
28
29 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
30 ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake
31- DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake
32+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
33 COMPONENT ngraph)
34 endif()
35
36@@ -386,5 +386,3 @@ add_subdirectory(test)
37 if (NGRAPH_PYTHON_BUILD_ENABLE)
38 add_subdirectory(python)
39 endif()
40-
41-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph)
42diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt
43index 2943722acc..a2ccdd11de 100644
44--- a/ngraph/test/runtime/CMakeLists.txt
45+++ b/ngraph/test/runtime/CMakeLists.txt
46@@ -79,3 +79,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
47
48 add_subdirectory(interpreter)
49 add_subdirectory(ie)
50+
51+install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB})
52--
532.30.2
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
deleted file mode 100644
index 822ab1cc..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ /dev/null
@@ -1,193 +0,0 @@
1From ca4a2b824de61c182b46e28fce875370ce46d4e1 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 8 Apr 2021 14:19:51 +0800
4Subject: [PATCH] inference-engine: use system installed packages
5
6Use installed versions of ade, protobuf and tbb.
7
8Upstream-Status: Pending
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 cmake/dependencies.cmake | 19 -----------
13 inference-engine/CMakeLists.txt | 2 +-
14 inference-engine/cmake/dependencies.cmake | 34 -------------------
15 inference-engine/cmake/ie_parallel.cmake | 2 +-
16 inference-engine/samples/CMakeLists.txt | 2 +-
17 .../common_test_utils/CMakeLists.txt | 4 +--
18 .../unit_test_utils/CMakeLists.txt | 3 +-
19 inference-engine/thirdparty/CMakeLists.txt | 5 ++-
20 8 files changed, 7 insertions(+), 64 deletions(-)
21
22diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
23index aed7614734..f5baa6f86b 100644
24--- a/cmake/dependencies.cmake
25+++ b/cmake/dependencies.cmake
26@@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}")
27 if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
28 set(protoc_version "3.7.1")
29
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- SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8"
34- )
35- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
36-
37- reset_deps_cache(SYSTEM_PROTOC)
38-
39- find_program(
40- SYSTEM_PROTOC
41- NAMES protoc
42- PATHS "${SYSTEM_PROTOC_ROOT}/bin"
43- NO_DEFAULT_PATH)
44- if(NOT SYSTEM_PROTOC)
45- message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
46- endif()
47-
48- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
49 endif()
50diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
51index 95c657222e..20cbd5000b 100644
52--- a/inference-engine/CMakeLists.txt
53+++ b/inference-engine/CMakeLists.txt
54@@ -20,7 +20,7 @@ function(ie_developer_export_targets)
55 endfunction()
56
57 function(ie_developer_export)
58- set(all_dev_targets gflags ie_libraries)
59+ set(all_dev_targets ie_libraries)
60 foreach(component IN LISTS openvino_export_components)
61 export(TARGETS ${${component}} NAMESPACE IE::
62 APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
63diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
64index 6fdfc6f3cd..c07bf0f3c8 100644
65--- a/inference-engine/cmake/dependencies.cmake
66+++ b/inference-engine/cmake/dependencies.cmake
67@@ -138,40 +138,6 @@ endif ()
68 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
69 reset_deps_cache(TBBROOT TBB_DIR)
70
71- if (WIN32 AND X86_64)
72- #TODO: add target_path to be platform specific as well, to avoid following if
73- RESOLVE_DEPENDENCY(TBB
74- ARCHIVE_WIN "tbb2020_20200415_win.zip"
75- TARGET_PATH "${TEMP}/tbb"
76- ENVIRONMENT "TBBROOT"
77- SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
78- elseif(ANDROID) # Should be before LINUX due LINUX is detected as well
79- RESOLVE_DEPENDENCY(TBB
80- ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
81- TARGET_PATH "${TEMP}/tbb"
82- ENVIRONMENT "TBBROOT"
83- SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
84- elseif(LINUX AND X86_64)
85- RESOLVE_DEPENDENCY(TBB
86- ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
87- TARGET_PATH "${TEMP}/tbb"
88- SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
89- elseif(LINUX AND AARCH64)
90- RESOLVE_DEPENDENCY(TBB
91- ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
92- TARGET_PATH "${TEMP}/tbb_yocto"
93- ENVIRONMENT "TBBROOT"
94- SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
95- elseif(APPLE AND X86_64)
96- RESOLVE_DEPENDENCY(TBB
97- ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
98- TARGET_PATH "${TEMP}/tbb"
99- ENVIRONMENT "TBBROOT"
100- SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6")
101- else()
102- message(FATAL_ERROR "TBB is not available on current platform")
103- endif()
104-
105 update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder")
106 update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder")
107
108diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
109index f8988aa105..42fedd10c5 100644
110--- a/inference-engine/cmake/ie_parallel.cmake
111+++ b/inference-engine/cmake/ie_parallel.cmake
112@@ -6,7 +6,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
113 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND)
114 find_package(TBB COMPONENTS tbb tbbmalloc)
115 set("TBB_FOUND" ${TBB_FOUND} PARENT_SCOPE)
116- set("TBB_IMPORTED_TARGETS" ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
117+ set("TBB_IMPORTED_TARGETS" "tbb;tbbmalloc" PARENT_SCOPE)
118 set("TBB_VERSION" ${TBB_VERSION} PARENT_SCOPE)
119 if (TBB_FOUND)
120 if (TBB_VERSION VERSION_LESS 2020)
121diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
122index dfe9f2303d..6bc44019fe 100644
123--- a/inference-engine/samples/CMakeLists.txt
124+++ b/inference-engine/samples/CMakeLists.txt
125@@ -126,7 +126,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
126 add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL)
127 set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
128 endfunction()
129- add_gflags()
130+ #add_gflags()
131 endif()
132
133 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
134diff --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
135index 6e09201f1e..2d2e3524a5 100644
136--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
137+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
138@@ -43,7 +43,7 @@ function(add_gtest_libraries)
139 PROPERTIES FOLDER thirdparty)
140 endfunction()
141
142-add_gtest_libraries()
143+#add_gtest_libraries()
144
145 if (MSVC)
146 set(PUGI pugixml_mt)
147@@ -52,8 +52,6 @@ else ()
148 endif ()
149
150 list(APPEND EXPORT_DEPENDENCIES
151- gtest
152- gtest_main
153 )
154
155 set(TARGET_NAME commonTestUtils)
156diff --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
157index ab956218aa..233eb5ea46 100644
158--- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
159+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
160@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine)
161
162 list(APPEND EXPORT_DEPENDENCIES
163 commonTestUtils_s
164- inference_engine_s
165- gmock)
166+ inference_engine_s)
167
168 addIeTarget(
169 NAME ${TARGET_NAME}
170diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
171index 9a6a9209f1..eda6a64161 100644
172--- a/inference-engine/thirdparty/CMakeLists.txt
173+++ b/inference-engine/thirdparty/CMakeLists.txt
174@@ -62,14 +62,13 @@ else()
175 target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
176 endif()
177
178-add_subdirectory(ade EXCLUDE_FROM_ALL)
179 add_subdirectory(fluid/modules/gapi)
180
181-set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
182+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
183
184 # developer package
185
186-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
187+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
188
189 if (NOT USE_SYSTEM_PUGIXML)
190 set_target_properties(pugixml PROPERTIES FOLDER thirdparty)
191--
1922.29.0
193
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch
deleted file mode 100644
index 4b83a948..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 0ecaaf9098dc22b5503dfbce5cf629525e1dd237 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Fri, 7 May 2021 14:30:03 +0800
4Subject: [PATCH] plugin_api: fix build with gcc 11
5
6Some C++ Standard Library headers have been changed in gcc 11 to no
7longer include other headers that they do need to depend on.
8
9Include exception explicitly to avoid:
10
11| inference-engine/src/plugin_api/ie_system_conf.h:21:31: error: 'exception_ptr' in namespace 'std' does not name a type; did you mean 'exception'?
12| 21 | INFERENCE_ENGINE_API_CPP(std::exception_ptr&) CurrentException();
13| | ^~~~~~~~~~~~~
14
15Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/5546]
16
17Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
18---
19 inference-engine/src/plugin_api/ie_system_conf.h | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/inference-engine/src/plugin_api/ie_system_conf.h b/inference-engine/src/plugin_api/ie_system_conf.h
23index c0e4cbb8b..56d5fb488 100644
24--- a/inference-engine/src/plugin_api/ie_system_conf.h
25+++ b/inference-engine/src/plugin_api/ie_system_conf.h
26@@ -11,6 +11,7 @@
27
28 #include "ie_api.h"
29 #include <vector>
30+#include <exception>
31
32 namespace InferenceEngine {
33
34--
352.30.2
36
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 631b1839..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
+++ /dev/null
@@ -1,261 +0,0 @@
1From 21453439cd6d89058710e868f05727502e556f99 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 | 15 ---------------
11 cmake/developer_package/IEDevScriptsConfig.cmake | 2 +-
12 cmake/developer_package/packaging.cmake | 8 +++++---
13 cmake/developer_package/plugins/plugins.cmake | 2 +-
14 .../samples/common/opencv_c_wraper/CMakeLists.txt | 2 ++
15 inference-engine/samples/CMakeLists.txt | 4 +++-
16 .../samples/common/format_reader/CMakeLists.txt | 2 ++
17 .../src/inference_engine/CMakeLists.txt | 4 ++--
18 inference-engine/src/preprocessing/CMakeLists.txt | 2 +-
19 .../src/readers/ir_reader/CMakeLists.txt | 2 +-
20 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
21 inference-engine/tests/unit/cpu/CMakeLists.txt | 2 ++
22 .../tests/unit/inference_engine/CMakeLists.txt | 2 ++
23 inference-engine/tests/unit/vpu/CMakeLists.txt | 2 ++
24 .../tools/compile_tool/CMakeLists.txt | 2 +-
25 15 files changed, 26 insertions(+), 27 deletions(-)
26
27diff --git a/CMakeLists.txt b/CMakeLists.txt
28index e72f2b61f1..2c22827e2d 100644
29--- a/CMakeLists.txt
30+++ b/CMakeLists.txt
31@@ -105,7 +105,6 @@ function(build_ngraph)
32 ie_cpack_add_component(ngraph)
33
34 set(SDL_cmake_included ON)
35- set(NGRAPH_COMPONENT_PREFIX "deployment_tools/ngraph/")
36 add_subdirectory(ngraph)
37 set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE)
38 set(NGRAPH_REF_LIBRARIES ngraph_reference PARENT_SCOPE)
39@@ -174,12 +173,8 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
40
41 # install setupvars
42
43-ie_cpack_add_component(setupvars REQUIRED)
44
45 if(UNIX)
46- install(PROGRAMS scripts/setupvars/setupvars.sh
47- DESTINATION bin
48- COMPONENT setupvars)
49 elseif(WIN32)
50 install(PROGRAMS scripts/setupvars/setupvars.bat
51 DESTINATION bin
52@@ -189,22 +184,12 @@ endif()
53 # install install_dependencies
54
55 if(UNIX)
56- ie_cpack_add_component(install_dependencies REQUIRED)
57- install(DIRECTORY scripts/install_dependencies/
58- DESTINATION install_dependencies
59- COMPONENT install_dependencies)
60 endif()
61
62 # install files for demo
63
64-ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core)
65
66 if(UNIX)
67- install(DIRECTORY scripts/demo/
68- DESTINATION deployment_tools/demo
69- COMPONENT demo_scripts
70- USE_SOURCE_PERMISSIONS
71- PATTERN *.bat EXCLUDE)
72 elseif(WIN32)
73 install(DIRECTORY scripts/demo/
74 DESTINATION deployment_tools/demo
75diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake
76index ed6971fd37..10817d3a75 100644
77--- a/cmake/developer_package/IEDevScriptsConfig.cmake
78+++ b/cmake/developer_package/IEDevScriptsConfig.cmake
79@@ -121,7 +121,7 @@ if(NOT DEFINED OUTPUT_ROOT)
80 if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR)
81 message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined")
82 endif()
83- set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
84+ set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
85 endif()
86
87 # Enable postfixes for Debug/Release builds
88diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
89index b846bf732d..7a0022968c 100644
90--- a/cmake/developer_package/packaging.cmake
91+++ b/cmake/developer_package/packaging.cmake
92@@ -4,7 +4,9 @@
93 include(CPackComponent)
94 unset(IE_CPACK_COMPONENTS_ALL CACHE)
95
96-set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
97+if (NOT DEFINED IE_CPACK_IE_DIR)
98+ set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
99+endif()
100
101 #
102 # ie_cpack_set_library_dir()
103@@ -17,8 +19,8 @@ function(ie_cpack_set_library_dir)
104 set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
105 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
106 else()
107- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
108- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
109+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
110+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
111 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
112 endif()
113 endfunction()
114diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
115index a66d2568d9..c3aad14bab 100644
116--- a/cmake/developer_package/plugins/plugins.cmake
117+++ b/cmake/developer_package/plugins/plugins.cmake
118@@ -106,7 +106,7 @@ function(ie_add_plugin)
119
120 install(TARGETS ${IE_PLUGIN_NAME}
121 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}
122- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component})
123+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component})
124 endif()
125 endfunction()
126
127diff --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
128index aff7229c9f..f45a215f68 100644
129--- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
130+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
131@@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples)
132 if(COMMAND add_cpplint_target)
133 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
134 endif()
135+
136+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
137diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
138index 6bc44019fe..ca5ab34704 100644
139--- a/inference-engine/samples/CMakeLists.txt
140+++ b/inference-engine/samples/CMakeLists.txt
141@@ -33,7 +33,7 @@ endif()
142
143 if(IE_MAIN_SOURCE_DIR)
144 # in case if samples are built from IE repo
145- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
146+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
147 # hint for find_package(InferenceEngine in the samples folder)
148 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
149 # hint for find_package(ngraph in the samples folder)
150@@ -251,6 +251,8 @@ macro(ie_add_sample)
151 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME}
152 CUSTOM_FILTERS ${custom_filters})
153 endif()
154+
155+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
156 endmacro()
157
158 # collect all samples subdirectories
159diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
160index c5c5449677..06ecab13b5 100644
161--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
162+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
163@@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
164
165 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}
166 FOLDER cpp_samples)
167+
168+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
169diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
170index 1ea3227631..aa64718940 100644
171--- a/inference-engine/src/inference_engine/CMakeLists.txt
172+++ b/inference-engine/src/inference_engine/CMakeLists.txt
173@@ -254,8 +254,8 @@ install(TARGETS ${TARGET_NAME}
174 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
175 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
176 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
177- DESTINATION ${IE_CPACK_IE_DIR}/share
178+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
179 COMPONENT core)
180 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
181- DESTINATION ${IE_CPACK_RUNTIME_PATH}
182+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
183 COMPONENT core)
184diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt
185index 973fafcbf5..81aea3471a 100644
186--- a/inference-engine/src/preprocessing/CMakeLists.txt
187+++ b/inference-engine/src/preprocessing/CMakeLists.txt
188@@ -185,4 +185,4 @@ ie_developer_export_targets(${TARGET_NAME})
189 install(TARGETS ${TARGET_NAME}
190 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
191 ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
192- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
193+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
194diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt
195index 7721b7df6d..bf6543efa8 100644
196--- a/inference-engine/src/readers/ir_reader/CMakeLists.txt
197+++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt
198@@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
199 install(TARGETS ${TARGET_NAME}
200 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
201 ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
202- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
203+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
204diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
205index d8a5f2ec1d..2db7ddea6f 100644
206--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
207+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
208@@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
209 # install
210 if (LINUX)
211 install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
212- DESTINATION ${IE_CPACK_IE_DIR}/external
213+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
214 COMPONENT myriad)
215 endif()
216diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
217index c9a92b4857..2b4fcc4d01 100644
218--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
219+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
220@@ -25,3 +25,5 @@ addIeTargetTest(
221 ie_faster_build(${TARGET_NAME}
222 UNITY
223 )
224+
225+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
226diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
227index 1d9515f540..c81cb2ed79 100644
228--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
229+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
230@@ -26,3 +26,5 @@ addIeTargetTest(
231 LABELS
232 IE
233 )
234+
235+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
236diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
237index 5be30a3092..6a01e280ae 100644
238--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
239+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
240@@ -35,3 +35,5 @@ addIeTargetTest(
241 VPU
242 MYRIAD
243 )
244+
245+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
246diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
247index 58614d3ced..9dfa068e4d 100644
248--- a/inference-engine/tools/compile_tool/CMakeLists.txt
249+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
250@@ -49,7 +49,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
251 # install
252
253 install(TARGETS compile_tool
254- RUNTIME DESTINATION deployment_tools/tools/compile_tool
255+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
256 COMPONENT core)
257
258 install(FILES README.md
259--
2602.29.0
261
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/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
index f38e0669..816a98a3 100644
--- 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
@@ -1,33 +1,27 @@
1From 6a0046c523a67b4d21d856ea73861c00b5a9c9fd Mon Sep 17 00:00:00 2001 1From 804b08023b3f8e72b8e3eb09e464d6775c11d966 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Naveen Saini <naveen.kumar.saini@intel.com>
3Date: Mon, 19 Oct 2020 23:29:23 +0800 3Date: Fri, 21 Oct 2022 11:38:23 +0800
4Subject: [PATCH] demos: use gflags from meta-oe 4Subject: [PATCH] demos: use gflags from meta-oe
5 5
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>
9Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
10
9--- 11---
10 demos/CMakeLists.txt | 4 ++-- 12 demos/CMakeLists.txt | 2 +-
11 1 file changed, 2 insertions(+), 2 deletions(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
12 14
13diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt 15diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
14index c5e3b1ec3..4e78c72a6 100644 16index 51767051c..fb7e3d22f 100644
15--- a/demos/CMakeLists.txt 17--- a/demos/CMakeLists.txt
16+++ b/demos/CMakeLists.txt 18+++ b/demos/CMakeLists.txt
17@@ -62,11 +62,11 @@ set(CMAKE_CXX_STANDARD 11) 19@@ -141,7 +141,7 @@ endmacro()
18 set(CMAKE_CXX_STANDARD_REQUIRED ON) 20 find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs)
19 #################################### 21 find_package(OpenVINO REQUIRED COMPONENTS Runtime)
20
21-set(GFLAGS_IS_SUBPROJECT TRUE)
22+set(GFLAGS_IS_SUBPROJECT FALSE)
23 set(HAVE_SYS_STAT_H 1)
24 set(HAVE_INTTYPES_H 1)
25 22
26-add_subdirectory(thirdparty/gflags) 23-add_subdirectory(thirdparty/gflags)
27+#add_subdirectory(thirdparty/gflags) 24+#add_subdirectory(thirdparty/gflags)
25 add_subdirectory(common/cpp)
28 26
29 if(CMAKE_CXX_COMPILER_ID MATCHES "^GNU|(Apple)?Clang$") 27 find_package(OpenCV QUIET COMPONENTS gapi)
30 set(COMPILER_IS_GCC_LIKE TRUE)
31--
322.29.0
33
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb
deleted file mode 100644
index 700f78c2..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb
+++ /dev/null
@@ -1,66 +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 = "9ca5dbeff80464bf5728e8be25daedfe9a9208d7"
12
13LICENSE = "Apache-2.0"
14LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
15"
16
17inherit cmake
18
19S = "${WORKDIR}/git"
20OECMAKE_SOURCEPATH = "${S}/demos"
21
22DEPENDS += "openvino-inference-engine opencv gflags"
23
24RDEPENDS_${PN} += " \
25 python3-decorator \
26 python3-defusedxml \
27 python3-networkx \
28 python3-protobuf \
29 python3-test-generator \
30 python3-requests \
31 python3-pyyaml \
32 python3-numpy \
33 bash \
34"
35
36COMPATIBLE_HOST = '(x86_64).*-linux'
37
38EXTRA_OECMAKE += " \
39 -DIE_MAIN_SOURCE_DIR=${B} \
40 -DENABLE_SAMPLES=ON \
41 -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \
42 -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \
43 -DIE_C_API_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_c_api.so \
44 -DIE_LEGACY_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_legacy.so \
45 -DIE_NN_BUILDER_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_nn_builder.so \
46 -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \
47"
48
49do_configure_prepend(){
50 mkdir -p ${WORKDIR}/InferenceEngine/share
51 cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/
52}
53
54do_install(){
55 install -d ${D}${libdir}
56 install -d ${D}${bindir}
57 install -d ${D}${datadir}/openvino/open-model-zoo/tools
58 install -d ${D}${datadir}/openvino/open-model-zoo/demos
59 cp -rf ${WORKDIR}/build/intel64/Release/lib/*.a ${D}${libdir}
60 cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir}
61 cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo
62 cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo
63 cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools
64}
65
66FILES_${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb
new file mode 100644
index 00000000..a9422e70
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb
@@ -0,0 +1,54 @@
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=https;branch=master \
8 file://0001-use-oe-gflags.patch \
9 "
10
11SRCREV = "cf5141dad2a4f24e1c5d5b9d43219ed804c48bbf"
12
13LICENSE = "Apache-2.0"
14LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
15"
16
17inherit cmake
18
19S = "${WORKDIR}/git"
20OECMAKE_SOURCEPATH = "${S}/demos"
21
22DEPENDS += "openvino-inference-engine opencv gflags"
23
24RDEPENDS:${PN} += " \
25 python3-decorator \
26 python3-defusedxml \
27 python3-networkx \
28 python3-protobuf \
29 python3-requests \
30 python3-pyyaml \
31 python3-numpy \
32 bash \
33"
34
35COMPATIBLE_HOST = '(x86_64).*-linux'
36COMPATIBLE_HOST:libc-musl = "null"
37
38EXTRA_OECMAKE += " \
39 -DENABLE_SAMPLES=ON \
40 "
41
42do_install(){
43 install -d ${D}${libdir}
44 install -d ${D}${bindir}
45 install -d ${D}${datadir}/openvino/open-model-zoo/tools
46 install -d ${D}${datadir}/openvino/open-model-zoo/demos
47 cp -rf ${B}/intel64/Release/*.a ${D}${libdir}
48 cp -rf ${B}/intel64/Release/*_demo* ${D}${bindir}
49 cp -rf ${S}/models ${D}${datadir}/openvino/open-model-zoo
50 cp -rf ${S}/demos ${D}${datadir}/openvino/open-model-zoo
51 cp -rf ${S}/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools
52}
53
54FILES:${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb
deleted file mode 100644
index 96e59126..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.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/2021/3;lfs=0 \
8 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1642.zip;name=usb_ma2x8x \
9 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1642.zip;name=pcie_ma2x8x \
10 git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \
11 git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak \
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://0001-dont-install-licenses-and-version-file.patch \
16 file://0001-plugin_api-fix-build-with-gcc-11.patch \
17 "
18
19SRCREV = "c5f7ad383e654dfb4a5ac0805323cf8d43426b3f"
20SRCREV_mkl = "d35c3c11f9ff0f5090f9afe16af122cda501134c"
21SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9"
22
23SRC_URI[usb_ma2x8x.sha256sum] = "d0f6aaaf71a595963e6013ef59045e20b07324f1a47deaa3f906419d39b2bd5a"
24SRC_URI[pcie_ma2x8x.sha256sum] = "18d3cd10cf6cc36ff58001812d3d215c0bbb2de09a8832128592401c8f959358"
25
26LICENSE = "Apache-2.0 & ISSL & MIT"
27LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
28 file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=c441291ac5f15bdc6b09b4cc02ece35b \
29 file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
30 file://inference-engine/thirdparty/clDNN/common/include/OpenCL_CLHPP_License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
31"
32LICENSE_${PN}-vpu-firmware = "ISSL"
33
34inherit cmake python3native
35
36S = "${WORKDIR}/git"
37
38EXTRA_OECMAKE += " \
39 -DENABLE_OPENCV=0 \
40 -DENABLE_PLUGIN_RPATH=0 \
41 -DENABLE_GNA=0 \
42 -DPYTHON_EXECUTABLE=${PYTHON} \
43 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
44 -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR}/cmake/TBB \
45 -DENABLE_SAMPLES=1 \
46 -DIE_CPACK_IE_DIR=${prefix} \
47 -DNGRAPH_UNIT_TEST_ENABLE=FALSE \
48 -DNGRAPH_TEST_UTIL_ENABLE=FALSE \
49 -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \
50 -DNGRAPH_JSON_ENABLE=FALSE \
51 -DTREAT_WARNING_AS_ERROR=FALSE \
52 -DENABLE_SPEECH_DEMO=FALSE \
53 -DENABLE_DATA=FALSE \
54 -DUSE_SYSTEM_PUGIXML=TRUE \
55 "
56
57DEPENDS += "libusb1 \
58 ade \
59 opencv \
60 pugixml \
61 protobuf-native \
62 tbb \
63 "
64
65COMPATIBLE_HOST = '(x86_64).*-linux'
66COMPATIBLE_HOST_libc-musl = "null"
67
68PACKAGECONFIG ?= "vpu opencl"
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"
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"
71PACKAGECONFIG[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"
73
74do_install_append() {
75 if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then
76 install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/
77 install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.mvcmd ${D}${libdir}/
78 fi
79
80 if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
81 install -d ${D}${datadir}/inference_engine
82 mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/
83
84 install -d ${D}${PYTHON_SITEPACKAGES_DIR}
85 mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/
86 mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/
87 mv ${D}${prefix}/deployment_tools/tools/cross_check_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/
88
89 rm -rf ${D}${prefix}/python
90 fi
91
92 rm -rf ${D}${prefix}/deployment_tools
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"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
new file mode 100644
index 00000000..675d9920
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
@@ -0,0 +1,146 @@
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=https;name=openvino;branch=releases/2024/1;lfs=0 \
8 git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \
9 git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \
10 git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
11 git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \
12 git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \
13 git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \
14 git://github.com/gflags/gflags.git;protocol=https;destsuffix=git/thirdparty/gflags/gflags;name=gflags;nobranch=1 \
15 git://github.com/madler/zlib.git;protocol=https;destsuffix=git/thirdparty/zlib/zlib;name=zlib;nobranch=1 \
16 git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \
17 git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \
18 git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \
19 git://github.com/openvinotoolkit/telemetry.git;protocol=https;destsuffix=git/thirdparty/telemetry;name=telemetry;nobranch=1;lfs=0 \
20 file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \
21 file://0002-cmake-Fix-overloaded-virtual-error.patch \
22 file://0003-protobuf-allow-target-protoc-to-be-built.patch \
23 "
24
25SRCREV_openvino = "f4afc983258bcb2592d999ed6700043fdb58ad78"
26SRCREV_mkl = "26633ae49edd4353a29b7170d9fcef6b2d79f4b3"
27SRCREV_onednn = "4e6ff043c439652fcf6c400ac4e0c81bbac7c71c"
28SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2"
29SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
30SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e"
31SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e"
32SRCREV_gflags = "e171aa2d15ed9eb17054558e0b3a6a413bb01067"
33SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851"
34SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94"
35SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488"
36SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d"
37SRCREV_telemetry = "58e16c257a512ec7f451c9fccf9ff455065b285b"
38SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas_telemetry"
39
40LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib"
41LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
42 file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \
43 file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \
44 file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \
45 file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
46 file://thirdparty/gflags/gflags/COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df \
47 file://thirdparty/zlib/zlib/LICENSE;md5=b51a40671bc46e961c0498897742c0b8 \
48 file://src/plugins/intel_cpu/thirdparty/mlas/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
49 file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
50 file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
51 file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \
52 file://node-addon-api-src/LICENSE.md;md5=0492ef29a9d558a3e9660e7accc9ca6a \
53 file://thirdparty/telemetry/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
54"
55
56inherit cmake python3native pkgconfig qemu
57
58S = "${WORKDIR}/git"
59EXTRA_OECMAKE += " \
60 -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
61 -DENABLE_OPENCV=OFF \
62 -DENABLE_INTEL_GNA=OFF \
63 -DENABLE_SYSTEM_TBB=ON \
64 -DPYTHON_EXECUTABLE=${PYTHON} \
65 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
66 -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \
67 -DTREAT_WARNING_AS_ERROR=FALSE \
68 -DENABLE_DATA=FALSE \
69 -DENABLE_SYSTEM_PUGIXML=TRUE \
70 -DENABLE_OV_ONNX_FRONTEND=FALSE \
71 -DUSE_BUILD_TYPE_SUBFOLDER=OFF \
72 -DENABLE_FUZZING=OFF \
73 -DENABLE_TBBBIND_2_5=OFF \
74 -DCPACK_GENERATOR=RPM \
75 -DENABLE_SYSTEM_FLATBUFFERS=ON \
76 -DENABLE_SYSTEM_SNAPPY=ON \
77 -DFETCHCONTENT_BASE_DIR="${S}" \
78 -DENABLE_INTEL_NPU=OFF \
79 "
80
81DEPENDS += "\
82 flatbuffers-native \
83 pugixml \
84 python3-pybind11 \
85 python3-pybind11-native \
86 qemu-native \
87 snappy \
88 tbb \
89 "
90
91COMPATIBLE_HOST = '(x86_64).*-linux'
92COMPATIBLE_HOST:libc-musl = "null"
93
94PACKAGECONFIG ?= "opencl samples"
95PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp,"
96PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DENABLE_PYTHON_PACKAGING=ON, -DENABLE_PYTHON=OFF, patchelf-native, python3 python3-numpy python3-progress"
97PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv"
98PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
99
100do_configure:prepend() {
101 # Dont set PROJECT_ROOT_DIR
102 sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt
103
104 # qemu wrapper that can be used by cmake to run target binaries.
105 qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
106 cat > ${WORKDIR}/qemuwrapper << EOF
107#!/bin/sh
108$qemu_binary "\$@"
109EOF
110 chmod +x ${WORKDIR}/qemuwrapper
111}
112
113do_install:append() {
114 rm -rf ${D}${prefix}/install_dependencies
115 rm -rf ${D}${prefix}/setupvars.sh
116
117 find ${B}/src/plugins/intel_cpu/cross-compiled/ -type f -name *_disp.cpp -exec sed -i -e 's%'"${S}"'%'"${TARGET_DBGSRC_DIR}"'%g' {} +
118}
119
120# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
121# instead of RSS
122SSTATE_SCAN_FILES:append = " *.cmake"
123
124FILES:${PN} += "\
125 ${libdir}/openvino-${PV}/lib*${SOLIBSDEV} \
126 ${libdir}/openvino-${PV}/plugins.xml \
127 ${libdir}/openvino-${PV}/cache.json \
128 "
129
130# Move inference engine samples into a separate package
131PACKAGES =+ "${PN}-samples"
132
133FILES:${PN}-samples = "${datadir}/openvino \
134 ${bindir} \
135 ${libdir}/libformat_reader.a \
136 ${libdir}/libopencv_c_wrapper.a \
137 "
138
139RDEPENDS:${PN}-samples += "python3-core"
140
141# Package for inference engine python API
142PACKAGES =+ "${PN}-python3"
143
144FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}"
145
146UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-08 06:06:43 +0000