Signed-off-by: Djordje Senicic <[email protected]> --- recipes-apps/demo-glow/demo-glow.bb | 4 ++-- recipes-apps/demo-glow/files/Makefile.build | 3 ++- .../nativesdk-packagegroup-arago-tisdk-host.bbappend | 4 ++++ .../packagegroup-arago-tisdk-addons-sdk-host.bbappend | 11 +++++++++++ ...ackagegroup-arago-tisdk-addons-sdk-target.bbappend | 6 ++++++ .../packagegroup-arago-tisdk-addons.bbappend | 7 +++++++ .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bbappend | 4 ++++ 7 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bbappend
diff --git a/recipes-apps/demo-glow/demo-glow.bb b/recipes-apps/demo-glow/demo-glow.bb index 21d6bdf..9436349 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 \ @@ -25,7 +25,7 @@ S = "${WORKDIR}/src" 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" + ${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" ${CXX} ${S}/main.cpp ${WORKDIR}/build/lenet_mnist.o -lm -lpng -fpack-struct=8 -fpermissive -o ${WORKDIR}/build/infer_mnist } 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-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bbappend b/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bbappend new file mode 100644 index 0000000..b35282e --- /dev/null +++ b/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bbappend @@ -0,0 +1,4 @@ +PR_append = ".tisdk0" + +EXTRA_TI_TOOLS_append = " nativesdk-glow " + diff --git a/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bbappend b/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bbappend index a8a0b2e..6349bcd 100644 --- a/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bbappend +++ b/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bbappend @@ -18,3 +18,14 @@ EXTRA_LIBS_append_dra7xx = " \ UTILS_append_am335x-evm = " pru-adc-src" +EXTRA_PACKAGES_append_omap-a15 = " \ + demo-glow-src \ +" + +EXTRA_PACKAGES_append_ti43x = " \ + demo-glow-src \ +" + +EXTRA_PACKAGES_append_ti33x = " \ + demo-glow-src \ +" diff --git a/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bbappend b/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bbappend index 08f20e4..6d8a49e 100644 --- a/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bbappend +++ b/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bbappend @@ -77,3 +77,9 @@ EXTRA_LIBS_append_dra7xx = " \ tiovx-sys-iface \ " +EXTRA_PACKAGES_append_ti33x = " demo-glow-dev " + +EXTRA_PACKAGES_append_ti43x = " demo-glow-dev " + +EXTRA_PACKAGES_append_omap-a15 = " demo-glow-dev " + diff --git a/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bbappend b/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bbappend index 0cf0322..f365dc6 100644 --- a/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bbappend +++ b/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bbappend @@ -26,3 +26,10 @@ EXTRA_PACKAGES_append_armv7a = " zbar" UTILS_append = " net-snmp net-snmp-server-snmpd" EXTRA_PACKAGES_append_dra7xx = " tiovx-app-host tiovx-app-host-examples" + +EXTRA_PACKAGES_append_ti33x = " demo-glow " + +EXTRA_PACKAGES_append_ti43x = " demo-glow " + +EXTRA_PACKAGES_append_omap-a15 = " demo-glow " + 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" -- 2.17.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
