From c9c5b8b1b04096fcc00d49a0aa5e1f9e2aa53953 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 5 Sep 2023 12:05:57 +0800 Subject: openvino-inference-engine: upgrade 2023.0.1 -> 2023.0.2 Major changes: OpenVINO GNA Plugin: - Fixes the issue when GNA device would not work on Gemini Lake (GLK) platforms - Fixes the problem with memory leak during HLK test OpenVINO CPU Plugin: - Fixes the issues occurred in Multi-Threading 2.0 getting CPU mapping detail on Windows 7 platforms OpenVINO Core: - Fixes the issues occurred when compiling a Pytorch model with unfold op Release notes: https://github.com/openvinotoolkit/openvino/releases/tag/2023.0.2 Signed-off-by: Anuj Mittal --- .../opencv/openvino-inference-engine_2023.0.1.bb | 128 --------------------- .../opencv/openvino-inference-engine_2023.0.2.bb | 128 +++++++++++++++++++++ 2 files changed, 128 insertions(+), 128 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.1.bb create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.2.bb (limited to 'dynamic-layers') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.1.bb deleted file mode 100644 index 175a04ab..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.1.bb +++ /dev/null @@ -1,128 +0,0 @@ -SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" -HOMEPAGE = "https://github.com/opencv/dldt" -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;name=openvino;branch=releases/2023/0;lfs=0 \ - 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/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \ - git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \ - git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \ - file://fix-build.patch \ - file://cython-cmake.patch \ - file://7cecc9138b89e1946e3e515727bb69b2ab119806.patch;patchdir=thirdparty/ade \ - file://fix-build-with-gcc13.patch \ - file://onednn-fix-build-with-gcc13.patch;patchdir=src/plugins/intel_gpu/thirdparty/onednn_gpu \ - file://0001-protobuf-allow-target-protoc-to-be-built.patch \ - " - -SRCREV_openvino = "fa1c41994f3f84329491de93ce572f1401bc75ae" -SRCREV_mkl = "1c7bfabf1b26e6fb95fea1613e1d3d2bef1f6b54" -SRCREV_onednn = "f27dedbfc093f51032a4580198bb80579440dc15" -SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2" -SRCREV_json = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d" -SRCREV_ade = "58b2595a1a95cc807be8bf6222f266a9a1f393a9" -SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e" -SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf" - -LICENSE = "Apache-2.0 & MIT & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ - file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \ - file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \ - file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \ - file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ - file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ -" - -inherit cmake python3native pkgconfig qemu - -S = "${WORKDIR}/git" -EXTRA_OECMAKE += " \ - -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ - -DENABLE_OPENCV=OFF \ - -DENABLE_INTEL_GNA=OFF \ - -DENABLE_SYSTEM_TBB=ON \ - -DPYTHON_EXECUTABLE=${PYTHON} \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \ - -DTREAT_WARNING_AS_ERROR=FALSE \ - -DENABLE_DATA=FALSE \ - -DENABLE_SYSTEM_PUGIXML=TRUE \ - -DENABLE_OV_ONNX_FRONTEND=FALSE \ - -DUSE_BUILD_TYPE_SUBFOLDER=OFF \ - -DENABLE_FUZZING=OFF \ - -DENABLE_TBBBIND_2_5=OFF \ - -DCPACK_GENERATOR=RPM \ - -DENABLE_SYSTEM_FLATBUFFERS=ON \ - -DENABLE_SYSTEM_SNAPPY=ON \ - " - -DEPENDS += "\ - flatbuffers-native \ - gflags \ - pugixml \ - python3-pybind11 \ - qemu-native \ - snappy \ - tbb \ - zlib \ - " - -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST:libc-musl = "null" - -PACKAGECONFIG ?= "opencl samples" -PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp," -PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native patchelf-native, python3 python3-numpy python3-progress python3-cython" -PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv" -PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" - -do_configure:prepend() { - # Dont set PROJECT_ROOT_DIR - sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt - - # qemu wrapper that can be used by cmake to run target binaries. - qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" - cat > ${WORKDIR}/qemuwrapper << EOF -#!/bin/sh -$qemu_binary "\$@" -EOF - chmod +x ${WORKDIR}/qemuwrapper -} - -do_install:append() { - rm -rf ${D}${prefix}/install_dependencies - rm -rf ${D}${prefix}/setupvars.sh - - sed -i -e 's:^#include.*imp.hpp"$:#include "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/git/src/plugins/intel_cpu/src/nodes/proposal_imp.hpp":g;' ${B}/src/plugins/intel_cpu/cross-compiled/proposal_imp_disp.cpp -} - -# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR -# instead of RSS -SSTATE_SCAN_FILES:append = " *.cmake" - -FILES:${PN} += "\ - ${libdir}/openvino-${PV}/lib*${SOLIBSDEV} \ - ${libdir}/openvino-${PV}/plugins.xml \ - ${libdir}/openvino-${PV}/cache.json \ - " - -# Move inference engine samples into a separate package -PACKAGES =+ "${PN}-samples" - -FILES:${PN}-samples = "${datadir}/openvino \ - ${bindir} \ - ${libdir}/libformat_reader.a \ - ${libdir}/libopencv_c_wrapper.a \ - " - -# Package for inference engine python API -PACKAGES =+ "${PN}-${PYTHON_PN}" - -FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+\.\d+\.\d+))$" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.2.bb new file mode 100644 index 00000000..e2119131 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.2.bb @@ -0,0 +1,128 @@ +SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" +HOMEPAGE = "https://github.com/opencv/dldt" +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;name=openvino;branch=releases/2023/0;lfs=0 \ + 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/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \ + git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \ + git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \ + file://fix-build.patch \ + file://cython-cmake.patch \ + file://7cecc9138b89e1946e3e515727bb69b2ab119806.patch;patchdir=thirdparty/ade \ + file://fix-build-with-gcc13.patch \ + file://onednn-fix-build-with-gcc13.patch;patchdir=src/plugins/intel_gpu/thirdparty/onednn_gpu \ + file://0001-protobuf-allow-target-protoc-to-be-built.patch \ + " + +SRCREV_openvino = "e662b1a330126daed2d8de724b9e14690bec8bfd" +SRCREV_mkl = "1c7bfabf1b26e6fb95fea1613e1d3d2bef1f6b54" +SRCREV_onednn = "f27dedbfc093f51032a4580198bb80579440dc15" +SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2" +SRCREV_json = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d" +SRCREV_ade = "58b2595a1a95cc807be8bf6222f266a9a1f393a9" +SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e" +SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf" + +LICENSE = "Apache-2.0 & MIT & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ + file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \ + file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \ + file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \ + file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ + file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ +" + +inherit cmake python3native pkgconfig qemu + +S = "${WORKDIR}/git" +EXTRA_OECMAKE += " \ + -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ + -DENABLE_OPENCV=OFF \ + -DENABLE_INTEL_GNA=OFF \ + -DENABLE_SYSTEM_TBB=ON \ + -DPYTHON_EXECUTABLE=${PYTHON} \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \ + -DTREAT_WARNING_AS_ERROR=FALSE \ + -DENABLE_DATA=FALSE \ + -DENABLE_SYSTEM_PUGIXML=TRUE \ + -DENABLE_OV_ONNX_FRONTEND=FALSE \ + -DUSE_BUILD_TYPE_SUBFOLDER=OFF \ + -DENABLE_FUZZING=OFF \ + -DENABLE_TBBBIND_2_5=OFF \ + -DCPACK_GENERATOR=RPM \ + -DENABLE_SYSTEM_FLATBUFFERS=ON \ + -DENABLE_SYSTEM_SNAPPY=ON \ + " + +DEPENDS += "\ + flatbuffers-native \ + gflags \ + pugixml \ + python3-pybind11 \ + qemu-native \ + snappy \ + tbb \ + zlib \ + " + +COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST:libc-musl = "null" + +PACKAGECONFIG ?= "opencl samples" +PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp," +PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native patchelf-native, python3 python3-numpy python3-progress python3-cython" +PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv" +PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" + +do_configure:prepend() { + # Dont set PROJECT_ROOT_DIR + sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt + + # qemu wrapper that can be used by cmake to run target binaries. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} + +do_install:append() { + rm -rf ${D}${prefix}/install_dependencies + rm -rf ${D}${prefix}/setupvars.sh + + sed -i -e 's:^#include.*imp.hpp"$:#include "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/git/src/plugins/intel_cpu/src/nodes/proposal_imp.hpp":g;' ${B}/src/plugins/intel_cpu/cross-compiled/proposal_imp_disp.cpp +} + +# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR +# instead of RSS +SSTATE_SCAN_FILES:append = " *.cmake" + +FILES:${PN} += "\ + ${libdir}/openvino-${PV}/lib*${SOLIBSDEV} \ + ${libdir}/openvino-${PV}/plugins.xml \ + ${libdir}/openvino-${PV}/cache.json \ + " + +# Move inference engine samples into a separate package +PACKAGES =+ "${PN}-samples" + +FILES:${PN}-samples = "${datadir}/openvino \ + ${bindir} \ + ${libdir}/libformat_reader.a \ + ${libdir}/libopencv_c_wrapper.a \ + " + +# Package for inference engine python API +PACKAGES =+ "${PN}-${PYTHON_PN}" + +FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+\.\d+\.\d+))$" -- cgit v1.2.3-54-g00ecf