flatbuffers: add version 1.10.0
PATCH 1/4 flatbuffers: add version 1.10.0
* This is back ported from meta-openembedded master/warrior branch
* This version is required for building armnn with TensorFlow Lite parser
--- .../flatbuffers/flatbuffers_1.10.0.bb | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 meta-arago-extras/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb
meta-arago-extras/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb new file +34 -0
@@ -0,0 +1,34 @@ +SUMMARY = "Memory Efficient Serialization Library" +HOMEPAGE = "https://github.com/google/flatbuffers" +SECTION = "console/tools" +LICENSE = "Apache-2.0" + +PACKAGE_BEFORE_PN = "${PN}-compiler" + +RDEPENDS_${PN}-compiler = "${PN}" +RDEPENDS_${PN}-dev += "${PN}-compiler" + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a873c5645c184d51e0f9b34e1d7cf559" + +SRCREV = "c0698cc33f1e534bb59c455909b88cc2726089af" + +SRC_URI = "git://github.com/google/flatbuffers.git" + +# Make sure C++11 is used, required for example for GCC 4.9 +CXXFLAGS += "-std=c++11" +BUILD_CXXFLAGS += "-std=c++11" + +# BUILD_TYPE=Release is required, otherwise flatc is not installed +EXTRA_OECMAKE += "\ + -DCMAKE_BUILD_TYPE=Release \ + -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ +" + +inherit cmake + +S = "${WORKDIR}/git" + +FILES_${PN}-compiler = "${bindir}" + +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
PATCH 2/4 tensorflow-lite: install schema.fbs which is required to build armnn with TensorFlow Lite parser
--- .../recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb +2 -1
@@ -40,7 +40,7 @@ SRC_URI[mobilenet_v1_quant.sha256sum] = "d32432d28673a936b2d6281ab0600c71cf7226d SRCREV = "5b900cfe4b3b848f577315a0dde09a729f770e95" -PR = "r3" +PR = "r4" S = "${WORKDIR}/git"
@@ -112,6 +112,7 @@ do_install() { install -m 0644 ${S}/tensorflow/contrib/lite/profiling/*.h ${D}${includedir}/tensorflow/contrib/lite/profiling/ install -d ${D}${includedir}/tensorflow/contrib/lite/schema/ install -m 0644 ${S}/tensorflow/contrib/lite/schema/*.h ${D}${includedir}/tensorflow/contrib/lite/schema/ + install -m 0644 ${S}/tensorflow/contrib/lite/schema/schema.fbs ${D}${includedir}/tensorflow/contrib/lite/schema/ install -d ${D}${includedir}/tensorflow/contrib/lite/tools/ install -m 0644 ${S}/tensorflow/contrib/lite/tools/*.h ${D}${includedir}/tensorflow/contrib/lite/tools/ install -d ${D}${libdir}/pkgconfig
Signature · 1 line
2.17.1
PATCH 3/4 armnn: build armnn with TensorFlow Lite support
In reply to Hongmei Gou* mobilenet_v2_1.0_224.tflite is also installed for using TFLite with ArmnnExamples
--- ...sioned-library-for-armnnTfLiteParser.patch | 25 +++++++++++++++++++ .../recipes-support/armnn/armnn_git.bb | 14 +++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 meta-arago-extras/recipes-support/armnn/armnn/0011-Generate-versioned-library-for-armnnTfLiteParser.patch
meta-arago-extras/recipes-support/armnn/armnn/0011-Generate-versioned-library-for-armnnTfLiteParser.patch new file +25 -0
@@ -0,0 +1,25 @@ +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_git.bb +12 -2
@@ -5,7 +5,7 @@ LICENSE = "MIT & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3e14a924c16f7d828b8335a59da64074 \ file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -PR = "r1" +PR = "r2" PV = "19.08" PV_MAJOR = "${@d.getVar('PV',d,1).split('.')[0]}"
@@ -32,12 +32,16 @@ SRC_URI = " \ file://0007-enable-use-of-arm-compute-shared-library.patch \ file://0009-command-line-options-for-video-port-selection.patch \ file://0010-armnnexamples-update-for-19.08-modifications.patch \ + file://0011-Generate-versioned-library-for-armnnTfLiteParser.patch \ http://download.tensorflow.org/models/mobilenet_v1_2018_02_22/mobilenet_v1_1.0_224.tgz;name=mobilenet;subdir=${WORKDIR}/tfmodel;destsuffix=tfmodel \ + https://storage.googleapis.com/mobilenet_v2/checkpoints/mobilenet_v2_1.0_224.tgz;name=mobilenetv2;subdir=${WORKDIR}/tfmodel;destsuffix=tfmodel \ git://git.ti.com/tidl/tidl-api.git;name=tidl-api;branch=${BRANCH_tidl-api};subdir=${WORKDIR}/tidl-api;destsuffix=tidl-api \ " SRC_URI[mobilenet.md5sum] = "d5f69cef81ad8afb335d9727a17c462a" SRC_URI[mobilenet.sha256sum] = "1ccb74dbd9c5f7aea879120614e91617db9534bdfaa53dfea54b7c14162e126b" +SRC_URI[mobilenetv2.md5sum] = "519bba7052fd279c66d2a28dc3f51f46" +SRC_URI[mobilenetv2.sha256sum] = "318084bc1b63d6d7b854553e09cdf77078b1c0168be27c59a0d44253b5ed49dc" DEPENDS = " \ boost \
@@ -47,6 +51,8 @@ DEPENDS = " \ armnn-caffe \ armnn-tensorflow \ armnn-onnx \ + tensorflow-lite \ + flatbuffers \ opencv \ "
@@ -58,7 +64,10 @@ EXTRA_OECMAKE=" \ -DCAFFE_GENERATED_SOURCES=${STAGING_DIR_HOST}${datadir}/armnn-caffe \ -DTF_GENERATED_SOURCES=${STAGING_DIR_HOST}${datadir}/armnn-tensorflow \ -DONNX_GENERATED_SOURCES=${STAGING_DIR_HOST}${datadir}/armnn-onnx \ - -DBUILD_CAFFE_PARSER=1 -DBUILD_TF_PARSER=1 -DBUILD_ONNX_PARSER=1 \ + -DBUILD_CAFFE_PARSER=1 -DBUILD_TF_PARSER=1 -DBUILD_ONNX_PARSER=1 -DBUILD_TF_LITE_PARSER=1 \ + -DTF_LITE_GENERATED_PATH=${STAGING_DIR_HOST}${includedir}/tensorflow/contrib/lite/schema \ + -DFLATBUFFERS_ROOT=${STAGING_DIR_HOST}${includedir}/flatbuffers \ + -DFLATBUFFERS_LIBRARY=${STAGING_DIR_HOST}${libdir}/libflatbuffers.a \ -DARMCOMPUTENEON=1 \ -DBUILD_TESTS=1 -DPROFILING=1 \ -DTHIRD_PARTY_INCLUDE_DIRS=${STAGING_DIR_HOST}${includedir} \
@@ -75,6 +84,7 @@ do_install_append() { cp $CP_ARGS ${WORKDIR}/build/UnitTests ${D}${bindir} install -d ${D}${TESTVECS_INSTALL_DIR}/models cp ${WORKDIR}/tfmodel/mobilenet_v1_1.0_224_frozen.pb ${D}${TESTVECS_INSTALL_DIR}/models + cp ${WORKDIR}/tfmodel/mobilenet_v2_1.0_224.tflite ${D}${TESTVECS_INSTALL_DIR}/models cp ${WORKDIR}/git/tests/TfMobileNet-Armnn/labels.txt ${D}${TESTVECS_INSTALL_DIR}/models install -d ${D}${TESTVECS_INSTALL_DIR}/testvecs cp ${WORKDIR}/tidl-api/examples/classification/clips/*.mp4 ${D}${TESTVECS_INSTALL_DIR}/testvecs
Signature · 1 line
2.17.1
PATCH 4/4 matrix-gui-apps-git.inc: bump SRCREV to update armnn demo scripts to run mobilenetv2 with TFLite parser
In reply to Hongmei Gou--- meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc +2 -2
@@ -4,9 +4,9 @@ LICENSE_CHECKSUM = "LICENSE;md5=6e0ae7214f6c74c149cb25f373057fa9" LIC_FILES_CHKSUM := "file://../${LICENSE_CHECKSUM}" SRC_URI = "git://git.ti.com/matrix-gui-v2/matrix-gui-v2-apps.git;protocol=git;branch=${BRANCH}" -SRCREV = "c621180046554c0a24998fea165f3abadc75c25e" +SRCREV = "63e4a531807aadf91037fe8bb5ee4395a4d472c0" BRANCH = "master" -INC_PR = "r71" +INC_PR = "r72" # Pull in the base package for installing matrix applications require matrix-gui-apps.inc
Signature · 1 line
2.17.1
Denys,
Please backport this set to ti2019.03.
Thank you,
Jake
Quoted 49 lines · Hongmei Gou
* This is back ported from meta-openembedded master/warrior branch
* This version is required for building armnn with TensorFlow Lite parserSigned-off-by Hongmei Gou <[email protected]>--- .../flatbuffers/flatbuffers_1.10.0.bb | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+)create mode 100644 meta-arago-extras/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb
meta-arago-extras/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb new file +34
-0@@ -0,0 +1,34 @@ +SUMMARY = "Memory Efficient Serialization Library" +HOMEPAGE = "https://github.com/google/flatbuffers" +SECTION = "console/tools" +LICENSE = "Apache-2.0" + +PACKAGE_BEFORE_PN = "${PN}-compiler" + +RDEPENDS_${PN}-compiler = "${PN}" +RDEPENDS_${PN}-dev += "${PN}-compiler" + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a873c5645c184d51e0f9b34e1d7cf559" + +SRCREV = "c0698cc33f1e534bb59c455909b88cc2726089af" + +SRC_URI = "git://github.com/google/flatbuffers.git" + +# Make sure C++11 is used, required for example for GCC 4.9 +CXXFLAGS += "-std=c++11" +BUILD_CXXFLAGS += "-std=c++11" + +# BUILD_TYPE=Release is required, otherwise flatc is not installed +EXTRA_OECMAKE += "\ + -DCMAKE_BUILD_TYPE=Release \ + -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ +" + +inherit cmake + +S = "${WORKDIR}/git" + +FILES_${PN}-compiler = "${bindir}" + +BBCLASSEXTEND = "native nativesdk"