[meta-arago] [master/thud/ti2019.03 4/4] matrix-gui-apps-git.inc: bump SRCREV to update armnn demo scripts to run mobilenetv2 with TFLite parser
Signed-off-by: Hongmei Gou
---
meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc
b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc
index f4c095ed..54cb54df 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc
@@ -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
--
2.17.1
___
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
[meta-arago] [master/thud/ti2019.03 3/4] armnn: build armnn with TensorFlow Lite support
* mobilenet_v2_1.0_224.tflite is also installed for using TFLite with
ArmnnExamples
Signed-off-by: Hongmei Gou
---
...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
diff --git
a/meta-arago-extras/recipes-support/armnn/armnn/0011-Generate-versioned-library-for-armnnTfLiteParser.patch
b/meta-arago-extras/recipes-support/armnn/armnn/0011-Generate-versioned-library-for-armnnTfLiteParser.patch
new file mode 100644
index ..a504aa76
--- /dev/null
+++
b/meta-arago-extras/recipes-support/armnn/armnn/0011-Generate-versioned-library-for-armnnTfLiteParser.patch
@@ -0,0 +1,25 @@
+From 1f5670c6ef8669d7d25621d9c97d66178800dcf9 Mon Sep 17 00:00:00 2001
+From: Hongmei Gou
+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
+---
+ 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
+
diff --git a/meta-arago-extras/recipes-support/armnn/armnn_git.bb
b/meta-arago-extras/recipes-support/armnn/armnn_git.bb
index e8d16944..261d4f63 100644
--- a/meta-arago-extras/recipes-support/armnn/armnn_git.bb
+++ b/meta-arago-extras/recipes-support/armnn/armnn_git.bb
@@ -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
[meta-arago] [master/thud/ti2019.03 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
Signed-off-by: Hongmei Gou
---
.../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
diff --git
a/meta-arago-extras/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb
b/meta-arago-extras/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb
new file mode 100644
index ..452e1e65
--- /dev/null
+++ b/meta-arago-extras/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb
@@ -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"
--
2.17.1
___
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
[meta-arago] [master/thud/ti2019.03 2/4] tensorflow-lite: install schema.fbs which is required to build armnn with TensorFlow Lite parser
Signed-off-by: Hongmei Gou
---
.../recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb
b/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb
index b393f7eb..ba9f0d4c 100644
--- a/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb
+++ b/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb
@@ -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
--
2.17.1
___
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
Re: [meta-arago] [EXTERNAL] [meta-processor-sdk][PATCHv2 3/5] glow: Address devkit related RPATH issue to point to devkit shared libraries instead of host native
I get an error when configuring glow-native.
Log data follows:
| DEBUG: Executing shell function do_configure
| -- The C compiler identification is GNU 5.3.1 | -- The CXX compiler
identification is GNU 5.3.1
| -- Check for working C compiler:
/oe/bld/build-CORTEX_1/arago-tmp-external-arm-toolchain/hosttools/gcc
| -- Check for working C compiler:
/oe/bld/build-CORTEX_1/arago-tmp-external-arm-toolchain/hosttools/gcc --
broken
| CMake Error at
/oe/bld/build-CORTEX_1/arago-tmp-external-arm-toolchain/work/x86_64-linux/glow-native/0.1+gitAUTOINC+ba8061367a-r0/recipe-sysroot-native/usr/share/cmake-3.12/Modules/CMakeTestCCompiler.cmake:52
(message):
| The C compiler
|
| "/oe/bld/build-CORTEX_1/arago-tmp-external-arm-toolchain/hosttools/gcc"
|
| is not able to compile a simple test program.
|
| It fails with the following output:
|
| Change Dir:
/oe/bld/build-CORTEX_1/arago-tmp-external-arm-toolchain/work/x86_64-linux/glow-native/0.1+gitAUTOINC+ba8061367a-r0/build/CMakeFiles/CMakeTmp
|
| Run Build
Command:"/oe/bld/build-CORTEX_1/arago-tmp-external-arm-toolchain/work/x86_64-linux/glow-native/0.1+gitAUTOINC+ba8061367a-r0/recipe-sysroot-native/usr/bin/ninja"
"cmTC_cc2e4"
| [1/2] Building C object CMakeFiles/cmTC_cc2e4.dir/testCCompiler.c.o
| [2/2] Linking C executable cmTC_cc2e4
| FAILED: cmTC_cc2e4
| : &&
/oe/bld/build-CORTEX_1/arago-tmp-external-arm-toolchain/hosttools/gcc
-isystem/oe/bld/build-CORTEX_1/arago-tmp-external-arm-toolchain/work/x86_64-linux/glow-native/0.1+gitAUTOINC+ba8061367a-r0/recipe-sysroot-native/usr/include
-O2 -pipe -Wl,-z,origin -ldl -lz -ltinfo -pthread
CMakeFiles/cmTC_cc2e4.dir/testCCompiler.c.o -o cmTC_cc2e4 && :
| /oe/bld/build-CORTEX_1/arago-tmp-external-arm-toolchain/hosttools/ld:
cannot find -lz
| /oe/bld/build-CORTEX_1/arago-tmp-external-arm-toolchain/hosttools/ld:
cannot find -ltinfo
| collect2: error: ld returned 1 exit status
| ninja: build stopped: subcommand failed.
|
|
|
|
| CMake will not be able to correctly generate this project.
| Call Stack (most recent call first):
| CMakeLists.txt:5 (project)
|
|
| -- Configuring incomplete, errors occurred!
On 8/23/2019 9:58 AM, Djordje Senicic wrote:
- Pytorch Glow is xNN compiler tool and artifacts are required only in devkit.
Glow build procedure includes creation of native tools that are used in later
phases of build process. These tools (include-bin, InstrGen, NodeGen) are
created
by native compilation, then used by nativesdk. Image-clasification tool
created by native
compilation is used by demo-glow to compile network into armv7 object file
that is included in
target filesystem.
- RPATH for image-classification tool (created by glow project) is modified
to be $ORIGIN based (i.e. relative location)
- Update dependencies
Signed-off-by: Djordje Senicic
---
...p-compilation-of-native-helper-tools.patch | 99 +++
recipes-devtools/glow/glow_git.bb | 62 +---
2 files changed, 145 insertions(+), 16 deletions(-)
create mode 100644
recipes-devtools/glow/files/0002-Skip-compilation-of-native-helper-tools.patch
diff --git
a/recipes-devtools/glow/files/0002-Skip-compilation-of-native-helper-tools.patch
b/recipes-devtools/glow/files/0002-Skip-compilation-of-native-helper-tools.patch
new file mode 100644
index 000..6fd4a4d
--- /dev/null
+++
b/recipes-devtools/glow/files/0002-Skip-compilation-of-native-helper-tools.patch
@@ -0,0 +1,99 @@
+From 923f66a209c329b2d5ab245e1c02f91fa6705d4c Mon Sep 17 00:00:00 2001
+From: Djordje Senicic
+Date: Thu, 1 Aug 2019 04:58:24 -0400
+Subject: [PATCH] Skip compilation of native helper tools
+
+Upstream-Status: Inappropriate [other]
+
+- Applicable for limited use (demo) of AOT image-classifier example only
+
+Signed-off-by: Djordje Senicic
+---
+ lib/Backends/CPU/CMakeLists.txt| 2 +-
+ lib/Backends/OpenCL/CMakeLists.txt | 12 ++--
+ lib/Graph/CMakeLists.txt | 3 +--
+ lib/IR/CMakeLists.txt | 3 +--
+ 4 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/lib/Backends/CPU/CMakeLists.txt b/lib/Backends/CPU/CMakeLists.txt
+index 1e734539..0d5c5e60 100644
+--- a/lib/Backends/CPU/CMakeLists.txt
b/lib/Backends/CPU/CMakeLists.txt
+@@ -53,7 +53,7 @@ add_custom_command(
+ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/glow/CPU)
+ add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/glow/CPU/libjit_bc.inc
+-COMMAND include-bin "${CMAKE_BINARY_DIR}/CPU/libjit.bc"
"${CMAKE_BINARY_DIR}/glow/CPU/libjit_bc.inc"
++COMMAND ${GLOW_BINARY_DIR}/bin/include-bin "${CMAKE_BINARY_DIR}/CPU/libjit.bc"
"${CMAKE_BINARY_DIR}/glow/CPU/libjit_bc.inc"
+ DEPENDS ${GLOW_BINARY_DIR}/CPU/libjit.bc
+ WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}")
+
+diff --git a/lib/Backends/OpenCL/CMakeLists.txt
b/lib/Backends/OpenCL/CMakeLists.txt
+index fd9f965c..e37b4b35 100644
+--- a/lib/Backends/OpenCL/CMakeLists.txt
[meta-arago] [matrix-gui-v2-apps] armnn_demo*: update the scripts to run ArmnnExamples with TFLite parser
* The model is also updated to mobilenet v2 (mobilenet_v2_1.0_224.tflite) Signed-off-by: Hongmei Gou --- tidl_apps/armnn_demo_livecam/runArmnnLiveCam.sh | 2 +- tidl_apps/armnn_demo_staticimg/runArmnnStaticImg.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tidl_apps/armnn_demo_livecam/runArmnnLiveCam.sh b/tidl_apps/armnn_demo_livecam/runArmnnLiveCam.sh index bd1749f..247427e 100644 --- a/tidl_apps/armnn_demo_livecam/runArmnnLiveCam.sh +++ b/tidl_apps/armnn_demo_livecam/runArmnnLiveCam.sh @@ -1,3 +1,3 @@ cd /usr/bin -./ArmnnExamples -f tensorflow-binary -i input -s '1 224 224 3' -o MobilenetV1/Predictions/Reshape_1 -d /usr/share/arm/armnn/testvecs/camera_live_input -m /usr/share/arm/armnn/models/mobilenet_v1_1.0_224_frozen.pb -c CpuAcc --number_frame 999 +./ArmnnExamples -f tflite-binary -i input -s '1 224 224 3' -o MobilenetV2/Predictions/Reshape_1 -d /usr/share/arm/armnn/testvecs/camera_live_input -m /usr/share/arm/armnn/models/mobilenet_v2_1.0_224.tflite -c CpuAcc --number_frame 999 diff --git a/tidl_apps/armnn_demo_staticimg/runArmnnStaticImg.sh b/tidl_apps/armnn_demo_staticimg/runArmnnStaticImg.sh index e42c9d6..298fe93 100644 --- a/tidl_apps/armnn_demo_staticimg/runArmnnStaticImg.sh +++ b/tidl_apps/armnn_demo_staticimg/runArmnnStaticImg.sh @@ -1,3 +1,3 @@ cd /usr/bin -./ArmnnExamples -f tensorflow-binary -i input -s '1 224 224 3' -o MobilenetV1/Predictions/Reshape_1 -d /usr/share/arm/armnn/testvecs/test2.mp4 -m /usr/share/arm/armnn/models/mobilenet_v1_1.0_224_frozen.pb -c CpuAcc --number_frame 999 +./ArmnnExamples -f tflite-binary -i input -s '1 224 224 3' -o MobilenetV2/Predictions/Reshape_1 -d /usr/share/arm/armnn/testvecs/test2.mp4 -m /usr/share/arm/armnn/models/mobilenet_v2_1.0_224.tflite -c CpuAcc --number_frame 999 -- 2.17.1 ___ meta-arago mailing list meta-arago@arago-project.org http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
[meta-arago] [meta-processor-sdk 2/3] tensorflow-lite: install schema.fbs which is required to build armnn with TensorFlow Lite parser
Signed-off-by: Hongmei Gou
---
recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb
b/recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb
index 205977c..24b5bf9 100644
--- a/recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb
+++ b/recipes-support/tensorflow-lite/tensorflow-lite_1.12.bb
@@ -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
--
2.17.1
___
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
[meta-arago] [meta-processor-sdk 3/3] armnn: build armnn with TensorFlow Lite support
* mobilenet_v2_1.0_224.tflite is also installed for using TFLite with
ArmnnExamples
Signed-off-by: Hongmei Gou
---
...sioned-library-for-armnnTfLiteParser.patch | 25 +
recipes-support/armnn/armnn_git.bbappend | 27 +++
2 files changed, 52 insertions(+)
create mode 100644
recipes-support/armnn/armnn/0011-Generate-versioned-library-for-armnnTfLiteParser.patch
create mode 100644 recipes-support/armnn/armnn_git.bbappend
diff --git
a/recipes-support/armnn/armnn/0011-Generate-versioned-library-for-armnnTfLiteParser.patch
b/recipes-support/armnn/armnn/0011-Generate-versioned-library-for-armnnTfLiteParser.patch
new file mode 100644
index 000..a504aa7
--- /dev/null
+++
b/recipes-support/armnn/armnn/0011-Generate-versioned-library-for-armnnTfLiteParser.patch
@@ -0,0 +1,25 @@
+From 1f5670c6ef8669d7d25621d9c97d66178800dcf9 Mon Sep 17 00:00:00 2001
+From: Hongmei Gou
+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
+---
+ 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
+
diff --git a/recipes-support/armnn/armnn_git.bbappend
b/recipes-support/armnn/armnn_git.bbappend
new file mode 100644
index 000..26dfdad
--- /dev/null
+++ b/recipes-support/armnn/armnn_git.bbappend
@@ -0,0 +1,27 @@
+PR_append = ".tisdk0"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+file://0011-Generate-versioned-library-for-armnnTfLiteParser.patch \
+
https://storage.googleapis.com/mobilenet_v2/checkpoints/mobilenet_v2_1.0_224.tgz;name=mobilenetv2;subdir=${WORKDIR}/tfmodel;destsuffix=tfmodel
\
+"
+
+SRC_URI[mobilenetv2.md5sum] = "519bba7052fd279c66d2a28dc3f51f46"
+SRC_URI[mobilenetv2.sha256sum] =
"318084bc1b63d6d7b854553e09cdf77078b1c0168be27c59a0d44253b5ed49dc"
+
+DEPENDS += " \
+tensorflow-lite \
+flatbuffers \
+"
+
+EXTRA_OECMAKE += " \
+-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 \
+"
+
+do_install_append() {
+cp ${WORKDIR}/tfmodel/mobilenet_v2_1.0_224.tflite
${D}${TESTVECS_INSTALL_DIR}/models
+}
--
2.17.1
___
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
[meta-arago] [meta-processor-sdk 1/3] 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
Signed-off-by: Hongmei Gou
---
.../flatbuffers/flatbuffers_1.10.0.bb | 34 +++
1 file changed, 34 insertions(+)
create mode 100644 recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb
diff --git a/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb
b/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb
new file mode 100644
index 000..452e1e6
--- /dev/null
+++ b/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb
@@ -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"
--
2.17.1
___
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
Re: [meta-arago] [EXTERNAL] [PATCH] opencv: Fix morph.cl related compilation error
Denys, Please backport to ti2019.03. Thanks, Jake On 9/17/2019 7:26 PM, Djordje Senicic wrote: - C6x intrinsic _min2(), _max2() cannot be applied to data types such as uchar3 Signed-off-by: Djordje Senicic --- .../0001-morph.cl-fix-compilation-error.patch | 35 +++ .../recipes-support/opencv/opencv_3.1.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-arago-extras/recipes-support/opencv/opencv/0001-morph.cl-fix-compilation-error.patch diff --git a/meta-arago-extras/recipes-support/opencv/opencv/0001-morph.cl-fix-compilation-error.patch b/meta-arago-extras/recipes-support/opencv/opencv/0001-morph.cl-fix-compilation-error.patch new file mode 100644 index ..5f279f31 --- /dev/null +++ b/meta-arago-extras/recipes-support/opencv/opencv/0001-morph.cl-fix-compilation-error.patch @@ -0,0 +1,35 @@ +From c3befabd0420d6665cc61931af5aea00e82977e3 Mon Sep 17 00:00:00 2001 +From: Djordje Senicic +Date: Tue, 17 Sep 2019 19:16:00 -0400 +Subject: [PATCH] morph.cl: fix compilation error + +Upstream-Status: Inappropriate [other] + +- TI C6x intrinsic _min2(), _max2() cannot be applied to data types such as uchar3. + +Signed-off-by: Djordje Senicic +--- + modules/imgproc/src/opencl/morph.cl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/imgproc/src/opencl/morph.cl b/modules/imgproc/src/opencl/morph.cl +index 8e3ab2fa0..47243ca0c 100644 +--- a/modules/imgproc/src/opencl/morph.cl b/modules/imgproc/src/opencl/morph.cl +@@ -90,11 +90,11 @@ + #if defined INTEL_DEVICE && defined DEPTH_0 + #define MORPH_OP(A, B) ((A) < (B) ? (A) : (B)) + #else +-#define MORPH_OP(A, B) _min2((A), (B)) ++#define MORPH_OP(A, B) min((A), (B)) + #endif + #endif + #ifdef OP_DILATE +-#define MORPH_OP(A, B) _max2((A), (B)) ++#define MORPH_OP(A, B) max((A), (B)) + #endif + + #define PROCESS(y, x) \ +-- +2.17.1 + diff --git a/meta-arago-extras/recipes-support/opencv/opencv_3.1.bb b/meta-arago-extras/recipes-support/opencv/opencv_3.1.bb index acc9d71e..c9670fc6 100644 --- a/meta-arago-extras/recipes-support/opencv/opencv_3.1.bb +++ b/meta-arago-extras/recipes-support/opencv/opencv_3.1.bb @@ -22,6 +22,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ file://fixgcc60.patch \ file://fixpkgconfig.patch \ +file://0001-morph.cl-fix-compilation-error.patch \ file://0001-Fix-sign-macro-redefinition-compile-time-error.patch;patchdir=../contrib \ " ___ meta-arago mailing list meta-arago@arago-project.org http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
Re: [meta-arago] [EXTERNAL] [thud/master][PATCH] ti-sci-fw: update to 2019.08
Did the checksums for the hs-enc and hs-cert images change in this version?
- Jake
On 9/17/2019 7:57 PM, Denys Dmytriyenko wrote:
Signed-off-by: Denys Dmytriyenko
---
.../ti-sci-fw/{ti-sci-fw_2019.07.bb => ti-sci-fw_2019.08.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-arago-distro/recipes-bsp/ti-sci-fw/{ti-sci-fw_2019.07.bb =>
ti-sci-fw_2019.08.bb} (96%)
diff --git a/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.07.bb
b/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.08.bb
similarity index 96%
rename from meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.07.bb
rename to meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.08.bb
index d53e926..fab4de4 100644
--- a/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.07.bb
+++ b/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.08.bb
@@ -14,9 +14,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
TI_SECURE_DEV_PKG ?= ""
export TI_SECURE_DEV_PKG
-SRCREV = "3f7c97c9f923f6fbf1b96dcae1da8620a3bab0b3"
+SRCREV = "c75bca342d5a8579c3a459515adb6b77d640a245"
BRANCH ?= "ti-linux-firmware"
-SRCREV_imggen = "38a82e00f84efdf381dba001fff75e8411898e99"
+SRCREV_imggen = "92623d82dc683e74225ceaac239b29deac437adf"
SRCREV_FORMAT = "imggen"
SRC_URI = " \
___
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
