From d4b48224eff9f287fd06871b1a4a3b0780cfcc99 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 4 Feb 2021 12:25:06 +0800 Subject: open-model-zoo: upgrade 2021.1 -> 2021.2 Drop a patch that has been merged and include another that was accidently left off during the last upgrade. Signed-off-by: Anuj Mittal --- .../open-model-zoo/0001-switch-to-python3.patch | 38 ------------- .../opencv/open-model-zoo_2021.1.bb | 63 ---------------------- .../opencv/open-model-zoo_2021.2.bb | 63 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 101 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.2.bb diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch deleted file mode 100644 index 8bfb9ac9..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4dd5d9c7042b421c929bece05ee162b8827dc568 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 2 Nov 2020 11:44:33 +0800 -Subject: [PATCH] switch to python3 - -Upstream-Status: Submitted -[https://github.com/openvinotoolkit/open_model_zoo/pull/1701/commits/0261e21e63b84cc4e91b220f4a84ec52b5678e2c; -https://github.com/gflags/gflags/pull/318#issuecomment-719466350] - -Signed-off-by: Changqing Li ---- - .../speech_recognition_demo/speech_recognition_demo.py | 2 +- - thirdparty/gflags/test/gflags_build.py.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python_demos/speech_recognition_demo/speech_recognition_demo.py b/python_demos/speech_recognition_demo/speech_recognition_demo.py -index 6e8ff534..d28ccddc 100755 ---- a/python_demos/speech_recognition_demo/speech_recognition_demo.py -+++ b/python_demos/speech_recognition_demo/speech_recognition_demo.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright (C) 2019-2020 Intel Corporation - # SPDX-License-Identifier: Apache-2.0 -diff --git a/thirdparty/gflags/test/gflags_build.py.in b/thirdparty/gflags/test/gflags_build.py.in -index a8cba2bf..559163ef 100644 ---- a/thirdparty/gflags/test/gflags_build.py.in -+++ b/thirdparty/gflags/test/gflags_build.py.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import os - import sys --- -2.17.1 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb deleted file mode 100644 index c5efbfc8..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository" -HOMEPAGE = "https://github.com/opencv/open_model_zoo" -DESCRIPTION = "This repository includes optimized deep learning \ -models and a set of demos to expedite development of high-performance \ -deep learning inference applications." - -SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master \ - file://0001-switch-to-python3.patch \ - " - -SRCREV = "75ec8ad4b6c4fd7fb161ae9d2c3056281b2443de" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ -" - -inherit cmake - -S = "${WORKDIR}/git/demos" - -DEPENDS += "openvino-inference-engine opencv gflags" - -RDEPENDS_${PN} += " \ - python3-decorator \ - python3-defusedxml \ - python3-networkx \ - python3-protobuf \ - python3-test-generator \ - python3-requests \ - python3-pyyaml \ -" - -COMPATIBLE_HOST = '(x86_64).*-linux' - -EXTRA_OECMAKE += " \ - -DIE_MAIN_SOURCE_DIR=${B} \ - -DENABLE_SAMPLES=ON \ - -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \ - -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \ - -DIE_C_API_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_c_api.so \ - -DIE_LEGACY_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_legacy.so \ - -DIE_NN_BUILDER_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_nn_builder.so \ - -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \ -" - -do_configure_prepend(){ - mkdir -p ${WORKDIR}/InferenceEngine/share - cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/ -} - -do_install(){ - install -d ${D}${libdir} - install -d ${D}${bindir} - install -d ${D}${datadir}/openvino/open-model-zoo/tools - install -d ${D}${datadir}/openvino/open-model-zoo/demos/python_demos - cp -rf ${WORKDIR}/build/intel64/Release/lib/*.a ${D}${libdir} - cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir} - cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo - cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools - cp -rf ${WORKDIR}/git/demos/python_demos ${D}${datadir}/openvino/open-model-zoo/demos -} - -FILES_${PN} += "${datadir}/openvino" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.2.bb new file mode 100644 index 00000000..6784d0d8 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.2.bb @@ -0,0 +1,63 @@ +SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository" +HOMEPAGE = "https://github.com/opencv/open_model_zoo" +DESCRIPTION = "This repository includes optimized deep learning \ +models and a set of demos to expedite development of high-performance \ +deep learning inference applications." + +SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master \ + file://0001-use-oe-gflags.patch;striplevel=2 \ + " + +SRCREV = "338630987b403a6981d03ab6d04c2d5ad367793a" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ +" + +inherit cmake + +S = "${WORKDIR}/git/demos" + +DEPENDS += "openvino-inference-engine opencv gflags" + +RDEPENDS_${PN} += " \ + python3-decorator \ + python3-defusedxml \ + python3-networkx \ + python3-protobuf \ + python3-test-generator \ + python3-requests \ + python3-pyyaml \ +" + +COMPATIBLE_HOST = '(x86_64).*-linux' + +EXTRA_OECMAKE += " \ + -DIE_MAIN_SOURCE_DIR=${B} \ + -DENABLE_SAMPLES=ON \ + -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \ + -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \ + -DIE_C_API_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_c_api.so \ + -DIE_LEGACY_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_legacy.so \ + -DIE_NN_BUILDER_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_nn_builder.so \ + -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \ +" + +do_configure_prepend(){ + mkdir -p ${WORKDIR}/InferenceEngine/share + cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/ +} + +do_install(){ + install -d ${D}${libdir} + install -d ${D}${bindir} + install -d ${D}${datadir}/openvino/open-model-zoo/tools + install -d ${D}${datadir}/openvino/open-model-zoo/demos/python_demos + cp -rf ${WORKDIR}/build/intel64/Release/lib/*.a ${D}${libdir} + cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir} + cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo + cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools + cp -rf ${WORKDIR}/git/demos/python_demos ${D}${datadir}/openvino/open-model-zoo/demos +} + +FILES_${PN} += "${datadir}/openvino" -- cgit v1.2.3-54-g00ecf