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.1 -> 2022.2.0

Browse Source 
- Change gflag to shared as we are not building with static library.
- We are using zlib from yocto recipe, so don't add zlib as third party package
- Third party package mkl-dnn name changed to onednn upstream in openvino repo so changed
  the name accordingly in openvino-inference-engine recipe
- Refresh patches

Release Notes:
https://github.com/openvinotoolkit/openvino/releases/tag/2022.2.0

Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Yogesh Tyagi 2022-10-21 17:03:54 +08:00 committed by Anuj Mittal
parent 5963592b73
commit 023266fcbf
4 changed files with 121 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
From d997ee70a49cee8a577a81968c1d603a97bc614f Mon Sep 17 00:00:00 2001
From 86fc5a725883cf59086c319fca29ddb3e47fa7de 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
Subject: [PATCH 1/2] Use system installed dependencies
Use the system versions of libva, ade and zlib.
@ -12,13 +12,13 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
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/CMakeLists.txt | 25 +++++++++++--------------
thirdparty/cnpy/CMakeLists.txt | 2 +-
6 files changed, 14 insertions(+), 47 deletions(-)
6 files changed, 15 insertions(+), 45 deletions(-)
delete mode 100644 src/plugins/intel_gpu/include/va/va.h
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 106af36c7d..45a3214100 100644
index 8d66a012b8..75db89b915 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -27,26 +27,6 @@ get_linux_name(LINUX_OS_NAME)
@ -49,10 +49,10 @@ index 106af36c7d..45a3214100 100644
if(ENABLE_INTEL_MYRIAD)
diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake
index e33e4378f1..f0cacdf6ff 100644
index 72eed6ad3a..39e9674a11 100644
--- a/cmake/extra_modules.cmake
+++ b/cmake/extra_modules.cmake
@@ -18,7 +18,7 @@ function(ie_generate_dev_package_config)
@@ -22,7 +22,7 @@ function(ie_generate_dev_package_config)
configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
INSTALL_DESTINATION share # not used
@ -61,7 +61,7 @@ index e33e4378f1..f0cacdf6ff 100644
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
@@ -45,7 +45,7 @@ function(ov_generate_dev_package_config)
@@ -53,7 +53,7 @@ function(ov_generate_dev_package_config)
configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in"
"${CMAKE_BINARY_DIR}/OpenVINODeveloperPackageConfig.cmake"
INSTALL_DESTINATION share # not used
@ -103,14 +103,11 @@ index 5e6b7b168e..a81c51bb77 100644
add_dependencies(fuzz ${test_name})
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 2d61c5fd7a..97b372998a 100644
index 38b0a5439d..4cba1588fe 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -12,10 +12,9 @@ endif()
add_subdirectory(ittapi)
@@ -14,7 +14,7 @@ add_subdirectory(ittapi)
add_subdirectory(itt_collector EXCLUDE_FROM_ALL)
-add_subdirectory(zlib EXCLUDE_FROM_ALL)
add_subdirectory(cnpy EXCLUDE_FROM_ALL)
if(ENABLE_INTEL_GPU)
- add_subdirectory(ocl)
@ -118,7 +115,7 @@ index 2d61c5fd7a..97b372998a 100644
endif()
add_subdirectory(xbyak EXCLUDE_FROM_ALL)
@@ -52,21 +51,16 @@ endif()
@@ -72,12 +72,11 @@ endif()
add_library(ocv_hal INTERFACE)
target_include_directories(ocv_hal INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ocv")
@ -128,21 +125,22 @@ index 2d61c5fd7a..97b372998a 100644
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
+
-ov_install_static_lib(ade openvino_common)
ov_install_static_lib(fluid openvino_common)
#
# Gflags
#
@@ -93,8 +92,6 @@ if(gflags_FOUND)
set_target_properties(gflags PROPERTIES IMPORTED_GLOBAL ON)
message(STATUS "gflags (${gflags_VERSION}) is found at ${gflags_DIR}")
else()
- add_subdirectory(gflags EXCLUDE_FROM_ALL)
- openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
endif()
-add_subdirectory(gflags EXCLUDE_FROM_ALL)
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
-
#
# Google Tests framework
#
@@ -89,13 +83,13 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
@@ -119,13 +116,13 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
set(Protobuf_DEBUG ON)
endif()
find_package(Protobuf 3.18.2 REQUIRED)
@ -160,7 +158,7 @@ index 2d61c5fd7a..97b372998a 100644
endforeach()
else()
add_subdirectory(protobuf EXCLUDE_FROM_ALL)
@@ -104,8 +98,8 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
@@ -134,8 +131,8 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
# forward variables used in the other places
set(SYSTEM_PROTOC ${SYSTEM_PROTOC} PARENT_SCOPE)
set(PROTOC_EXECUTABLE ${PROTOC_EXECUTABLE} PARENT_SCOPE)
@ -171,7 +169,7 @@ index 2d61c5fd7a..97b372998a 100644
set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIRS} PARENT_SCOPE)
set(Protobuf_IN_FRONTEND ON PARENT_SCOPE)
@@ -116,7 +110,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
@@ -146,7 +143,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
set(link_type INTERFACE)
endif()
if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
@ -181,18 +179,18 @@ index 2d61c5fd7a..97b372998a 100644
endforeach()
endif()
diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt
index 041031e923..793de9845c 100644
index 556adb03c4..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$")
PRIVATE -Wno-all)
endif()
-target_link_libraries(${TARGET_NAME} PUBLIC zlib)
-target_link_libraries(${TARGET_NAME} PUBLIC zlib::zlib)
+target_link_libraries(${TARGET_NAME} PUBLIC z)
target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty)
--
2.36.1
2.37.3

80
dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch → dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch
View File

@ -1,7 +1,7 @@
From 5b6c285b5398fd29cc541ccf92e13440537bb5e8 Mon Sep 17 00:00:00 2001
From 3d55027cd86db299faeed0a4a97ddcec1baedd61 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
Subject: [PATCH 2/2] Fix installation of binaries and libraries
Make sure binaries are installed correctly.
@ -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 beb0214284..c9ffa7fcae 100644
index f570d4246c..d20ac60749 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,7 +106,7 @@ include(cmake/extra_modules.cmake)
@@ -111,7 +111,7 @@ include(cmake/extra_modules.cmake)
add_subdirectory(docs)
add_subdirectory(tools)
add_subdirectory(scripts)
@ -44,7 +44,7 @@ index beb0214284..c9ffa7fcae 100644
#
# CPack
diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
index 39b23fe655..aa638c0778 100644
index 0779ed286d..f80cb9bb79 100644
--- a/cmake/developer_package/frontends/frontends.cmake
+++ b/cmake/developer_package/frontends/frontends.cmake
@@ -2,7 +2,7 @@
@ -57,7 +57,7 @@ index 39b23fe655..aa638c0778 100644
set(FRONTEND_NAME_SUFFIX "_frontend")
diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
index cc287ff1f3..2daee6611e 100644
index 458ddade93..626eb6548a 100644
--- a/cmake/developer_package/packaging.cmake
+++ b/cmake/developer_package/packaging.cmake
@@ -20,8 +20,8 @@ function(ie_cpack_set_library_dir)
@ -72,10 +72,10 @@ index cc287ff1f3..2daee6611e 100644
endif()
endfunction()
diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
index a630d6c354..779c43631a 100644
index b748ebddef..fe670e88bc 100644
--- a/cmake/developer_package/plugins/plugins.cmake
+++ b/cmake/developer_package/plugins/plugins.cmake
@@ -138,7 +138,7 @@ function(ie_add_plugin)
@@ -139,7 +139,7 @@ function(ie_add_plugin)
if(BUILD_SHARED_LIBS)
install(TARGETS ${IE_PLUGIN_NAME}
@ -124,12 +124,12 @@ index 2755579a0f..4a5f5b424f 100644
+
+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
index 9a73582a73..70c4147f3f 100644
index 3628c8283a..186540940f 100644
--- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt
@@ -222,6 +222,8 @@ macro(ie_add_sample)
EXCLUDE_FROM_ALL
)
@@ -258,6 +258,8 @@ macro(ie_add_sample)
COMPONENT samples_bin
EXCLUDE_FROM_ALL)
+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
+
@ -137,10 +137,10 @@ index 9a73582a73..70c4147f3f 100644
if(NOT TARGET ie_samples)
add_custom_target(ie_samples ALL)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 9ad26ba952..0853e23706 100644
index 4e9f76638f..6d8df5f0a1 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -28,7 +28,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
@@ -37,7 +37,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
# install setupvars
@ -149,7 +149,7 @@ index 9ad26ba952..0853e23706 100644
if(UNIX)
set(_setupvars_file setupvars/setupvars.sh)
@@ -43,13 +43,13 @@ elseif(WIN32)
@@ -54,13 +54,13 @@ elseif(WIN32)
file(WRITE "${_setupvars_file}" "${_setupvars_content}")
endif()
endif()
@ -183,10 +183,10 @@ index 9200d0bda1..b3636e0716 100644
+ DESTINATION include/ie
COMPONENT core_c_dev)
diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake
index ddd016d14e..76db0f9927 100644
index 340896e3a8..9bda84fe51 100644
--- a/src/cmake/openvino.cmake
+++ b/src/cmake/openvino.cmake
@@ -59,8 +59,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
@@ -62,8 +62,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
@ -195,9 +195,9 @@ index ddd016d14e..76db0f9927 100644
+ INCLUDES DESTINATION include
+ include/ie)
# --------------- OpenVINO runtime library dev ------------------------------
add_library(${TARGET_NAME}_dev INTERFACE)
@@ -95,7 +95,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components})
#
# Add openvin::dev target
@@ -107,7 +107,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 ddd016d14e..76db0f9927 100644
COMPONENT core)
# for InferenceEngineUnitTest
@@ -114,7 +114,7 @@ endif()
@@ -126,7 +126,7 @@ endif()
install(EXPORT OpenVINOTargets
FILE OpenVINOTargets.cmake
NAMESPACE openvino::
@ -214,19 +214,19 @@ index ddd016d14e..76db0f9927 100644
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
COMPONENT core_dev)
# Build tree
@@ -160,10 +160,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm
set(PUBLIC_HEADERS_DIR "${OpenVINO_SOURCE_DIR}/src/inference/include")
@@ -167,10 +167,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"
- DESTINATION runtime/cmake
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
COMPONENT core_dev)
install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake"
"${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake"
- DESTINATION runtime/cmake
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
COMPONENT core_dev)
diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt
index e41e286c95..11aaffca6a 100644
@ -242,10 +242,10 @@ index e41e286c95..11aaffca6a 100644
ov_install_static_lib(${TARGET_NAME} core)
endif()
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index cc64b94ca3..5f0dcf20cf 100644
index 86b195ee1c..867121ee50 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_
@@ -127,7 +127,7 @@ target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_
#-----------------------------------------------------------------------------------------------
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
@ -254,7 +254,7 @@ index cc64b94ca3..5f0dcf20cf 100644
COMPONENT core_dev
FILES_MATCHING
PATTERN "*.hpp"
@@ -130,5 +130,5 @@ write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
@@ -143,5 +143,5 @@ write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
install(FILES ${CMAKE_BINARY_DIR}/ngraphConfig.cmake
${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
@ -262,7 +262,7 @@ index cc64b94ca3..5f0dcf20cf 100644
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
COMPONENT core_dev)
diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt
index 767fbc1b81..f279a2ef7d 100644
index 737e7e0027..259d5e141d 100644
--- a/src/inference/CMakeLists.txt
+++ b/src/inference/CMakeLists.txt
@@ -209,7 +209,7 @@ set_target_properties(${TARGET_NAME}_obj
@ -288,7 +288,7 @@ index 3993bd9731..99287bad51 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 5bba4235ff..69c1470a71 100644
index 480acc05d1..5849f55878 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,19 +301,19 @@ index 5bba4235ff..69c1470a71 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 12a2f15e4a..893146294c 100644
index d8ebea0bfc..66b5a3d462 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
# install
if (LINUX)
install(FILES ${OpenVINO_SOURCE_DIR}/src/plugins/intel_myriad/third_party/mvnc/src/97-myriad-usbboot.rules
- DESTINATION runtime/3rdparty
+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
COMPONENT myriad)
if(LINUX)
install(FILES ${mvnc_SOURCE_DIR}/src/97-myriad-usbboot.rules
- DESTINATION install_dependencies
+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
COMPONENT myriad)
endif()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index c8638f7fd3..ba30641c5a 100644
index 2fe0fd9742..234110b7d4 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -20,7 +20,7 @@ endif()
@ -344,5 +344,5 @@ index d19eb5cc14..9fc929cbb0 100644
+# DESTINATION tools/compile_tool
+# COMPONENT core_tools)
--
2.36.1
2.37.3

40
dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Fix-build-issues-due-to-gflag-and-zlib.patch Normal file
View File

@ -0,0 +1,40 @@
From a817386f1d0539a040fbdc02853a73bbcdddf1f1 Mon Sep 17 00:00:00 2001
From: Yogesh Tyagi <yogesh.tyagi@intel.com>
Date: Fri, 30 Sep 2022 20:26:04 +0800
Subject: [PATCH] Fix build issues due to gflag and zlib
Change gflag to shared as we are not building with static library.
We are using zlib from host, so don't add zlib as third party package
Upstream-Status: Inappropriate
Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
---
thirdparty/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 4cba1588fe..f82bf3148b 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -39,7 +39,7 @@ if(NOT CMAKE_CROSSCOMPILING)
endif()
if(NOT zlib_FOUND)
- add_subdirectory(zlib EXCLUDE_FROM_ALL)
+ #add_subdirectory(zlib EXCLUDE_FROM_ALL)
endif()
#
@@ -85,7 +85,7 @@ ov_install_static_lib(fluid openvino_common)
if(NOT APPLE)
# on Apple only dynamic libraries are available
- find_package(gflags QUIET COMPONENTS nothreads_static)
+ find_package(gflags QUIET COMPONENTS nothreads_shared)
endif()
if(gflags_FOUND)
--
2.37.3

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

@ -4,44 +4,42 @@ 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.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 \
git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;branch=master \
SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/2;lfs=0 \
https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_20220307_34.zip;name=usb_ma2x8x \
https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_20220307_34.zip;name=pcie_ma2x8x \
git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \
git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \
git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/src/bindings/python/thirdparty/pybind11;name=pybind11;branch=master \
git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.18.x \
git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=master \
git://github.com/pboettch/json-schema-validator.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json_schema_validator;name=jsonschema;branch=main \
git://github.com/openvinotoolkit/open_model_zoo.git;protocol=https;destsuffix=git/thirdparty/open_model_zoo;name=omz;branch=releases/2022/1 \
file://0001-inference-engine-use-system-installed-packages.patch \
file://0002-inference-engine-installation-fixes.patch \
git://github.com/openvinotoolkit/open_model_zoo.git;protocol=https;destsuffix=git/thirdparty/open_model_zoo;name=omz;branch=releases/2022/2 \
file://0001-Use-system-installed-dependencies.patch \
file://0002-Fix-installation-of-binaries-and-libraries.patch \
file://0003-Fix-build-issues-due-to-gflag-and-zlib.patch \
file://cython-cmake.patch \
"
SRCREV = "39aba80957e10b66a6c8f3f590c2d90e8238ca75"
SRCREV_mkl = "82ca2f931c1d588b67d154d873136d4af1ffb3a8"
SRCREV_onednn = "9e2bf22e51726ad36ddae90c7caf2898d124baa6"
SRCREV = "af16ea1d79a494503a54cff67a2856094e447931"
SRCREV_mkl = "2a749c577f8a841a396d4bd46eaf311b7e7dc089"
SRCREV_onednn = "efbf9b5e8c12666314f3484ce279cee0a1a91a44"
SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9"
SRCREV_pybind11 = "d71ba0cb73616c493d35699a8a9283aa64ef0f6b"
SRCREV_protobuf = "6c6b0778b70f35f93c2f0dee30e5d12ad2a83eea"
SRCREV_json = "fec56a1a16c6e1c1b1f4e116a20e79398282626c"
SRCREV_jsonschema = "b1ef8628326cf0b53612f12784fd245e5e4382f1"
SRCREV_omz = "0c94071faef095f544a228f8455718fbd653950e"
SRCREV_omz = "1919ae9d42c19d8f3bafc2417256ab3a67b6db79"
SRC_URI[usb_ma2x8x.sha256sum] = "e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf"
SRC_URI[pcie_ma2x8x.sha256sum] = "b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5"
SRC_URI[usb_ma2x8x.sha256sum] = "877c4e1616d14a94dd2764f4f32f1c1aa2180dcd64ad1823b31efdc3f56ad593"
SRC_URI[pcie_ma2x8x.sha256sum] = "aabff3d817431792ef9e17056448979c2cdbb484ad4b0af9e68cb874ee10eef5"
LICENSE = "Apache-2.0 & MIT & BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \
file://thirdparty/protobuf/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=441793d25a658d58d79a1f87516a6ad1 \
file://thirdparty/json/nlohmann_json_schema_validator/LICENSE;md5=c441d022da1b1663c70181a32225d006 \
file://thirdparty/open_model_zoo/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
file://src/plugins/intel_cpu/thirdparty/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
file://src/bindings/python/thirdparty/pybind11/LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f \
"