MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 12:59:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

openvino-inference-engine: upgrade 2022.1 -> 2022.1.1

Browse Source 
Enable an option that's is available now to use TBB from system and
refresh patches accordingly. This version also switches to using system
installed OpenCV and Intel version is not included.

Release notes:
https://github.com/openvinotoolkit/openvino/releases/tag/2022.1.1

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2023-03-10 08:10:31 +05:30
parent 64e8ccb47e
commit 4c6cc14669
3 changed files with 48 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
View File

@ -1,30 +1,27 @@
From b0f30ab7ecdac98afa72a31371a393a73f855b3c Mon Sep 17 00:00:00 2001
From d997ee70a49cee8a577a81968c1d603a97bc614f Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Thu, 7 Apr 2022 21:39:26 +0800
Subject: [PATCH] Use system installed dependencies
Use the system versions of libva, tbb, OpenCV, ade and zlib.
Use the system versions of libva, ade and zlib.
Upstream-Status: Inappropriate
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
cmake/dependencies.cmake | 75 -------------------------
cmake/extra_modules.cmake | 4 +-
cmake/templates/OpenVINOConfig.cmake.in | 9 ---
src/cmake/ie_parallel.cmake | 2 +-
src/plugins/intel_gpu/include/va/va.h | 6 --
tests/fuzz/src/CMakeLists.txt | 3 +-
thirdparty/CMakeLists.txt | 26 ++++-----
thirdparty/cnpy/CMakeLists.txt | 2 +-
8 files changed, 15 insertions(+), 112 deletions(-)
cmake/dependencies.cmake | 20 --------------------
cmake/extra_modules.cmake | 4 ++--
src/plugins/intel_gpu/include/va/va.h | 6 ------
tests/fuzz/src/CMakeLists.txt | 3 +--
thirdparty/CMakeLists.txt | 26 ++++++++++----------------
thirdparty/cnpy/CMakeLists.txt | 2 +-
6 files changed, 14 insertions(+), 47 deletions(-)
delete mode 100644 src/plugins/intel_gpu/include/va/va.h
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index e2f941fcd..1fcc358ef 100644
index 106af36c7d..45a3214100 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -29,26 +29,6 @@ endif()
@@ -27,26 +27,6 @@ get_linux_name(LINUX_OS_NAME)
if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
set(protoc_version "3.18.2")
@ -51,70 +48,8 @@ index e2f941fcd..1fcc358ef 100644
endif()
if(ENABLE_INTEL_MYRIAD)
@@ -102,61 +82,6 @@ if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}")
endif()
- if(WIN32 AND X86_64)
- # TODO: add target_path to be platform specific as well, to avoid following if
- RESOLVE_DEPENDENCY(TBB
- ARCHIVE_WIN "tbb2020_20200415_win.zip"
- TARGET_PATH "${TEMP}/tbb"
- ENVIRONMENT "TBBROOT"
- SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
- if(ENABLE_TBBBIND_2_5)
- RESOLVE_DEPENDENCY(TBBBIND_2_5
- ARCHIVE_WIN "tbbbind_2_5_static_win_v1.zip"
- TARGET_PATH "${TEMP}/tbbbind_2_5"
- ENVIRONMENT "TBBBIND_2_5_ROOT"
- SHA256 "a67afeea8cf194f97968c800dab5b5459972908295242e282045d6b8953573c1")
- else()
- message(WARNING "prebuilt TBBBIND_2_5 is not available.
- Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure")
- endif()
- elseif(ANDROID) # Should be before LINUX due LINUX is detected as well
- RESOLVE_DEPENDENCY(TBB
- ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
- TARGET_PATH "${TEMP}/tbb"
- ENVIRONMENT "TBBROOT"
- SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
- elseif(LINUX AND X86_64)
- RESOLVE_DEPENDENCY(TBB
- ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
- TARGET_PATH "${TEMP}/tbb"
- ENVIRONMENT "TBBROOT"
- SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
- if(ENABLE_TBBBIND_2_5)
- RESOLVE_DEPENDENCY(TBBBIND_2_5
- ARCHIVE_LIN "tbbbind_2_5_static_lin_v2.tgz"
- TARGET_PATH "${TEMP}/tbbbind_2_5"
- ENVIRONMENT "TBBBIND_2_5_ROOT"
- SHA256 "865e7894c58402233caf0d1b288056e0e6ab2bf7c9d00c9dc60561c484bc90f4")
- else()
- message(WARNING "prebuilt TBBBIND_2_5 is not available.
- Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure")
- endif()
- elseif(LINUX AND AARCH64)
- RESOLVE_DEPENDENCY(TBB
- ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
- TARGET_PATH "${TEMP}/tbb_yocto"
- ENVIRONMENT "TBBROOT"
- SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
- elseif(APPLE AND X86_64)
- RESOLVE_DEPENDENCY(TBB
- ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
- TARGET_PATH "${TEMP}/tbb"
- ENVIRONMENT "TBBROOT"
- SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6")
- else()
- message(FATAL_ERROR "TBB is not available on current platform")
- endif()
-
update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder")
if(EXISTS "${TBBROOT}/lib/cmake/TBB/TBBConfig.cmake")
# oneTBB case
diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake
index e33e4378f..f0cacdf6f 100644
index e33e4378f1..f0cacdf6ff 100644
--- a/cmake/extra_modules.cmake
+++ b/cmake/extra_modules.cmake
@@ -18,7 +18,7 @@ function(ie_generate_dev_package_config)
@ -135,42 +70,9 @@ index e33e4378f..f0cacdf6f 100644
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in"
diff --git a/cmake/templates/OpenVINOConfig.cmake.in b/cmake/templates/OpenVINOConfig.cmake.in
index 00e892f2b..7c686fa07 100644
--- a/cmake/templates/OpenVINOConfig.cmake.in
+++ b/cmake/templates/OpenVINOConfig.cmake.in
@@ -146,15 +146,6 @@ set(_ov_package_prefix_dir "${PACKAGE_PREFIX_DIR}")
set(THREADING "@THREADING@")
if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND NOT TBB_FOUND)
- set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@")
- _ov_find_dependency(TBB
- COMPONENTS tbb tbbmalloc
- CONFIG
- PATHS ${TBBROOT}/cmake
- ${_tbb_dir}
- NO_CMAKE_FIND_ROOT_PATH
- NO_DEFAULT_PATH)
-
set(install_tbbbind "@install_tbbbind@")
if(install_tbbbind)
set_and_check(_tbb_bind_dir "@PACKAGE_IE_TBBBIND_DIR@")
diff --git a/src/cmake/ie_parallel.cmake b/src/cmake/ie_parallel.cmake
index a036b019c..031f1ea48 100644
--- a/src/cmake/ie_parallel.cmake
+++ b/src/cmake/ie_parallel.cmake
@@ -34,7 +34,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
endforeach()
endif()
set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE)
- set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
+ set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE)
set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE)
if (NOT TBB_FOUND)
set(THREADING "SEQ" PARENT_SCOPE)
diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h
deleted file mode 100644
index 5c8a5c6f6..000000000
index 5c8a5c6f6e..0000000000
--- a/src/plugins/intel_gpu/include/va/va.h
+++ /dev/null
@@ -1,6 +0,0 @@
@ -181,7 +83,7 @@ index 5c8a5c6f6..000000000
-typedef cl_uint VASurfaceID;
-typedef void* VADisplay;
diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt
index 5e6b7b168..a81c51bb7 100644
index 5e6b7b168e..a81c51bb77 100644
--- a/tests/fuzz/src/CMakeLists.txt
+++ b/tests/fuzz/src/CMakeLists.txt
@@ -10,14 +10,13 @@ add_custom_target(fuzz)
@ -201,7 +103,7 @@ index 5e6b7b168..a81c51bb7 100644
add_dependencies(fuzz ${test_name})
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 2d61c5fd7..97b372998 100644
index 2d61c5fd7a..97b372998a 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -12,10 +12,9 @@ endif()
@ -279,7 +181,7 @@ index 2d61c5fd7..97b372998 100644
endforeach()
endif()
diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt
index 041031e92..793de9845 100644
index 041031e923..793de9845c 100644
--- a/thirdparty/cnpy/CMakeLists.txt
+++ b/thirdparty/cnpy/CMakeLists.txt
@@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
@ -292,5 +194,5 @@ index 041031e92..793de9845 100644
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty)
--
2.35.1
2.36.1

54
dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch
View File

@ -1,4 +1,4 @@
From 07772636ef9b7207967395d22a869e204e8f485b Mon Sep 17 00:00:00 2001
From 5b6c285b5398fd29cc541ccf92e13440537bb5e8 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Mon, 11 Apr 2022 11:11:23 +0800
Subject: [PATCH] Fix installation of binaries and libraries
@ -31,10 +31,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
19 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe62c6318..344d9398f 100644
index beb0214284..c9ffa7fcae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,7 +104,7 @@ include(cmake/extra_modules.cmake)
@@ -106,7 +106,7 @@ include(cmake/extra_modules.cmake)
add_subdirectory(docs)
add_subdirectory(tools)
add_subdirectory(scripts)
@ -44,7 +44,7 @@ index fe62c6318..344d9398f 100644
#
# CPack
diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
index 39b23fe65..aa638c077 100644
index 39b23fe655..aa638c0778 100644
--- a/cmake/developer_package/frontends/frontends.cmake
+++ b/cmake/developer_package/frontends/frontends.cmake
@@ -2,7 +2,7 @@
@ -57,7 +57,7 @@ index 39b23fe65..aa638c077 100644
set(FRONTEND_NAME_SUFFIX "_frontend")
diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
index cc287ff1f..2daee6611 100644
index cc287ff1f3..2daee6611e 100644
--- a/cmake/developer_package/packaging.cmake
+++ b/cmake/developer_package/packaging.cmake
@@ -20,8 +20,8 @@ function(ie_cpack_set_library_dir)
@ -72,7 +72,7 @@ index cc287ff1f..2daee6611 100644
endif()
endfunction()
diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
index a630d6c35..779c43631 100644
index a630d6c354..779c43631a 100644
--- a/cmake/developer_package/plugins/plugins.cmake
+++ b/cmake/developer_package/plugins/plugins.cmake
@@ -138,7 +138,7 @@ function(ie_add_plugin)
@ -85,7 +85,7 @@ index a630d6c35..779c43631 100644
else()
ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component})
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 86b0e8652..4f31d3cc4 100644
index 86b0e8652b..4f31d3cc4b 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -36,9 +36,10 @@ if(NOT ENABLE_DOCKER)
@ -101,7 +101,7 @@ index 86b0e8652..4f31d3cc4 100644
endforeach()
endif()
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 8101b5e32..6abe8c20c 100644
index 8101b5e328..6abe8c20ce 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -9,7 +9,7 @@ add_subdirectory(c)
@ -114,7 +114,7 @@ index 8101b5e32..6abe8c20c 100644
openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils)
diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
index a8e6e5172..aa3d2fe0e 100644
index 2755579a0f..4a5f5b424f 100644
--- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt
+++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
@@ -34,3 +34,5 @@ install(
@ -124,7 +124,7 @@ index a8e6e5172..aa3d2fe0e 100644
+
+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
index 3433dee0e..0c0fa0723 100644
index 9a73582a73..70c4147f3f 100644
--- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt
@@ -222,6 +222,8 @@ macro(ie_add_sample)
@ -137,7 +137,7 @@ index 3433dee0e..0c0fa0723 100644
if(NOT TARGET ie_samples)
add_custom_target(ie_samples ALL)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 9ad26ba95..0853e2370 100644
index 9ad26ba952..0853e23706 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -28,7 +28,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
@ -168,7 +168,7 @@ index 9ad26ba95..0853e2370 100644
install(DIRECTORY install_dependencies/
DESTINATION install_dependencies
diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt
index 9200d0bda..b3636e071 100644
index 9200d0bda1..b3636e0716 100644
--- a/src/bindings/c/src/CMakeLists.txt
+++ b/src/bindings/c/src/CMakeLists.txt
@@ -43,8 +43,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
@ -183,7 +183,7 @@ index 9200d0bda..b3636e071 100644
+ DESTINATION include/ie
COMPONENT core_c_dev)
diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake
index c46548468..3d65a20a5 100644
index ddd016d14e..76db0f9927 100644
--- a/src/cmake/openvino.cmake
+++ b/src/cmake/openvino.cmake
@@ -59,8 +59,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
@ -197,7 +197,7 @@ index c46548468..3d65a20a5 100644
# --------------- OpenVINO runtime library dev ------------------------------
add_library(${TARGET_NAME}_dev INTERFACE)
@@ -96,7 +96,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components})
@@ -95,7 +95,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components})
if(BUILD_SHARED_LIBS)
install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
@ -206,7 +206,7 @@ index c46548468..3d65a20a5 100644
COMPONENT core)
# for InferenceEngineUnitTest
@@ -115,7 +115,7 @@ endif()
@@ -114,7 +114,7 @@ endif()
install(EXPORT OpenVINOTargets
FILE OpenVINOTargets.cmake
NAMESPACE openvino::
@ -214,8 +214,8 @@ index c46548468..3d65a20a5 100644
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
COMPONENT core_dev)
set(OV_CORE_DIR "${CMAKE_BINARY_DIR}/src/core")
@@ -161,10 +161,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm
# Build tree
@@ -160,10 +160,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm
install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
"${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
"${OpenVINO_SOURCE_DIR}/src/cmake/ie_parallel.cmake"
@ -229,7 +229,7 @@ index c46548468..3d65a20a5 100644
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
COMPONENT core_dev)
diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt
index e41e286c9..11aaffca6 100644
index e41e286c95..11aaffca6a 100644
--- a/src/common/preprocessing/CMakeLists.txt
+++ b/src/common/preprocessing/CMakeLists.txt
@@ -202,7 +202,7 @@ openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
@ -242,7 +242,7 @@ index e41e286c9..11aaffca6 100644
ov_install_static_lib(${TARGET_NAME} core)
endif()
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index cc64b94ca..5f0dcf20c 100644
index cc64b94ca3..5f0dcf20cf 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -114,7 +114,7 @@ target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_
@ -262,10 +262,10 @@ index cc64b94ca..5f0dcf20c 100644
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
COMPONENT core_dev)
diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt
index ddd2fdcbc..f4ad1e623 100644
index 767fbc1b81..f279a2ef7d 100644
--- a/src/inference/CMakeLists.txt
+++ b/src/inference/CMakeLists.txt
@@ -204,7 +204,7 @@ set_target_properties(${TARGET_NAME}_obj
@@ -209,7 +209,7 @@ set_target_properties(${TARGET_NAME}_obj
openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}_plugin_api)
@ -275,7 +275,7 @@ index ddd2fdcbc..f4ad1e623 100644
# Install static libraries for case BUILD_SHARED_LIBS=OFF
diff --git a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
index 3993bd973..99287bad5 100644
index 3993bd9731..99287bad51 100644
--- a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
+++ b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
@@ -94,7 +94,7 @@ add_custom_command(
@ -288,7 +288,7 @@ index 3993bd973..99287bad5 100644
ov_install_static_lib(${TARGET_NAME} gpu)
diff --git a/src/plugins/intel_myriad/myriad_dependencies.cmake b/src/plugins/intel_myriad/myriad_dependencies.cmake
index 5bba4235f..69c1470a7 100644
index 5bba4235ff..69c1470a71 100644
--- a/src/plugins/intel_myriad/myriad_dependencies.cmake
+++ b/src/plugins/intel_myriad/myriad_dependencies.cmake
@@ -80,7 +80,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES)
@ -301,7 +301,7 @@ index 5bba4235f..69c1470a7 100644
if(ENABLE_INTEL_MYRIAD AND ENABLE_BEH_TESTS)
diff --git a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
index 12a2f15e4..893146294 100644
index 12a2f15e4a..893146294c 100644
--- a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
+++ b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
@@ -56,6 +56,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
@ -313,7 +313,7 @@ index 12a2f15e4..893146294 100644
COMPONENT myriad)
endif()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index c8638f7fd..ba30641c5 100644
index c8638f7fd3..ba30641c5a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -20,7 +20,7 @@ endif()
@ -326,7 +326,7 @@ index c8638f7fd..ba30641c5 100644
USE_SOURCE_PERMISSIONS)
diff --git a/tools/compile_tool/CMakeLists.txt b/tools/compile_tool/CMakeLists.txt
index d19eb5cc1..9fc929cbb 100644
index d19eb5cc14..9fc929cbb0 100644
--- a/tools/compile_tool/CMakeLists.txt
+++ b/tools/compile_tool/CMakeLists.txt
@@ -38,9 +38,9 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
@ -344,5 +344,5 @@ index d19eb5cc1..9fc929cbb 100644
+# DESTINATION tools/compile_tool
+# COMPONENT core_tools)
--
2.35.1
2.36.1

7
dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb → dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.1.bb
View File

@ -4,7 +4,7 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
deep learning models through a high-level C++ Inference Engine API \
integrated with application logic."
SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/1;lfs=0 \
SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/1.1;lfs=0 \
https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip;name=usb_ma2x8x \
https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip;name=pcie_ma2x8x \
git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mkl-dnn;name=mkl;nobranch=1 \
@ -19,7 +19,7 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=r
file://0002-inference-engine-installation-fixes.patch \
"
SRCREV = "cdb9bec7210f8c24fde3e416c7ada820faaaa23e"
SRCREV = "39aba80957e10b66a6c8f3f590c2d90e8238ca75"
SRCREV_mkl = "82ca2f931c1d588b67d154d873136d4af1ffb3a8"
SRCREV_onednn = "9e2bf22e51726ad36ddae90c7caf2898d124baa6"
SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9"
@ -27,7 +27,7 @@ SRCREV_pybind11 = "d71ba0cb73616c493d35699a8a9283aa64ef0f6b"
SRCREV_protobuf = "6c6b0778b70f35f93c2f0dee30e5d12ad2a83eea"
SRCREV_json = "fec56a1a16c6e1c1b1f4e116a20e79398282626c"
SRCREV_jsonschema = "b1ef8628326cf0b53612f12784fd245e5e4382f1"
SRCREV_omz = "cf9003a95ddb742aabea341aa1573c3fa25ebbe1"
SRCREV_omz = "0c94071faef095f544a228f8455718fbd653950e"
SRC_URI[usb_ma2x8x.sha256sum] = "e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf"
SRC_URI[pcie_ma2x8x.sha256sum] = "b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5"
@ -53,6 +53,7 @@ EXTRA_OECMAKE += " \
-DOpenCV_DIR=${STAGING_LIBDIR}/cmake \
-DENABLE_PLUGIN_RPATH=0 \
-DENABLE_INTEL_GNA=OFF \
-DENABLE_SYSTEM_TBB=ON \
-DPYTHON_EXECUTABLE=${PYTHON} \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \