summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2021-09-01 01:18:02 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2021-09-01 02:16:19 (GMT)
commitbfc685697de7eb1e88ebdcaa3dc196af3daa91b4 (patch)
tree081f0ecc7b5b61d2f15ca6b53b6a8b9f27aa0a2d
parenta9c7df9131617dab607768f6b5f9ecc01439660f (diff)
downloadmeta-intel-bfc685697de7eb1e88ebdcaa3dc196af3daa91b4.tar.gz
open-model-zoo: upgrade 2021.3 -> 2021.4
https://github.com/openvinotoolkit/open_model_zoo/releases/tag/2021.4 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch30
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb)2
2 files changed, 14 insertions, 18 deletions
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 f38e066..6d0c6cb 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,33 +1,29 @@
1From 6a0046c523a67b4d21d856ea73861c00b5a9c9fd Mon Sep 17 00:00:00 2001 1From 247a5383e7ae444fd99022a19fe90a59dbedbc98 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Naveen Saini <naveen.kumar.saini@intel.com>
3Date: Mon, 19 Oct 2020 23:29:23 +0800 3Date: Mon, 30 Aug 2021 17:54:17 +0800
4Subject: [PATCH] demos: use gflags from meta-oe 4Subject: [PATCH] demos: use gflags from meta-oe
5 5
6Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
7 7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
9--- 10---
10 demos/CMakeLists.txt | 4 ++-- 11 demos/CMakeLists.txt | 2 +-
11 1 file changed, 2 insertions(+), 2 deletions(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
12 13
13diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt 14diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
14index c5e3b1ec3..4e78c72a6 100644 15index 1df8f248d..d368d608c 100644
15--- a/demos/CMakeLists.txt 16--- a/demos/CMakeLists.txt
16+++ b/demos/CMakeLists.txt 17+++ b/demos/CMakeLists.txt
17@@ -62,11 +62,11 @@ set(CMAKE_CXX_STANDARD 11) 18@@ -131,7 +131,7 @@ find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs g
18 set(CMAKE_CXX_STANDARD_REQUIRED ON) 19 find_package(InferenceEngine REQUIRED)
19 #################################### 20 find_package(ngraph REQUIRED)
20
21-set(GFLAGS_IS_SUBPROJECT TRUE)
22+set(GFLAGS_IS_SUBPROJECT FALSE)
23 set(HAVE_SYS_STAT_H 1)
24 set(HAVE_INTTYPES_H 1)
25 21
26-add_subdirectory(thirdparty/gflags) 22-add_subdirectory(thirdparty/gflags)
27+#add_subdirectory(thirdparty/gflags) 23+#add_subdirectory(thirdparty/gflags)
24 add_subdirectory(common/cpp)
25 add_subdirectory(multi_channel_common/cpp)
28 26
29 if(CMAKE_CXX_COMPILER_ID MATCHES "^GNU|(Apple)?Clang$")
30 set(COMPILER_IS_GCC_LIKE TRUE)
31-- 27--
322.29.0 282.17.1
33 29
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.bb
index 1461afe..b68e064 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master
8 file://0001-use-oe-gflags.patch \ 8 file://0001-use-oe-gflags.patch \
9 " 9 "
10 10
11SRCREV = "9ca5dbeff80464bf5728e8be25daedfe9a9208d7" 11SRCREV = "e37a163a2385d9ddaa8e3da1ccb50c80d4fa0802"
12 12
13LICENSE = "Apache-2.0" 13LICENSE = "Apache-2.0"
14LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ 14LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \