From 46be0fa9182cd188438168994533243a1209a03d Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Fri, 21 Oct 2022 17:03:55 +0800 Subject: open-model-zoo: upgrade 2022.1.1 -> 2022.2.0 Refreshed patch. Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- .../opencv/open-model-zoo/0001-use-oe-gflags.patch | 16 ++++--- .../opencv/open-model-zoo_2022.1.1.bb | 54 ---------------------- .../opencv/open-model-zoo_2022.2.0.bb | 54 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 61 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.1.bb create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.2.0.bb diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch index 3db0a31e..2b608050 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch @@ -1,27 +1,29 @@ -From e071d6a6323f04dc7e6e40047199e509536d7f6e Mon Sep 17 00:00:00 2001 +From fe3e1d923399da1d71458f5c468563b61784380c Mon Sep 17 00:00:00 2001 From: Naveen Saini -Date: Mon, 30 Aug 2021 17:54:17 +0800 +Date: Fri, 21 Oct 2022 11:38:23 +0800 Subject: [PATCH] demos: use gflags from meta-oe Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal Signed-off-by: Naveen Saini - --- demos/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt -index 98de0db6c..077d43fb4 100644 +index 1484a50d5..996934310 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -140,7 +140,7 @@ endmacro() - find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs gapi) + find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs) find_package(OpenVINO REQUIRED COMPONENTS Runtime) -add_subdirectory(thirdparty/gflags) +#add_subdirectory(thirdparty/gflags) add_subdirectory(common/cpp) - add_subdirectory(common/cpp_gapi) - add_subdirectory(multi_channel_common/cpp) + # TODO: remove wrapping if after OpenCV3 is dropped + if(OpenCV_VERSION VERSION_GREATER_EQUAL 4.5.3) +-- +2.25.1 + diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.1.bb deleted file mode 100644 index 5934f99d..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.1.bb +++ /dev/null @@ -1,54 +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=https;branch=releases/2022/1 \ - file://0001-use-oe-gflags.patch \ - " - -SRCREV = "0c94071faef095f544a228f8455718fbd653950e" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ -" - -inherit cmake - -S = "${WORKDIR}/git" -OECMAKE_SOURCEPATH = "${S}/demos" - -DEPENDS += "openvino-inference-engine opencv gflags" - -RDEPENDS:${PN} += " \ - python3-decorator \ - python3-defusedxml \ - python3-networkx \ - python3-protobuf \ - python3-requests \ - python3-pyyaml \ - python3-numpy \ - bash \ -" - -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST:libc-musl = "null" - -EXTRA_OECMAKE += " \ - -DENABLE_SAMPLES=ON \ - " - -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 - cp -rf ${WORKDIR}/build/intel64/Release/*.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/demos ${D}${datadir}/openvino/open-model-zoo - cp -rf ${WORKDIR}/git/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools -} - -FILES:${PN} += "${datadir}/openvino" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.2.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.2.0.bb new file mode 100644 index 00000000..fc56ba69 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.2.0.bb @@ -0,0 +1,54 @@ +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=https;branch=releases/2022/2 \ + file://0001-use-oe-gflags.patch \ + " + +SRCREV = "1919ae9d42c19d8f3bafc2417256ab3a67b6db79" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ +" + +inherit cmake + +S = "${WORKDIR}/git" +OECMAKE_SOURCEPATH = "${S}/demos" + +DEPENDS += "openvino-inference-engine opencv gflags" + +RDEPENDS:${PN} += " \ + python3-decorator \ + python3-defusedxml \ + python3-networkx \ + python3-protobuf \ + python3-requests \ + python3-pyyaml \ + python3-numpy \ + bash \ +" + +COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST:libc-musl = "null" + +EXTRA_OECMAKE += " \ + -DENABLE_SAMPLES=ON \ + " + +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 + cp -rf ${WORKDIR}/build/intel64/Release/*.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/demos ${D}${datadir}/openvino/open-model-zoo + cp -rf ${WORKDIR}/git/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools +} + +FILES:${PN} += "${datadir}/openvino" -- cgit v1.2.3-54-g00ecf