MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

open-model-zoo: upgrade 2021.2 -> 2021.3

Browse Source 
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2021-04-20 15:24:18 +08:00
parent 7113b578c6
commit 9766d5c4e2
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
View File

@ -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 <anuj.mittal@intel.com> From: Anuj Mittal <anuj.mittal@intel.com>
Date: Mon, 19 Oct 2020 23:29:23 +0800 Date: Mon, 19 Oct 2020 23:29:23 +0800
Subject: [PATCH] demos: use gflags from meta-oe Subject: [PATCH] demos: use gflags from meta-oe
@ -11,23 +11,23 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index e5f17231..08d4e4e6 100644 index c5e3b1ec3..4e78c72a6 100644
--- a/demos/CMakeLists.txt --- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt
@@ -90,11 +90,11 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) @@ -62,11 +62,11 @@ set(CMAKE_CXX_STANDARD 11)
endif() set(CMAKE_CXX_STANDARD_REQUIRED ON)
#################################### ####################################
-set (GFLAGS_IS_SUBPROJECT TRUE) -set(GFLAGS_IS_SUBPROJECT TRUE)
+set (GFLAGS_IS_SUBPROJECT FALSE) +set(GFLAGS_IS_SUBPROJECT FALSE)
set (HAVE_SYS_STAT_H 1) set(HAVE_SYS_STAT_H 1)
set (HAVE_INTTYPES_H 1) set(HAVE_INTTYPES_H 1)
-add_subdirectory(thirdparty/gflags) -add_subdirectory(thirdparty/gflags)
+#add_subdirectory(thirdparty/gflags) +#add_subdirectory(thirdparty/gflags)
if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) if(CMAKE_CXX_COMPILER_ID MATCHES "^GNU|(Apple)?Clang$")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") set(COMPILER_IS_GCC_LIKE TRUE)
-- --
2.26.2 2.29.0

15
dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.2.bb → dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb
View File

@ -5,18 +5,19 @@ models and a set of demos to expedite development of high-performance \
deep learning inference applications." deep learning inference applications."
SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master \ 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" LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
" "
inherit cmake inherit cmake
S = "${WORKDIR}/git/demos" S = "${WORKDIR}/git"
OECMAKE_SOURCEPATH = "${S}/demos"
DEPENDS += "openvino-inference-engine opencv gflags" DEPENDS += "openvino-inference-engine opencv gflags"
@ -28,6 +29,8 @@ RDEPENDS_${PN} += " \
python3-test-generator \ python3-test-generator \
python3-requests \ python3-requests \
python3-pyyaml \ python3-pyyaml \
python3-numpy \
bash \
" "
COMPATIBLE_HOST = '(x86_64).*-linux' COMPATIBLE_HOST = '(x86_64).*-linux'
@ -52,12 +55,12 @@ do_install(){
install -d ${D}${libdir} install -d ${D}${libdir}
install -d ${D}${bindir} install -d ${D}${bindir}
install -d ${D}${datadir}/openvino/open-model-zoo/tools 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/lib/*.a ${D}${libdir}
cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir} cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir}
cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo 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/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" FILES_${PN} += "${datadir}/openvino"