From b3b1439c77cdd155b131b5c47045f5c8c3f93b36 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Mon, 19 Oct 2020 23:32:21 +0800 Subject: open-model-zoo: upgrade 2020.4 -> 2021.1 Signed-off-by: Anuj Mittal --- .../opencv/open-model-zoo/0001-use-oe-gflags.patch | 114 +++------------------ .../opencv/open-model-zoo_2020.4.bb | 63 ------------ .../opencv/open-model-zoo_2021.1.bb | 62 +++++++++++ 3 files changed, 78 insertions(+), 161 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb (limited to 'dynamic-layers') 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 a938b942..864c735e 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,20 @@ -From d63d1a1291a2715b7d70ed88c4d764b22e6f2f4d Mon Sep 17 00:00:00 2001 -From: Liwei Song -Date: Fri, 22 May 2020 15:47:44 +0800 -Subject: [PATCH] use meta-oe gflags +From 56078933a8397b7fae146156743408319eac1ae0 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Mon, 19 Oct 2020 23:29:23 +0800 +Subject: [PATCH] demos: use gflags from meta-oe -gflags is available in meta-oe, use this one instead of the thirdparty -one in open-model-zoo +Upstream-Status: Inappropriate -Upstream-Status: Inappropriate [meta-intel specific] - -Signed-off-by: Liwei Song +Signed-off-by: Anuj Mittal --- - CMakeLists.txt | 8 ++++---- - multi_channel/common/CMakeLists.txt | 2 +- - multi_channel/face_detection_demo/CMakeLists.txt | 2 +- - multi_channel/human_pose_estimation_demo/CMakeLists.txt | 2 +- - multi_channel/object_detection_demo_yolov3/CMakeLists.txt | 2 +- - 5 files changed, 8 insertions(+), 8 deletions(-) + demos/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40b549f..dfdbf93 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -89,12 +89,10 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) +diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt +index e5f17231..08d4e4e6 100644 +--- a/demos/CMakeLists.txt ++++ b/demos/CMakeLists.txt +@@ -90,11 +90,11 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) endif() #################################### @@ -31,85 +24,10 @@ index 40b549f..dfdbf93 100644 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") - endif() -@@ -177,7 +175,7 @@ macro(ie_add_sample) - target_include_directories(${IE_SAMPLE_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../common") - - target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${OpenCV_LIBRARIES} ${InferenceEngine_LIBRARIES} -- ${IE_SAMPLE_DEPENDENCIES} gflags) -+ ${IE_SAMPLE_DEPENDENCIES} ${GFLAGS_LIBRARIES}) - - if(UNIX) - target_link_libraries(${IE_SAMPLE_NAME} PRIVATE pthread) -@@ -198,11 +196,13 @@ endmacro() - # use this flag if you need to throw custom message in case if the IE package is not found. - if (IE_NOT_FOUND_MESSAGE) - find_package(InferenceEngine 2.0 QUIET) -+ find_package(gflags 2.2 QUIET) - if (NOT(InferenceEngine_FOUND)) - message(FATAL_ERROR ${IE_NOT_FOUND_MESSAGE}) - endif() - else() - find_package(InferenceEngine 2.0 REQUIRED) -+ find_package(gflags 2.2 REQUIRED) - endif() - - find_package(ngraph REQUIRED) -diff --git a/multi_channel/common/CMakeLists.txt b/multi_channel/common/CMakeLists.txt -index d5e5d93..c33afbb 100644 ---- a/multi_channel/common/CMakeLists.txt -+++ b/multi_channel/common/CMakeLists.txt -@@ -110,7 +110,7 @@ endif() - - target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") - --target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES}) -+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES}) - - if(UNIX) - target_link_libraries( ${TARGET_NAME} pthread) -diff --git a/multi_channel/face_detection_demo/CMakeLists.txt b/multi_channel/face_detection_demo/CMakeLists.txt -index 5b497fc..78c518e 100644 ---- a/multi_channel/face_detection_demo/CMakeLists.txt -+++ b/multi_channel/face_detection_demo/CMakeLists.txt -@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB) - endif() - endif() - --target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common) -+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common) - - if(UNIX) - 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 -index 7fe4823..7e76796 100644 ---- a/multi_channel/human_pose_estimation_demo/CMakeLists.txt -+++ b/multi_channel/human_pose_estimation_demo/CMakeLists.txt -@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB) - endif() - endif() - --target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common) -+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common) - - if(UNIX) - 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 -index e959349..cf1de4a 100644 ---- a/multi_channel/object_detection_demo_yolov3/CMakeLists.txt -+++ b/multi_channel/object_detection_demo_yolov3/CMakeLists.txt -@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB) - endif() - endif() - --target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} ngraph::ngraph common) -+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} ngraph::ngraph common) - - if(UNIX) - target_link_libraries( ${TARGET_NAME} pthread) -- -2.25.4 +2.26.2 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb deleted file mode 100644 index ef0d7e92..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb +++ /dev/null @@ -1,63 +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=git;branch=master \ - file://0001-use-oe-gflags.patch \ - " - -SRCREV = "366130da8fc27dd4d896639cb526a079acc07831" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ -" - -inherit cmake - -S = "${WORKDIR}/git/demos" - -DEPENDS += "openvino-inference-engine opencv gflags" - -RDEPENDS_${PN} += " \ - python3-decorator \ - python3-defusedxml \ - python3-networkx \ - python3-protobuf \ - python3-test-generator \ - python3-requests \ - python3-pyyaml \ -" - -COMPATIBLE_HOST = '(x86_64).*-linux' - -EXTRA_OECMAKE += " \ - -DIE_MAIN_SOURCE_DIR=${B} \ - -DENABLE_SAMPLES=ON \ - -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \ - -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.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_ROOT_DIR=${WORKDIR}/InferenceEngine \ -" - -do_configure_prepend(){ - mkdir -p ${WORKDIR}/InferenceEngine/share - cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/ -} - -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 - 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/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" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb new file mode 100644 index 00000000..82ca4af8 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb @@ -0,0 +1,62 @@ +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=git;branch=master \ + " + +SRCREV = "75ec8ad4b6c4fd7fb161ae9d2c3056281b2443de" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ +" + +inherit cmake + +S = "${WORKDIR}/git/demos" + +DEPENDS += "openvino-inference-engine opencv gflags" + +RDEPENDS_${PN} += " \ + python3-decorator \ + python3-defusedxml \ + python3-networkx \ + python3-protobuf \ + python3-test-generator \ + python3-requests \ + python3-pyyaml \ +" + +COMPATIBLE_HOST = '(x86_64).*-linux' + +EXTRA_OECMAKE += " \ + -DIE_MAIN_SOURCE_DIR=${B} \ + -DENABLE_SAMPLES=ON \ + -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \ + -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.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_ROOT_DIR=${WORKDIR}/InferenceEngine \ +" + +do_configure_prepend(){ + mkdir -p ${WORKDIR}/InferenceEngine/share + cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/ +} + +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 + 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/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" -- cgit v1.2.3-54-g00ecf