Skip to contentSkip to conversation

armnn: bump SRCREV

PATCH New Qin Su 1 participant 1 message Feb 22, 2019

lore
Share & tools
lore

Qin Su

author
#0 lore raw

PATCH 1/1 armnn: bump SRCREV

Changes are:
1. Upgraded Arm NN to Linaro version 19.02.
2. Enabled ONNX support in Arm NN.
3. Updated patch 0003 to 0006 based on this new version of armnn.

---
 .../recipes-support/armnn/armnn-onnx_git.bb        |   22 +
 ...0003-add-more-test-command-line-arguments.patch |   21 +-
 .../armnn/0004-generate-versioned-library.patch    |   53 +-
 .../0005-add-armnn-mobilenet-test-example.patch    |   14 +-
 .../armnn/0006-armnn-mobilenet-test-example.patch  | 1115 ++++++++------------
 .../recipes-support/armnn/armnn_git.bb             |   12 +-
 6 files changed, 518 insertions(+), 719 deletions(-)
 create mode 100644 meta-arago-extras/recipes-support/armnn/armnn-onnx_git.bb
meta-arago-extras/recipes-support/armnn/armnn-onnx_git.bb new file +22 -0
new file mode 100644
index 0000000..80a957b
@@ -0,0 +1,22 @@
+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} \
+"
+
+PV = "1.0"
+
+BRANCH = "master"
+SRCREV = "af39cf346f602bd2aa75db1e9b31636b78d4e31b"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+        install -d ${D}${datadir}/${BPN}/onnx/
+        for file in ${S}/onnxImport/*
+        do
+            install -m 0644 $file ${D}${datadir}/${BPN}/onnx/
+        done
+}
meta-arago-extras/recipes-support/armnn/armnn/0003-add-more-test-command-line-arguments.patch +10 -11
index bcc4a65..04eb049 100644
@@ -1,22 +1,22 @@
-From ba19ce3c785fb92077f6309db1125f1ef32cb08a Mon Sep 17 00:00:00 2001
+From 964cb82f3b811aec6663255ab0aa589f0a3be0ee Mon Sep 17 00:00:00 2001
 From: Qin Su <[email protected]>
-Date: Wed, 21 Nov 2018 15:14:24 -0500
+Date: Fri, 22 Feb 2019 14:10:07 -0500
 Subject: [PATCH] add more test command line arguments
 
 Upstream-Status: Inappropriate [TI only test code]
 Signed-off-by: Qin Su <[email protected]>
 ---
- tests/InferenceTest.inl | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 50 insertions(+)
+ tests/InferenceTest.inl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 49 insertions(+)
 
 diff --git a/tests/InferenceTest.inl b/tests/InferenceTest.inl
-index 16df7ba..5808edb 100644
+index 538720b..6fd21b8 100644
 --- a/tests/InferenceTest.inl
 +++ b/tests/InferenceTest.inl
-@@ -299,6 +299,56 @@ int ClassifierInferenceTestMain(int argc,
-                                 TConstructDatabaseCallable constructDatabase,
-                                 const armnn::TensorShape* inputTensorShape)
- {
+@@ -326,6 +326,55 @@ int ClassifierInferenceTestMain(int argc,
+     BOOST_ASSERT(modelFilename);
+     BOOST_ASSERT(inputBindingName);
+     BOOST_ASSERT(outputBindingName);
 +    int count;
 +    const char *p_input;
 +    char inmodelname[500];
@@ -66,10 +66,9 @@ index 16df7ba..5808edb 100644
 +            }
 +        }
 +    }
-+
+ 
      return InferenceTestMain(argc, argv, defaultTestCaseIds,
          [=]
-         ()
 -- 
 1.9.1
 
meta-arago-extras/recipes-support/armnn/armnn/0004-generate-versioned-library.patch +29 -24

90 lines not on this page · raw message

meta-arago-extras/recipes-support/armnn/armnn/0005-add-armnn-mobilenet-test-example.patch +7 -7
index c996ede..47760ad 100644
@@ -1,17 +1,16 @@
-From 47ce3bcdb8e43ef517dcd8db7477a0514212ba4f Mon Sep 17 00:00:00 2001
+From 50c0001642c831ae1d801cb53080e1ddf501c129 Mon Sep 17 00:00:00 2001
 From: Qin Su <[email protected]>
-Date: Tue, 27 Nov 2018 18:11:46 -0500
+Date: Wed, 13 Feb 2019 11:22:04 -0500
 Subject: [PATCH] add armnn mobilenet test example
 
 Upstream-Status: Inappropriate [TI only test code]
-
 Signed-off-by: Qin Su <[email protected]>
 ---
- tests/CMakeLists.txt | 40 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
+ tests/CMakeLists.txt | 41 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 41 insertions(+)
 
 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 0979d55..7c0cf2a 100644
+index 9913321..6ed44ae 100644
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
 @@ -1,3 +1,6 @@
@@ -21,7 +20,7 @@ index 0979d55..7c0cf2a 100644
  # UnitTests
  include(CheckIncludeFiles)
  
-@@ -226,3 +229,40 @@ if (BUILD_CAFFE_PARSER OR BUILD_TF_PARSER OR BUILD_TF_LITE_PARSER OR BUILD_ONNX_
+@@ -278,3 +281,41 @@ if (BUILD_ARMNN_SERIALIZER OR BUILD_CAFFE_PARSER OR BUILD_TF_PARSER OR BUILD_TF_
          ${Boost_PROGRAM_OPTIONS_LIBRARY})
      addDllCopyCommands(ExecuteNetwork)
  endif()
@@ -34,6 +33,7 @@ index 0979d55..7c0cf2a 100644
 +
 +    target_include_directories(ArmnnExamples PRIVATE ../src/armnnUtils)
 +    target_include_directories(ArmnnExamples PRIVATE ../src/armnn)
++    target_include_directories(ArmnnExamples PRIVATE ../src/backends)
 +
 +    if (BUILD_CAFFE_PARSER)
 +        target_link_libraries(ArmnnExamples armnnCaffeParser)
meta-arago-extras/recipes-support/armnn/armnn/0006-armnn-mobilenet-test-example.patch +443 -672

1,264 lines not on this page · raw message

meta-arago-extras/recipes-support/armnn/armnn_git.bb +7 -5
index eecbb51..ff1bfbd 100644
@@ -5,12 +5,12 @@ LICENSE = "MIT & Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3e14a924c16f7d828b8335a59da64074 \
                     file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-PR = "r1"
-PV = "18.08"
+PR = "r0"
+PV = "19.02"
 PV_MAJOR = "${@d.getVar('PV',d,1).split('.')[0]}"
 
 BRANCH = "master"
-SRCREV = "c577f2c6a3b4ddb6ba87a882723c53a248afbeba"
+SRCREV = "0028d1b0ce5f4c2c6a6eb3c66f38111c21eb47a3"
 SRCREV_tidl-api = "7e9a3942ec38efd64d45e34c10cba2f2938f5618"
 
 SRCREV_FORMAT = "armnn"
@@ -20,7 +20,7 @@ S = "${WORKDIR}/git"
 inherit cmake
 
 SRC_URI = " \
-    git://github.com/ARM-software/armnn.git;name=armnn;branch=${BRANCH} \
+    git://review.mlplatform.org/ml/armnn;protocol=https;name=armnn;branch=${BRANCH} \
     file://0001-stdlib-issue-work-around.patch \
     file://0002-enable-use-of-boost-shared-library.patch \
     file://0003-add-more-test-command-line-arguments.patch \
@@ -42,6 +42,7 @@ DEPENDS = " \
     arm-compute-library \
     armnn-caffe \
     armnn-tensorflow \
+    armnn-onnx \
     opencv \
 "
 
@@ -52,7 +53,8 @@ EXTRA_OECMAKE=" \
     -DARMCOMPUTE_ROOT=${STAGING_DIR_HOST}${datadir}/arm-compute-library \
     -DCAFFE_GENERATED_SOURCES=${STAGING_DIR_HOST}${datadir}/armnn-caffe \
     -DTF_GENERATED_SOURCES=${STAGING_DIR_HOST}${datadir}/armnn-tensorflow \
-    -DBUILD_CAFFE_PARSER=1 -DBUILD_TF_PARSER=1 \
+    -DONNX_GENERATED_SOURCES=${STAGING_DIR_HOST}${datadir}/armnn-onnx \
+    -DBUILD_CAFFE_PARSER=1 -DBUILD_TF_PARSER=1 -DBUILD_ONNX_PARSER=1 \
     -DARMCOMPUTENEON=1 \
     -DBUILD_TESTS=1 -DPROFILING=1 \
     -DTHIRD_PARTY_INCLUDE_DIRS=${STAGING_DIR_HOST}${includedir} \
Signature · 1 line
1.9.1