meta-armnn: armnn: Make ArmNN Tensorflow-lite packages consistent

This commit merges armnn-tensorflow-lite-examples into armnn-tensorflow-lite to be consistent with the package structure in Tensorflow-lite recipes. Signed-off-by: Gareth Williams <[email protected]>
renesas-rz · Feb 24, 2022 · f17a440 · f17a440
1 parent ff812f2
commit f17a440
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 30 deletions.
diff --git a/meta-armnn/README.md b/meta-armnn/README.md
@@ -15,9 +15,7 @@ RZ/G2L families of System on Chips.
 
 ## Build Configuration
 **armnn-tensorflow-lite**: Add as a dependency to your recipe/package to add Arm
-NN TensorFlow Lite support.  
-**armnn-tensorflow-lite-examples**: Add to *IMAGE_INSTALL* to populate Arm NN's
-TensorFlow Lite parser example code in your build.  
+NN TensorFlow Lite support and the related examples code.  
 **armnn-dev**, **armnn-tensorflow-lite-dev**:  Useful to add to *IMAGE_INSTALL*
 when creating an SDK for TensorFlow Lite application development.
 
@@ -43,7 +41,7 @@ if the relevant *-examples* was included in the build (see Build Configuration
 above).
 
 **armnn-examples**: *UnitTests*, *SimpleSample*, *RenesasSample-Armnn*  
-**armnn-tensorflow-lite-examples**: *TfLiteMobilenetQuantized-Armnn*  
+**armnn-tensorflow-lite**: *TfLiteMobilenetQuantized-Armnn*  
 **armnn-onnx-examples**: *OnnxMobileNet-Armnn*
 
 The sample applications are installed under */usr/bin/armnn/examples/*.

diff --git a/meta-armnn/recipes-mathematics/armnn/armnn_21.05.bb b/meta-armnn/recipes-mathematics/armnn/armnn_21.05.bb
@@ -8,9 +8,7 @@ LICENSE = "MIT & Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3e14a924c16f7d828b8335a59da64074 \
                     file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-PACKAGES += "${PN}-tensorflow-lite-examples \
-             ${PN}-tensorflow-lite-examples-dbg \
-             ${PN}-tensorflow-lite \
+PACKAGES += "${PN}-tensorflow-lite \
              ${PN}-tensorflow-lite-dev \
              ${PN}-onnx-examples \
              ${PN}-onnx-examples-dbg \
@@ -81,8 +79,6 @@ EXTRANATIVEPATH += "chrpath-native"
 
 # Tensorflow-lite RDEPENDS
 RDEPENDS_${PN}-tensorflow-lite += "${PN}"
-RDEPENDS_${PN}-tensorflow-lite-examples += "${PN}-tensorflow-lite"
-RDEPENDS_${PN}-tensorflow-lite-examples-dbg += "${PN}-tensorflow-lite"
 RDEPENDS_${PN}-tensorflow-lite-dbg += "${PN}-tensorflow-lite"
 RDEPENDS_${PN}-tensorflow-lite-dev += "${PN}-tensorflow-lite"
 RDEPENDS_${PN}-tensorflow-lite-staticdev += "${PN}-tensorflow-lite"
@@ -337,11 +333,13 @@ FILES_${PN}-examples-dbg = " \
 FILES_${PN}-tensorflow-lite = " \
 	${libdir}/libarmnnTfLiteParser.so* \
 	${includedir}/armnn-tensorflow-lite/schema \
+	${bindir}/${PN}-${PV}/examples/tensorflow-lite \
 "
 FILES_${PN}-tensorflow-lite-dbg = "${libdir}/.debug/libarmnnTfLiteParser.so*"
-FILES_${PN}-tensorflow-lite-dev = "${includedir}/armnnTfLiteParser"
-FILES_${PN}-tensorflow-lite-examples = "${bindir}/${PN}-${PV}/examples/tensorflow-lite"
-FILES_${PN}-tensorflow-lite-examples-dbg = "${bindir}/${PN}-${PV}/examples/tensorflow-lite/.debug"
+FILES_${PN}-tensorflow-lite-dev = " \
+	${includedir}/armnnTfLiteParser \
+	${bindir}/${PN}-${PV}/examples/tensorflow-lite/.debug \
+"
 
 # ONNX files
 FILES_${PN}-onnx = "${libdir}/libarmnnOnnxParser.so*"

diff --git a/meta-armnn/templates/ek874/local.conf b/meta-armnn/templates/ek874/local.conf
@@ -367,6 +367,6 @@ PACKAGE_INSTALL_remove = " dnf "
 BBMASK += "gcc-runtime_9.3.bbappend"
 
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
diff --git a/meta-armnn/templates/hihope-rzg2h/local.conf b/meta-armnn/templates/hihope-rzg2h/local.conf
@@ -367,6 +367,6 @@ PACKAGE_INSTALL_remove = " dnf "
 BBMASK += "gcc-runtime_9.3.bbappend"
 
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
diff --git a/meta-armnn/templates/hihope-rzg2m/local.conf b/meta-armnn/templates/hihope-rzg2m/local.conf
@@ -367,6 +367,6 @@ PACKAGE_INSTALL_remove = " dnf "
 BBMASK += "gcc-runtime_9.3.bbappend"
 
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
diff --git a/meta-armnn/templates/hihope-rzg2n/local.conf b/meta-armnn/templates/hihope-rzg2n/local.conf
@@ -366,6 +366,6 @@ PACKAGE_INSTALL_remove = " dnf "
 BBMASK += "gcc-runtime_9.3.bbappend"
 
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
diff --git a/meta-armnn/templates/smarc-rzg2l/local.conf b/meta-armnn/templates/smarc-rzg2l/local.conf
@@ -303,6 +303,6 @@ USE_32BIT_PKGS = "1"
 
 # Enable ArmNN
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
diff --git a/meta-armnn/templates/smarc-rzg2lc/local.conf b/meta-armnn/templates/smarc-rzg2lc/local.conf
@@ -303,6 +303,6 @@ USE_32BIT_PKGS = "1"
 
 # Enable ArmNN
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
diff --git a/meta-benchmark/templates/armnn+tfl/ek874/local.conf b/meta-benchmark/templates/armnn+tfl/ek874/local.conf
@@ -367,7 +367,7 @@ PACKAGE_INSTALL_remove = " dnf "
 BBMASK += "gcc-runtime_9.3.bbappend"
 
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
-IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev"
+IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev tensorflow-lite-examples"
diff --git a/meta-benchmark/templates/armnn+tfl/hihope-rzg2h/local.conf b/meta-benchmark/templates/armnn+tfl/hihope-rzg2h/local.conf
@@ -367,7 +367,7 @@ PACKAGE_INSTALL_remove = " dnf "
 BBMASK += "gcc-runtime_9.3.bbappend"
 
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
-IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev"
+IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev tensorflow-lite-examples"
diff --git a/meta-benchmark/templates/armnn+tfl/hihope-rzg2m/local.conf b/meta-benchmark/templates/armnn+tfl/hihope-rzg2m/local.conf
@@ -367,7 +367,7 @@ PACKAGE_INSTALL_remove = " dnf "
 BBMASK += "gcc-runtime_9.3.bbappend"
 
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
-IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev"
+IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev tensorflow-lite-examples"
diff --git a/meta-benchmark/templates/armnn+tfl/hihope-rzg2n/local.conf b/meta-benchmark/templates/armnn+tfl/hihope-rzg2n/local.conf
@@ -366,7 +366,7 @@ PACKAGE_INSTALL_remove = " dnf "
 BBMASK += "gcc-runtime_9.3.bbappend"
 
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
-IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev"
+IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev tensorflow-lite-examples"
diff --git a/meta-benchmark/templates/armnn+tfl/smarc-rzg2l/local.conf b/meta-benchmark/templates/armnn+tfl/smarc-rzg2l/local.conf
@@ -303,9 +303,9 @@ USE_32BIT_PKGS = "1"
 
 # Enable ArmNN
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
 
 # Enable Tensorflow-lite
-IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev"
+IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev tensorflow-lite-examples"
diff --git a/meta-benchmark/templates/armnn+tfl/smarc-rzg2lc/local.conf b/meta-benchmark/templates/armnn+tfl/smarc-rzg2lc/local.conf
@@ -303,9 +303,9 @@ USE_32BIT_PKGS = "1"
 
 # Enable ArmNN
 IMAGE_INSTALL_append = " armnn-dev armnn-examples \
-                         armnn-tensorflow-lite-dev armnn-tensorflow-lite-examples \
+                         armnn-tensorflow-lite-dev \
                          armnn-onnx-dev armnn-onnx-examples \
 "
 
 # Enable Tensorflow-lite
-IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev"
+IMAGE_INSTALL_append = " tensorflow-lite-staticdev tensorflow-lite-dev tensorflow-lite-examples"