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 2020.1 -> 2020.3

Browse Source 
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2020-06-23 17:02:24 +08:00
parent 9ddf617311
commit 6da14e539d
2 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 6fef79d47c2b92b3e194c412849d44ef632f9905 Mon Sep 17 00:00:00 2001 From d63d1a1291a2715b7d70ed88c4d764b22e6f2f4d Mon Sep 17 00:00:00 2001
From: Liwei Song <liwei.song@windriver.com> From: Liwei Song <liwei.song@windriver.com>
Date: Fri, 22 May 2020 15:47:44 +0800 Date: Fri, 22 May 2020 15:47:44 +0800
Subject: [PATCH] use meta-oe gflags Subject: [PATCH] use meta-oe gflags
@ -13,12 +13,12 @@ Signed-off-by: Liwei Song <liwei.song@windriver.com>
CMakeLists.txt | 8 ++++---- CMakeLists.txt | 8 ++++----
multi_channel/common/CMakeLists.txt | 2 +- multi_channel/common/CMakeLists.txt | 2 +-
multi_channel/face_detection_demo/CMakeLists.txt | 2 +- multi_channel/face_detection_demo/CMakeLists.txt | 2 +-
human_pose_estimation_demo/CMakeLists.txt | 2 +- multi_channel/human_pose_estimation_demo/CMakeLists.txt | 2 +-
object_detection_demo_yolov3/CMakeLists.txt | 2 +- multi_channel/object_detection_demo_yolov3/CMakeLists.txt | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-) 5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index b22b2734656f..ed89411f1dfa 100644 index 40b549f..dfdbf93 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -89,12 +89,10 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) @@ -89,12 +89,10 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
@ -35,8 +35,8 @@ index b22b2734656f..ed89411f1dfa 100644
if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
endif() endif()
@@ -185,7 +183,7 @@ macro(ie_add_sample) @@ -177,7 +175,7 @@ macro(ie_add_sample)
endif() target_include_directories(${IE_SAMPLE_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../common")
target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${OpenCV_LIBRARIES} ${InferenceEngine_LIBRARIES} target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${OpenCV_LIBRARIES} ${InferenceEngine_LIBRARIES}
- ${IE_SAMPLE_DEPENDENCIES} gflags) - ${IE_SAMPLE_DEPENDENCIES} gflags)
@ -44,7 +44,7 @@ index b22b2734656f..ed89411f1dfa 100644
if(UNIX) if(UNIX)
target_link_libraries(${IE_SAMPLE_NAME} PRIVATE pthread) target_link_libraries(${IE_SAMPLE_NAME} PRIVATE pthread)
@@ -206,11 +204,13 @@ endmacro() @@ -198,11 +196,13 @@ endmacro()
# use this flag if you need to throw custom message in case if the IE package is not found. # use this flag if you need to throw custom message in case if the IE package is not found.
if (IE_NOT_FOUND_MESSAGE) if (IE_NOT_FOUND_MESSAGE)
find_package(InferenceEngine 2.0 QUIET) find_package(InferenceEngine 2.0 QUIET)
@ -57,59 +57,59 @@ index b22b2734656f..ed89411f1dfa 100644
+ find_package(gflags 2.2 REQUIRED) + find_package(gflags 2.2 REQUIRED)
endif() endif()
# collect all samples subdirectories find_package(ngraph REQUIRED)
diff --git a/multi_channel/common/CMakeLists.txt b/multi_channel/common/CMakeLists.txt diff --git a/multi_channel/common/CMakeLists.txt b/multi_channel/common/CMakeLists.txt
index 740f3e1ec46e..573d12606d33 100644 index d5e5d93..c33afbb 100644
--- a/multi_channel/common/CMakeLists.txt --- a/multi_channel/common/CMakeLists.txt
+++ b/multi_channel/common/CMakeLists.txt +++ b/multi_channel/common/CMakeLists.txt
@@ -113,7 +113,7 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") @@ -110,7 +110,7 @@ endif()
if(TARGET IE::ie_cpu_extension)
add_definitions(-DWITH_EXTENSIONS) target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
endif()
-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES}) -target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES})
+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES}) +target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES})
if(TARGET IE::ie_cpu_extension)
target_link_libraries(${TARGET_NAME} IE::ie_cpu_extension) if(UNIX)
endif() target_link_libraries( ${TARGET_NAME} pthread)
diff --git a/multi_channel/face_detection_demo/CMakeLists.txt b/multi_channel/face_detection_demo/CMakeLists.txt diff --git a/multi_channel/face_detection_demo/CMakeLists.txt b/multi_channel/face_detection_demo/CMakeLists.txt
index 41730f1d73d4..3b2eb100ccf8 100644 index 5b497fc..78c518e 100644
--- a/multi_channel/face_detection_demo/CMakeLists.txt --- a/multi_channel/face_detection_demo/CMakeLists.txt
+++ b/multi_channel/face_detection_demo/CMakeLists.txt +++ b/multi_channel/face_detection_demo/CMakeLists.txt
@@ -64,7 +64,7 @@ if(TARGET IE::ie_cpu_extension) @@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
add_definitions(-DWITH_EXTENSIONS) endif()
endif() endif()
-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common) -target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common)
+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common) +target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common)
if(TARGET IE::ie_cpu_extension) if(UNIX)
target_link_libraries(${TARGET_NAME} IE::ie_cpu_extension) target_link_libraries( ${TARGET_NAME} pthread)
diff --git a/multi_channel/human_pose_estimation_demo/CMakeLists.txt b/multi_channel/human_pose_estimation_demo/CMakeLists.txt diff --git a/multi_channel/human_pose_estimation_demo/CMakeLists.txt b/multi_channel/human_pose_estimation_demo/CMakeLists.txt
index f4c05cf5b0e8..2602f59c314f 100644 index 7fe4823..7e76796 100644
--- a/multi_channel/human_pose_estimation_demo/CMakeLists.txt --- a/multi_channel/human_pose_estimation_demo/CMakeLists.txt
+++ b/multi_channel/human_pose_estimation_demo/CMakeLists.txt +++ b/multi_channel/human_pose_estimation_demo/CMakeLists.txt
@@ -63,7 +63,7 @@ endif() @@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
if(TARGET IE::ie_cpu_extension)
add_definitions(-DWITH_EXTENSIONS)
endif() endif()
endif()
-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common) -target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common)
+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common) +target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common)
if(TARGET IE::ie_cpu_extension)
target_link_libraries(${TARGET_NAME} IE::ie_cpu_extension) if(UNIX)
endif() target_link_libraries( ${TARGET_NAME} pthread)
diff --git a/multi_channel/object_detection_demo_yolov3/CMakeLists.txt b/multi_channel/object_detection_demo_yolov3/CMakeLists.txt diff --git a/multi_channel/object_detection_demo_yolov3/CMakeLists.txt b/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
index 2f2b3bc540f8..ac10776e2b4e 100644 index e959349..cf1de4a 100644
--- a/multi_channel/object_detection_demo_yolov3/CMakeLists.txt --- a/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
+++ b/multi_channel/object_detection_demo_yolov3/CMakeLists.txt +++ b/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
@@ -64,7 +64,7 @@ if(TARGET IE::ie_cpu_extension) @@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
add_definitions(-DWITH_EXTENSIONS) endif()
endif() endif()
-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common) -target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} ngraph::ngraph common)
+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common) +target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} ngraph::ngraph common)
if(TARGET IE::ie_cpu_extension) if(UNIX)
target_link_libraries(${TARGET_NAME} IE::ie_cpu_extension) target_link_libraries( ${TARGET_NAME} pthread)
-- --
2.17.1 2.25.4

5
dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020r1.bb → dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.3.bb
View File

@ -8,7 +8,7 @@ SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master
file://0001-use-oe-gflags.patch \ file://0001-use-oe-gflags.patch \
" "
SRCREV = "efd238d02035f8a5417b7b1e25cd4c997d44351f" SRCREV = "912eeaddc034e31dedd34617d82bcc2ddf83e542"
LICENSE = "Apache-2.0" LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
@ -18,7 +18,7 @@ inherit cmake
S = "${WORKDIR}/git/demos" S = "${WORKDIR}/git/demos"
DEPENDS += "dldt-inference-engine opencv gflags" DEPENDS += "openvino-inference-engine opencv gflags"
RDEPENDS_${PN} += " \ RDEPENDS_${PN} += " \
python3-decorator \ python3-decorator \
@ -38,6 +38,7 @@ EXTRA_OECMAKE += " \
-DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \ -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \
-DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \ -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \
-DIE_C_API_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_c_api.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_NN_BUILDER_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_nn_builder.so \
-DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \ -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \
" "