This fails to apply, can you rebase?
On 8/23/2019 9:58 AM, Djordje Senicic wrote:
- demo-glow is added back to top level example-applications
Signed-off-by: Djordje Senicic <[email protected]>
---
recipes-apps/demo-glow/demo-glow.bb | 16 +++++++++-------
recipes-apps/demo-glow/files/Makefile.build | 3 ++-
.../ti-tisdk-makefile_1.0.bbappend | 4 ++++
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/recipes-apps/demo-glow/demo-glow.bb
b/recipes-apps/demo-glow/demo-glow.bb
index 21d6bdf..76bd224 100644
--- a/recipes-apps/demo-glow/demo-glow.bb
+++ b/recipes-apps/demo-glow/demo-glow.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
PV = "1.0"
PR = "r1"
-DEPENDS = "glow-native libpng"
+DEPENDS = "glow-native libpng protobuf-native "
SRC_URI = "https://raw.githubusercontent.com/pytorch/glow/1af031c9c040dd4ff843d9b50f83e71f6e605631/examples/bundles/lenet_mnist/main.cpp;name=lenet_mnist_main;subdir=src \
file://0001-fix-missing-string.patch \
@@ -23,6 +23,8 @@ SRC_URI[lenet_mnist_license.md5sum] =
"86d3f3a95c324c9479bd8986968f4327"
S = "${WORKDIR}/src"
+CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
+
do_compile() {
install -d ${WORKDIR}/build
LD_LIBRARY_PATH=${STAGING_DIR_NATIVE}/usr/lib
${STAGING_DIR_NATIVE}/usr/share/glow/bin/image-classifier
${STAGING_DIR_NATIVE}/usr/share/glow/tests/images/mnist/1_1008.png -m=mnist.onnx
-image-mode=0to1 -model-input-name=data_0 -emit-bundle ${WORKDIR}/build/ -cpu -target
armv7l-unknown-linux-gnueabihf -network-name="lenet_mnist"
@@ -32,12 +34,12 @@ do_compile() {
do_install () {
install -d ${D}${datadir}/glow/infer
install -d ${D}${datadir}/glow/tests
- cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/*.weights
${D}${datadir}/glow/infer
- cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/infer_mnist
${D}${datadir}/glow/infer
- cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/lenet_mnist.o
${D}${datadir}/glow/infer
- cp -Prf --preserve=mode,timestamps ${WORKDIR}/src/makefile
${D}${datadir}/glow/infer
- cp -Prf --preserve=mode,timestamps ${WORKDIR}/src/main.cpp
${D}${datadir}/glow/infer
- cp -Prf --preserve=mode,timestamps
${STAGING_DIR_NATIVE}/usr/share/glow/tests/images/mnist/*.png
${D}${datadir}/glow/tests/.
+ cp ${CP_ARGS} ${WORKDIR}/build/*.weights ${D}${datadir}/glow/infer
+ cp $(CP_ARGS) ${WORKDIR}/build/infer_mnist ${D}${datadir}/glow/infer
+ cp ${CP_ARGS} ${WORKDIR}/build/lenet_mnist.o ${D}${datadir}/glow/infer
+ cp ${CP_ARGS} ${WORKDIR}/src/makefile ${D}${datadir}/glow/infer
+ cp ${CP_ARGS} ${WORKDIR}/src/main.cpp ${D}${datadir}/glow/infer
+ cp ${CP_ARGS} ${STAGING_DIR_NATIVE}/usr/share/glow/tests/images/mnist/*.png
${D}${datadir}/glow/tests/.
}
FILES_${PN} += "${datadir}/glow"
diff --git a/recipes-apps/demo-glow/files/Makefile.build
b/recipes-apps/demo-glow/files/Makefile.build
index 044bbf9..baf1fc0 100644
--- a/recipes-apps/demo-glow/files/Makefile.build
+++ b/recipes-apps/demo-glow/files/Makefile.build
@@ -6,7 +6,8 @@ DESTDIR ?=
all: release
lenet_mnist:
- LD_LIBRARY_PATH=${SDK_PATH_NATIVE}/usr/lib
${SDK_PATH_NATIVE}/usr/share/glow/bin/image-classifier
${SDK_PATH_NATIVE}/usr/share/glow/tests/images/mnist/1_1008.png -m=mnist.onnx
-image-mode=0to1 -model-input-name=data_0 -emit-bundle ./ -cpu -target
armv7l-unknown-linux-gnueabihf -network-name="lenet_mnist"
+ @. ${ENV_SETUP}; \
+ ${SDK_PATH_NATIVE}/usr/share/glow/bin/image-classifier
${SDK_PATH_NATIVE}/usr/share/glow/tests/images/mnist/1_1008.png -m=mnist.onnx
-image-mode=0to1 -model-input-name=data_0 -emit-bundle ./ -cpu -target
armv7l-unknown-linux-gnueabihf -network-name="lenet_mnist"
release: lenet_mnist
@. ${ENV_SETUP}; \
diff --git a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bbappend
b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bbappend
index acd396b..ead9d53 100644
--- a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bbappend
+++ b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bbappend
@@ -10,6 +10,7 @@ SRC_URI_append = "\
file://Makefile_tiovx-app-host \
file://Makefile_tidl-examples \
file://Makefile_pru-adc \
+ file://Makefile_demo-glow \
"
SRC_URI_append_omap-a15 = " file://Makefile_big-data-ipc-demo"
@@ -29,13 +30,16 @@ MAKEFILES_append_omap-a15 = " dual-camera-demo \
"
MAKEFILES_append_omap-a15 = " video-graphics-test \
+ demo-glow \
"
MAKEFILES_append_ti43x = " evse-hmi \
+ demo-glow \
"
MAKEFILES_append_ti33x = " evse-hmi \
protection-relays-hmi \
+ demo-glow \
"
MAKEFILES_append_k3 = " evse-hmi"
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
