Signed-off-by: Anuj Mittal <[email protected]> --- .../open-model-zoo/0001-use-oe-gflags.patch | 22 +++++++++---------- ...zoo_2021.2.bb => open-model-zoo_2021.3.bb} | 15 ++++++++----- 2 files changed, 20 insertions(+), 17 deletions(-) rename dynamic-layers/openembedded-layer/recipes-support/opencv/{open-model-zoo_2021.2.bb => open-model-zoo_2021.3.bb} (83%)
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 864c735e..f38e0669 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,4 +1,4 @@ -From 56078933a8397b7fae146156743408319eac1ae0 Mon Sep 17 00:00:00 2001 +From 6a0046c523a67b4d21d856ea73861c00b5a9c9fd Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Mon, 19 Oct 2020 23:29:23 +0800 Subject: [PATCH] demos: use gflags from meta-oe @@ -11,23 +11,23 @@ Signed-off-by: Anuj Mittal <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt -index e5f17231..08d4e4e6 100644 +index c5e3b1ec3..4e78c72a6 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -90,11 +90,11 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) - endif() +@@ -62,11 +62,11 @@ set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) #################################### --set (GFLAGS_IS_SUBPROJECT TRUE) -+set (GFLAGS_IS_SUBPROJECT FALSE) - set (HAVE_SYS_STAT_H 1) - set (HAVE_INTTYPES_H 1) +-set(GFLAGS_IS_SUBPROJECT TRUE) ++set(GFLAGS_IS_SUBPROJECT FALSE) + set(HAVE_SYS_STAT_H 1) + set(HAVE_INTTYPES_H 1) -add_subdirectory(thirdparty/gflags) +#add_subdirectory(thirdparty/gflags) - if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + if(CMAKE_CXX_COMPILER_ID MATCHES "^GNU|(Apple)?Clang$") + set(COMPILER_IS_GCC_LIKE TRUE) -- -2.26.2 +2.29.0 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.3.bb similarity index 83% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.2.bb rename to dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb index 6784d0d8..700f78c2 100644 --- 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.3.bb @@ -5,18 +5,19 @@ 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 \ + file://0001-use-oe-gflags.patch \ " -SRCREV = "338630987b403a6981d03ab6d04c2d5ad367793a" +SRCREV = "9ca5dbeff80464bf5728e8be25daedfe9a9208d7" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ " inherit cmake -S = "${WORKDIR}/git/demos" +S = "${WORKDIR}/git" +OECMAKE_SOURCEPATH = "${S}/demos" DEPENDS += "openvino-inference-engine opencv gflags" @@ -28,6 +29,8 @@ RDEPENDS_${PN} += " \ python3-test-generator \ python3-requests \ python3-pyyaml \ + python3-numpy \ + bash \ " COMPATIBLE_HOST = '(x86_64).*-linux' @@ -52,12 +55,12 @@ 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 + install -d ${D}${datadir}/openvino/open-model-zoo/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/demos ${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" -- 2.29.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7007): https://lists.yoctoproject.org/g/meta-intel/message/7007 Mute This Topic: https://lists.yoctoproject.org/mt/82229691/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
