armnn: deprecated, remove
PATCH 1/1 armnn: deprecated, remove
From: Denys Dmytriyenko <[email protected]>
Signed-off-by Denys Dmytriyenko <[email protected]>
--- .../packagegroup-arago-tisdk-addons-sdk-target.bb | 6 - .../packagegroup-arago-tisdk-matrix.bb | 9 - .../recipes-core/packagegroups/ti-analytics.bb | 4 - .../matrix/matrix-gui-tidl-demos_2.0.bb | 16 - .../recipes-support/armnn/armnn-caffe_git.bb | 22 - .../recipes-support/armnn/armnn-onnx_git.bb | 22 - .../recipes-support/armnn/armnn-tensorflow_git.bb | 26 - .../armnn/0001-stdlib-issue-work-around.patch | 61 -- .../0002-enable-use-of-boost-shared-library.patch | 31 - ...0003-add-more-test-command-line-arguments.patch | 74 --- .../armnn/0004-generate-versioned-library.patch | 51 -- .../0005-add-armnn-mobilenet-test-example.patch | 68 --- .../armnn/0006-armnn-mobilenet-test-example.patch | 675 --------------------- ...-enable-use-of-arm-compute-shared-library.patch | 31 - ...gop-overflow-warning-resulting-in-compila.patch | 29 - ...and-line-options-for-video-port-selection.patch | 60 -- ...nnexamples-update-for-19.08-modifications.patch | 28 - ...e-versioned-library-for-armnnTfLiteParser.patch | 25 - ...e-Fix-exception-for-help-command-line-opt.patch | 51 -- ...e-setting-capture-resolution-for-the-came.patch | 48 -- .../recipes-support/armnn/armnn_git.bb | 102 ---- 21 files changed, 1439 deletions(-) delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn-caffe_git.bb delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn-onnx_git.bb delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn-tensorflow_git.bb delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0001-stdlib-issue-work-around.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0002-enable-use-of-boost-shared-library.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0003-add-more-test-command-line-arguments.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0004-generate-versioned-library.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0005-add-armnn-mobilenet-test-example.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0006-armnn-mobilenet-test-example.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0007-enable-use-of-arm-compute-shared-library.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0008-Avoid-stringop-overflow-warning-resulting-in-compila.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0009-command-line-options-for-video-port-selection.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0010-armnnexamples-update-for-19.08-modifications.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0011-Generate-versioned-library-for-armnnTfLiteParser.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0012-ArmnnExample-Fix-exception-for-help-command-line-opt.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0013-ArmnnExample-setting-capture-resolution-for-the-came.patch delete mode 100644 meta-arago-extras/recipes-support/armnn/armnn_git.bb
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb +0 -6
@@ -163,35 +163,29 @@ EXTRA_LIBS_append_k2e = " libulm-staticdev \ gdbserver-c6x-dev \ " -ARMNN_PACKAGES = "" VOXEL_PACKAGES = "" -#ARMNN_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'armnn-dev', '', d)}" #VOXEL_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'voxelsdk-dev', '', d)}" EXTRA_PACKAGES = "" EXTRA_PACKAGES_append_ti33x = " ${VOXEL_PACKAGES} \ arm-compute-library-dev \ - ${ARMNN_PACKAGES} \ tensorflow-lite-dev \ tensorflow-lite-staticdev \ pdm-anomaly-detection-dev \ " EXTRA_PACKAGES_append_ti43x = " ${VOXEL_PACKAGES} \ arm-compute-library-dev \ - ${ARMNN_PACKAGES} \ tensorflow-lite-dev \ tensorflow-lite-staticdev \ pdm-anomaly-detection-dev \ " EXTRA_PACKAGES_append_omap-a15 = " ${VOXEL_PACKAGES} \ arm-compute-library-dev \ - ${ARMNN_PACKAGES} \ tensorflow-lite-dev \ tensorflow-lite-staticdev \ pdm-anomaly-detection-dev \ " EXTRA_PACKAGES_append_am65xx = " arm-compute-library-dev \ - ${ARMNN_PACKAGES} \ tensorflow-lite-dev \ tensorflow-lite-staticdev \ pdm-anomaly-detection-dev \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +0 -9
@@ -88,11 +88,6 @@ MATRIX_OPENCV_OPENCL_APPS_omap-a15 = " \ matrix-machinevision-demo-simplepeopletracking \ " -MATRIX_ARMNN_APPS = " \ - matrix-armnn-demo-staticimg \ - matrix-armnn-demo-livecam \ -" - MATRIX_APPS = "" MATRIX_APPS_append_ti33x = " \
@@ -115,7 +110,6 @@ MATRIX_APPS_append_ti33x = " \ \ ${MATRIX_OPENCV_ARM_ONLY_APPS} \ \ - ${MATRIX_ARMNN_APPS} \ matrix-analytics-pdm-anomaly-detection \ "
@@ -139,7 +133,6 @@ MATRIX_APPS_append_ti43x = " \ \ ${MATRIX_OPENCV_ARM_ONLY_APPS} \ \ - ${MATRIX_ARMNN_APPS} \ matrix-analytics-pdm-anomaly-detection \ "
@@ -160,7 +153,6 @@ MATRIX_APPS_append_omap-a15 = " \ matrix-gui-generic-pm \ matrix-gui-clocks \ matrix-gui-pm-demos-governor \ - ${MATRIX_ARMNN_APPS} \ matrix-analytics-pdm-anomaly-detection \ "
@@ -180,7 +172,6 @@ MATRIX_APPS_append_am65xx = " \ \ ${MATRIX_OPENCV_ARM_ONLY_APPS} \ \ - ${MATRIX_ARMNN_APPS} \ matrix-analytics-pdm-anomaly-detection \ "
meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb +0 -4
@@ -5,9 +5,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -ARMNN_PACKAGES = "" -#ARMNN_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'armnn', '', d)}" - TENSORFLOW_DEMO = "" #TENSORFLOW_DEMO = " \ # ${@oe.utils.all_distro_features(d, 'opencv', 'tensorflow-lite-demo', '')} \
@@ -18,7 +15,6 @@ TENSORFLOW_DEMO = "" ANALYTICS = "" #ANALYTICS = " \ -# ${ARMNN_PACKAGES} \ # ${TENSORFLOW_DEMO} \ # ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ # ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
meta-arago-extras/recipes-core/matrix/matrix-gui-tidl-demos_2.0.bb +0 -16
@@ -23,8 +23,6 @@ PACKAGES = "matrix-tidl-demo-staticimg \ matrix-tidl-demo-objdet \ matrix-tidl-demo-objdet-livecam \ matrix-tidl-demo-segment \ - matrix-armnn-demo-staticimg \ - matrix-armnn-demo-livecam \ " RDEPENDS_matrix-tidl-demo-staticimg = " \
@@ -67,14 +65,6 @@ RDEPENDS_matrix-tidl-demo-segment = " \ ${TIDLDEMO_RDEPENDS} \ " -RDEPENDS_matrix-armnn-demo-staticimg = " \ - ${TIDLDEMO_RDEPENDS} \ -" - -RDEPENDS_matrix-armnn-demo-livecam = " \ - ${TIDLDEMO_RDEPENDS} \ -" - FILES_matrix-tidl-demo-staticimg = "${MATRIX_APP_DIR}/tidl_demo_staticimg/*" FILES_matrix-tidl-demo-staticimg += "${bindir}/runTidlStaticImg.sh"
@@ -104,9 +94,3 @@ FILES_matrix-tidl-demo-objdet-livecam += "${bindir}/runTidlObjdet_livecam.sh" FILES_matrix-tidl-demo-segment = "${MATRIX_APP_DIR}/tidl_demo_segment/*" FILES_matrix-tidl-demo-segment += "${bindir}/runTidlSegment.sh" - -FILES_matrix-armnn-demo-staticimg = "${MATRIX_APP_DIR}/armnn_demo_staticimg/*" -FILES_matrix-armnn-demo-staticimg += "${bindir}/runArmnnStaticImg.sh" - -FILES_matrix-armnn-demo-livecam = "${MATRIX_APP_DIR}/armnn_demo_livecam/*" -FILES_matrix-armnn-demo-livecam += "${bindir}/runArmnnLiveCam.sh"
meta-arago-extras/recipes-support/armnn/armnn-caffe_git.bb deleted +0 -22
@@ -1,22 +0,0 @@ -SUMMARY = "Caffe protobuf files - used in ARMNN for Caffe network models" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://caffeImport/LICENSE;md5=91d560803ea3d191c457b12834553991" - -SRC_URI = "git://git.ti.com/tidl/tidl-utils;branch=${BRANCH} \ - " - -SRCREV = "0c52c82a2aed1a27ca2a9b4b11effb426842b6ab" - -PV = "1.0" - -BRANCH = "master" - -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}${datadir}/${BPN}/caffe/proto/ - for file in ${S}/caffeImport/ver361/* - do - install -m 0644 $file ${D}${datadir}/${BPN}/caffe/proto/ - done -}
meta-arago-extras/recipes-support/armnn/armnn-onnx_git.bb deleted +0 -22
@@ -1,22 +0,0 @@ -SUMMARY = "Onnx protobuf files - used in ARMNN for Onnx network models" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://onnxImport/LICENSE;md5=077ce3eaeaea91462d41c566300d2a02" - -SRC_URI = "git://git.ti.com/tidl/tidl-utils;branch=${BRANCH} \ - " - -SRCREV = "0c52c82a2aed1a27ca2a9b4b11effb426842b6ab" - -PV = "1.0" - -BRANCH = "master" - -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}${datadir}/${BPN}/onnx/ - for file in ${S}/onnxImport/ver361/* - do - install -m 0644 $file ${D}${datadir}/${BPN}/onnx/ - done -}
meta-arago-extras/recipes-support/armnn/armnn-tensorflow_git.bb deleted +0 -26
@@ -1,26 +0,0 @@ -SUMMARY = "Tensorflow protobuf files - used in ARMNN for Tensorflow network models" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=01e86893010a1b87e69a213faa753ebd" - -SRC_URI = " \ - git://github.com/tensorflow/tensorflow.git;name=tensorflow; \ - git://github.com/ARM-software/armnn.git;name=armnn;subdir=${WORKDIR}/armnn;destsuffix=armnn \ -" - -PV = "1.10.0" - -SRCREV_tensorflow = "aed8f42bafabf11c5d92ce4109a5e0408b31f9c5" -SRCREV_armnn = "4c7098bfeab1ffe1cdc77f6c15548d3e73274746" -SRCREV_FORMAT = "tensorflow" - -DEPENDS = "protobuf-native" - -S = "${WORKDIR}/git" - -do_install() { - # Install sources + build artifacts as reuired by ARMNN - install -d ${D}${datadir}/${BPN} - - # Convert protobuf sources to C sources and install - ${WORKDIR}/armnn/scripts/generate_tensorflow_protobuf.sh ${D}${datadir}/${BPN} ${STAGING_DIR_NATIVE}${prefix} -}
meta-arago-extras/recipes-support/armnn/armnn/0001-stdlib-issue-work-around.patch deleted +0 -61
61 lines not on this page · raw message
meta-arago-extras/recipes-support/armnn/armnn/0002-enable-use-of-boost-shared-library.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From b46177bb1a59df0130aba88555ec4f81024669a8 Mon Sep 17 00:00:00 2001 -From: Djordje Senicic <[email protected]> -Date: Tue, 27 Aug 2019 09:40:54 -0400 -Subject: [PATCH] fix boost lib dependency - -Upstream-Status: Inappropriate [configuration] -This is a hack to modify hard coded configuration. If anything, it should be made configurable. - -Signed-off-by: Djordje Senicic <[email protected]> ---- - cmake/GlobalConfig.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake -index f518f809..d94c4e50 100755 ---- a/cmake/GlobalConfig.cmake -+++ b/cmake/GlobalConfig.cmake -@@ -135,8 +135,8 @@ endif() - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) - - # Boost --add_definitions("-DBOOST_ALL_NO_LIB") # Turn off auto-linking as we specify the libs manually --set(Boost_USE_STATIC_LIBS ON) -+add_definitions(-DBOOST_ALL_DYN_LINK) # use shared library -+set(Boost_USE_STATIC_LIBS OFF) - find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework system filesystem log program_options) - include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") - link_directories(${Boost_LIBRARY_DIRS}) --- -2.17.1 -
meta-arago-extras/recipes-support/armnn/armnn/0003-add-more-test-command-line-arguments.patch deleted +0 -74
74 lines not on this page · raw message
meta-arago-extras/recipes-support/armnn/armnn/0004-generate-versioned-library.patch deleted +0 -51
51 lines not on this page · raw message
meta-arago-extras/recipes-support/armnn/armnn/0005-add-armnn-mobilenet-test-example.patch deleted +0 -68
68 lines not on this page · raw message
meta-arago-extras/recipes-support/armnn/armnn/0006-armnn-mobilenet-test-example.patch deleted +0 -675
675 lines not on this page · raw message
meta-arago-extras/recipes-support/armnn/armnn/0007-enable-use-of-arm-compute-shared-library.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 38e8e4bc03a4c1ee801f6af50be94ccd971bf3eb Mon Sep 17 00:00:00 2001 -From: Qin Su <[email protected]> -Date: Tue, 27 Nov 2018 18:15:49 -0500 -Subject: [PATCH] enable use of arm compute shared library - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Qin Su <[email protected]> ---- - cmake/GlobalConfig.cmake | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake -index 491d87a..4cf40a2 100644 ---- a/cmake/GlobalConfig.cmake -+++ b/cmake/GlobalConfig.cmake -@@ -285,6 +285,11 @@ if(ARMCOMPUTENEON OR ARMCOMPUTECL) - find_library(ARMCOMPUTE_CORE_LIBRARY_DEBUG NAMES arm_compute_core-static) - find_library(ARMCOMPUTE_CORE_LIBRARY_RELEASE NAMES arm_compute_core-static) - -+ find_library(ARMCOMPUTE_LIBRARY_DEBUG NAMES arm_compute) -+ find_library(ARMCOMPUTE_LIBRARY_RELEASE NAMES arm_compute) -+ find_library(ARMCOMPUTE_CORE_LIBRARY_DEBUG NAMES arm_compute_core) -+ find_library(ARMCOMPUTE_CORE_LIBRARY_RELEASE NAMES arm_compute_core) -+ - set(ARMCOMPUTE_LIBRARIES - debug ${ARMCOMPUTE_LIBRARY_DEBUG} ${ARMCOMPUTE_CORE_LIBRARY_DEBUG} - optimized ${ARMCOMPUTE_LIBRARY_RELEASE} ${ARMCOMPUTE_CORE_LIBRARY_RELEASE} ) --- -1.9.1 -
meta-arago-extras/recipes-support/armnn/armnn/0008-Avoid-stringop-overflow-warning-resulting-in-compila.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 4f5d63b026f225f6499e0a401d9b2769e8ef0a80 Mon Sep 17 00:00:00 2001 -From: Djordje Senicic <[email protected]> -Date: Wed, 12 Jun 2019 13:12:09 -0400 -Subject: [PATCH] Avoid stringop-overflow warning resulting in compilation - error - -Upstream-Status: Inappropriate [TI only test code] - -Signed-off-by: Djordje Senicic <[email protected]> ---- - src/armnn/LayerSupport.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp -index 12b3c403..09c973e5 100644 ---- a/src/armnn/LayerSupport.cpp -+++ b/src/armnn/LayerSupport.cpp -@@ -25,6 +25,8 @@ void CopyErrorMessage(char* truncatedString, const char* fullString, size_t maxL - if(truncatedString != nullptr) - { - size_t copyLength = std::min(maxLength, strlen(fullString)); -+ if(copyLength > 255) copyLength = 255; //Put source length independent upper bound -+ - std::strncpy(truncatedString, fullString, copyLength); - // Ensure null-terminated string. - truncatedString[copyLength] = '\0'; --- -2.17.1 -
meta-arago-extras/recipes-support/armnn/armnn/0009-command-line-options-for-video-port-selection.patch deleted +0 -60
60 lines not on this page · raw message
meta-arago-extras/recipes-support/armnn/armnn/0010-armnnexamples-update-for-19.08-modifications.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From a3e266a2de7c45116428f4e21645a2657534191b Mon Sep 17 00:00:00 2001 -From: Djordje Senicic <[email protected]> -Date: Mon, 26 Aug 2019 03:51:39 -0400 -Subject: [PATCH] armnnexamples: update for 19.08 modifications - -Upstream-Status: Inappropriate [TI only test code] - -Signed-off-by: Djordje Senicic <[email protected]> ---- - tests/ArmnnExamples/ArmnnExamples.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/ArmnnExamples/ArmnnExamples.cpp b/tests/ArmnnExamples/ArmnnExamples.cpp -index d1526539..c10a4fc0 100644 ---- a/tests/ArmnnExamples/ArmnnExamples.cpp -+++ b/tests/ArmnnExamples/ArmnnExamples.cpp -@@ -310,7 +310,7 @@ int MainImpl(const char* modelPath, - params.m_OutputBindings = { outputName }; - //params.m_EnableProfiling = enableProfiling; - params.m_SubgraphId = 0; -- InferenceModel<TParser, TDataType> model(params, enableProfiling, runtime); -+ InferenceModel<TParser, TDataType> model(params, enableProfiling, "", runtime); - - VideoCapture cap; - int input_type = INPUT_IMAGE; --- -2.17.1 -
meta-arago-extras/recipes-support/armnn/armnn/0011-Generate-versioned-library-for-armnnTfLiteParser.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From 1f5670c6ef8669d7d25621d9c97d66178800dcf9 Mon Sep 17 00:00:00 2001 -From: Hongmei Gou <[email protected]> -Date: Tue, 17 Sep 2019 17:58:39 -0400 -Subject: [PATCH] Generate versioned library for armnnTfLiteParser - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Hongmei Gou <[email protected]> ---- - src/armnnTfLiteParser/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/armnnTfLiteParser/CMakeLists.txt b/src/armnnTfLiteParser/CMakeLists.txt -index 17d4cf68..c83f7059 100755 ---- a/src/armnnTfLiteParser/CMakeLists.txt -+++ b/src/armnnTfLiteParser/CMakeLists.txt -@@ -24,4 +24,5 @@ if(BUILD_TF_LITE_PARSER) - install(TARGETS armnnTfLiteParser - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ set_target_properties(armnnTfLiteParser PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) - endif() --- -2.17.1 -
meta-arago-extras/recipes-support/armnn/armnn/0012-ArmnnExample-Fix-exception-for-help-command-line-opt.patch deleted +0 -51
51 lines not on this page · raw message
meta-arago-extras/recipes-support/armnn/armnn/0013-ArmnnExample-setting-capture-resolution-for-the-came.patch deleted +0 -48
48 lines not on this page · raw message
meta-arago-extras/recipes-support/armnn/armnn_git.bb deleted +0 -102
102 lines not on this page · raw message
Signature · 1 line
2.7.4