From 610cdb495cdc7eda95bfa03824220272ca256e7f Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Mon, 5 Apr 2021 14:25:10 +0800 Subject: openvino-inference-engine: upgrade 2021.2 -> 2021.3 Release notes: https://github.com/openvinotoolkit/openvino/releases/tag/2021.3 Remove a patch that isn't needed anymore and refresh the rest. Remove dependency on onednn as it's using a forked version. Signed-off-by: Anuj Mittal --- .../opencv/openvino-inference-engine_2021.2.bb | 123 --------------------- 1 file changed, 123 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb deleted file mode 100644 index 22194467..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb +++ /dev/null @@ -1,123 +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=git;branch=releases/2021/2;lfs=0 \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1522.zip;name=usb_ma2x8x \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1522.zip;name=pcie_ma2x8x \ - git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ - file://0001-inference-engine-use-system-installed-packages.patch \ - file://0002-cldNN-disable-Werror.patch \ - file://0003-inference-engine-installation-fixes.patch \ - file://0005-cldnn-fix-inclusion-of-headers.patch \ - file://0001-dont-install-licenses-and-version-file.patch \ - " - -SRCREV = "4795391b73381660b69b4cd3986c7a0bf902e868" -SRCREV_mkl = "5ef085d5af65e8966e03cdfcbaa65761d61a5c9a" - -SRC_URI[usb_ma2x8x.sha256sum] = "95a93144f0bbfe6e35d3830e93e6b63e1e109f849a6a7c307cae9030e3a662aa" -SRC_URI[pcie_ma2x8x.sha256sum] = "6d061d21d90f1919ef375138066ba7a20ceb663901d2729d9cb1b639169df5da" - -LICENSE = "Apache-2.0 & ISSL & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ - file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \ - file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ - file://inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/LICENSE.txt;md5=88b295a48d2b3244ba65d3c055472c8a \ -" -LICENSE_${PN}-vpu-firmware = "ISSL" - -inherit cmake python3native - -S = "${WORKDIR}/git" - -EXTRA_OECMAKE += " \ - -DENABLE_OPENCV=0 \ - -DENABLE_PLUGIN_RPATH=0 \ - -DENABLE_GNA=0 \ - -DPYTHON_EXECUTABLE=${PYTHON} \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \ - -DENABLE_SAMPLES=1 \ - -DIE_CPACK_IE_DIR=${prefix} \ - -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ - -DNGRAPH_TEST_UTIL_ENABLE=FALSE \ - -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \ - -DNGRAPH_JSON_ENABLE=FALSE \ - -DTREAT_WARNING_AS_ERROR=FALSE \ - -DENABLE_SPEECH_DEMO=FALSE \ - -DENABLE_DATA=FALSE \ - -DUSE_SYSTEM_PUGIXML=TRUE \ - " - -DEPENDS += "libusb1 \ - ade \ - opencv \ - pugixml \ - protobuf-native \ - tbb \ - onednn \ - " - -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = "null" - -PACKAGECONFIG ?= "vpu opencl" -PACKAGECONFIG[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" -PACKAGECONFIG[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" -PACKAGECONFIG[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" -PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" - -do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then - install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/ - install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.mvcmd ${D}${libdir}/ - fi - - if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then - install -d ${D}${datadir}/inference_engine - mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/ - - install -d ${D}${PYTHON_SITEPACKAGES_DIR} - mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ - mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ - mv ${D}${prefix}/deployment_tools/tools/cross_check_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ - - rm -rf ${D}${prefix}/python - fi - - rm -rf ${D}${prefix}/deployment_tools - - # Remove the samples source directory. We install the built samples. - rm -rf ${D}/usr/samples -} - -# 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}-dev = "${includedir} \ - ${libdir}/cmake \ - " - -FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \ - ${datadir}/openvino \ - ${libdir}/custom_kernels \ - ${libdir}/plugins.xml \ - ${libdir}/cache.json \ - " - -# Move inference engine samples into a separate package -PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" - -FILES_${PN}-samples = "${datadir}/inference_engine \ - ${bindir} \ - " -FILES_${PN}-vpu-firmware += "${libdir}/*.mvcmd" - -# Package for inference engine python API -PACKAGES =+ "${PN}-${PYTHON_PN}" - -FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" -- cgit v1.2.3-54-g00ecf