* [thud/master][PATCH v2 1/3] glow: Add pytorch neural network compiler and dependencies
@ 2019-06-20 6:38 Djordje Senicic
2019-06-20 6:38 ` [thud/master][PATCH v2 2/3] demo-glow: Add mnist inference demo based on GLOW compiler Djordje Senicic
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Djordje Senicic @ 2019-06-20 6:38 UTC (permalink / raw)
To: meta-arago; +Cc: Djordje Senicic
- LLVM8 is added for GLOW compilation only (native package)
- glog and libunwind packages are also only used as native packages
Signed-off-by: Djordje Senicic <x0157990@ti.com>
---
...endencies-to-intermediate-executable.patch | 99 +++++++++++++++++++
.../recipes-devtools/glow/glow_git.bb | 63 ++++++++++++
.../recipes-devtools/glow/llvm-glow_git.bb | 24 +++++
.../recipes-support/glog/glog_0.3.5.bbappend | 3 +
.../libunwind/libunwind_1.2.1.bbappend | 3 +
5 files changed, 192 insertions(+)
create mode 100644 meta-arago-extras/recipes-devtools/glow/files/0001-Fix-path-and-dependencies-to-intermediate-executable.patch
create mode 100644 meta-arago-extras/recipes-devtools/glow/glow_git.bb
create mode 100644 meta-arago-extras/recipes-devtools/glow/llvm-glow_git.bb
create mode 100644 meta-arago-extras/recipes-support/glog/glog_0.3.5.bbappend
create mode 100644 meta-arago-extras/recipes-support/libunwind/libunwind_1.2.1.bbappend
diff --git a/meta-arago-extras/recipes-devtools/glow/files/0001-Fix-path-and-dependencies-to-intermediate-executable.patch b/meta-arago-extras/recipes-devtools/glow/files/0001-Fix-path-and-dependencies-to-intermediate-executable.patch
new file mode 100644
index 00000000..cdac2b63
--- /dev/null
+++ b/meta-arago-extras/recipes-devtools/glow/files/0001-Fix-path-and-dependencies-to-intermediate-executable.patch
@@ -0,0 +1,99 @@
+From 724ed36a3efc9d48baada931feef58d831bddd3e Mon Sep 17 00:00:00 2001
+From: Djordje Senicic <x0157990@ti.com>
+Date: Wed, 29 May 2019 03:51:13 -0400
+Subject: [PATCH] Fix path and dependencies to intermediate executables
+
+Signed-off-by: Djordje Senicic <x0157990@ti.com>
+---
+ lib/Backends/CPU/CMakeLists.txt | 3 ++-
+ lib/Backends/OpenCL/CMakeLists.txt | 12 ++++++------
+ lib/Graph/CMakeLists.txt | 4 ++--
+ lib/IR/CMakeLists.txt | 4 ++--
+ 4 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/lib/Backends/CPU/CMakeLists.txt b/lib/Backends/CPU/CMakeLists.txt
+index 1e734539..5b79ee7d 100644
+--- a/lib/Backends/CPU/CMakeLists.txt
++++ b/lib/Backends/CPU/CMakeLists.txt
+@@ -53,8 +53,9 @@ 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
++ DEPENDS ${GLOW_BINARY_DIR}/bin/include-bin
+ WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}")
+
+ add_custom_target(CPURuntime
+diff --git a/lib/Backends/OpenCL/CMakeLists.txt b/lib/Backends/OpenCL/CMakeLists.txt
+index fd9f965c..e37b4b35 100644
+--- a/lib/Backends/OpenCL/CMakeLists.txt
++++ b/lib/Backends/OpenCL/CMakeLists.txt
+@@ -8,25 +8,25 @@ add_custom_target(make_opencl_dir
+
+ add_custom_command(
+ OUTPUT "${OpenCL_DIR}/kernels.cl.inc"
+- COMMAND include-bin
++ COMMAND ${GLOW_BINARY_DIR}/bin/include-bin
+ "${CMAKE_CURRENT_SOURCE_DIR}/kernels.cl"
+ "${OpenCL_DIR}/kernels.cl.inc"
+- DEPENDS make_opencl_dir include-bin "${CMAKE_CURRENT_SOURCE_DIR}/kernels.cl")
++ DEPENDS make_opencl_dir ${GLOW_BINARY_DIR}/bin/include-bin "${CMAKE_CURRENT_SOURCE_DIR}/kernels.cl")
+
+ add_custom_command(
+ OUTPUT "${OpenCL_DIR}/kernels_fwd_conv.cl.inc"
+- COMMAND include-bin
++ COMMAND ${GLOW_BINARY_DIR}/bin/include-bin
+ "${CMAKE_CURRENT_SOURCE_DIR}/kernels_fwd_conv.cl"
+ "${OpenCL_DIR}/kernels_fwd_conv.cl.inc"
+- DEPENDS make_opencl_dir include-bin
++ DEPENDS make_opencl_dir ${GLOW_BINARY_DIR}/bin/include-bin
+ "${CMAKE_CURRENT_SOURCE_DIR}/kernels_fwd_conv.cl")
+
+ add_custom_command(
+ OUTPUT "${OpenCL_DIR}/kernels_fwd_quantized_conv.cl.inc"
+- COMMAND include-bin
++ COMMAND ${GLOW_BINARY_DIR}/bin/include-bin
+ "${CMAKE_CURRENT_SOURCE_DIR}/kernels_fwd_quantized_conv.cl"
+ "${OpenCL_DIR}/kernels_fwd_quantized_conv.cl.inc"
+- DEPENDS make_opencl_dir include-bin
++ DEPENDS make_opencl_dir ${GLOW_BINARY_DIR}/bin/include-bin
+ "${CMAKE_CURRENT_SOURCE_DIR}/kernels_fwd_quantized_conv.cl")
+
+ add_library(OpenCLBackend
+diff --git a/lib/Graph/CMakeLists.txt b/lib/Graph/CMakeLists.txt
+index 84589761..02a92636 100644
+--- a/lib/Graph/CMakeLists.txt
++++ b/lib/Graph/CMakeLists.txt
+@@ -7,8 +7,8 @@ add_custom_command(OUTPUT
+ "${NODES_HDR}"
+ "${NODES_SRC}"
+ "${NODES_DEF}"
+- COMMAND NodeGen ${NODES_HDR} ${NODES_SRC} ${NODES_DEF}
+- DEPENDS NodeGen
++ COMMAND ${GLOW_BINARY_DIR}/bin/NodeGen ${NODES_HDR} ${NODES_SRC} ${NODES_DEF}
++ DEPENDS ${GLOW_BINARY_DIR}/bin/NodeGen
+ COMMENT "NodeGen: Generating nodes." VERBATIM)
+ add_custom_target(AutoGenNode
+ DEPENDS
+diff --git a/lib/IR/CMakeLists.txt b/lib/IR/CMakeLists.txt
+index 7660308d..fb5302ce 100644
+--- a/lib/IR/CMakeLists.txt
++++ b/lib/IR/CMakeLists.txt
+@@ -13,10 +13,10 @@ add_custom_command(OUTPUT
+ "${INSTR_BLD_HDR}"
+ "${INSTR_BLD_SRC}"
+ "${INSTR_IR_GEN}"
+- COMMAND InstrGen
++ COMMAND ${GLOW_BINARY_DIR}/bin/InstrGen
+ "${INSTR_HDR}" "${INSTR_SRC}" "${INSTR_DEF}"
+ "${INSTR_BLD_HDR}" "${INSTR_BLD_SRC}" "${INSTR_IR_GEN}"
+- DEPENDS InstrGen
++ DEPENDS ${GLOW_BINARY_DIR}/bin/InstrGen
+ COMMENT "InstrGen: Generating instructions." VERBATIM)
+ add_custom_target(AutoGenInstr
+ DEPENDS
+--
+2.17.1
+
diff --git a/meta-arago-extras/recipes-devtools/glow/glow_git.bb b/meta-arago-extras/recipes-devtools/glow/glow_git.bb
new file mode 100644
index 00000000..3aea4b14
--- /dev/null
+++ b/meta-arago-extras/recipes-devtools/glow/glow_git.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "Pytorch neural network compiler"
+HOMEPAGE = "https://github.com/pytorch/glow"
+
+SECTION = "devel"
+LICENSE = "Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+SRCREV_FORMAT = "glow"
+
+DEPENDS_class-native = "zlib zlib-native llvm-glow-native ninja-native protobuf-native libpng-native protobuf-native protobuf-c-native gflags-native glog-native"
+DEPENDS_class-nativesdk = "ncurses protobuf libpng glow-native zlib llvm-glow-native ninja-native protobuf-native libpng-native protobuf-c-native gflags-native glog-native"
+
+RDEPENDS_${PN}_class-nativesdk = "libpng ncurses glog"
+
+SRC_URI = "git://github.com/pytorch/glow.git;protocol=https;destsuffix=git;name=glow \
+ file://0001-Fix-path-and-dependencies-to-intermediate-executable.patch \
+ git://github.com/stp/OutputCheck.git;protocol=https;destsuffix=git/tests/OutputCheck;name=outcheck \
+ git://github.com/google/benchmark.git;protocol=https;destsuffix=git/tests/googlebenchmark;name=gbench \
+ git://github.com/google/googletest.git;protocol=https;destsuffix=git/tests/googletest;name=gtest \
+ git://github.com/houseroad/foxi.git;protocol=https;destsuffix=git/thirdparty/foxi;name=foxi \
+ git://github.com/Maratyszcza/FP16.git;protocol=https;destsuffix=git/thirdparty/fp16;name=fp16 \
+ git://github.com/onnx/onnx.git;protocol=https;destsuffix=git/thirdparty/onnx;name=onnx \
+ git://github.com/google/benchmark.git;protocol=https;destsuffix=git/thirdparty/onnx/third_party/benchmark;name=onnxbench \
+ git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/thirdparty/onnx/third_party/pybind11;name=onnxpybind11 \
+ git://github.com/wjakob/clang-cindex-python3.git;protocol=https;destsuffix=git/thirdparty/onnx/third_party/pybind11/tools/clang;name=onnxclang \
+ "
+
+SRCREV_glow = "ba8061367aea0b472b596448018107ca6e87929e"
+SRCREV_outcheck = "eab62a5dd5129f6a4ebfbe4bbe41d35611f7c48d"
+SRCREV_gbench = "090faecb454fbd6e6e17a75ef8146acb037118d4"
+SRCREV_gtest = "0c799d0436e1b6d867c1738f6ff58166d153cacc"
+SRCREV_foxi = "b2ec1a8041879b7be98d81387a14cae895f952f4"
+SRCREV_fp16 = "34d4bf01bbf7376f2baa71b8fa148b18524d45cf"
+SRCREV_onnx = "50dc186b50ea512d6888aa1f47414150fd782fa0"
+SRCREV_onnxbench = "e776aa0275e293707b6a0901e0e8d8a8a3679508"
+SRCREV_onnxpybind11 = "a1041190c8b8ff0cd9e2f0752248ad5e3789ea0c"
+SRCREV_onnxclang = "6a00cbc4a9b8e68b71caf7f774b3f9c753ae84d5"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig cmake
+
+EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS="-Wl,-dynamic-linker=/lib64/ld-linux-x86-64.so.2 " "
+
+do_compile() {
+ cmake_runcmake_build --target ${OECMAKE_TARGET_COMPILE}
+}
+
+do_install () {
+ install -d ${D}${datadir}/glow
+ install -d ${D}${datadir}/glow/tests/images
+ cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/bin ${D}${datadir}/glow
+ cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/tests/images/EmotionSampleImages ${D}${datadir}/glow/tests/images
+ cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/tests/images/imagenet ${D}${datadir}/glow/tests/images
+ cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/tests/images/imagenet_299 ${D}${datadir}/glow/tests/images
+ cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/tests/images/mnist ${D}${datadir}/glow/tests/images
+ cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/tests/images/other ${D}${datadir}/glow/tests/images
+}
+
+BBCLASSEXTEND = "native nativesdk"
+
+FILES_${PN} = "${datadir}"
diff --git a/meta-arago-extras/recipes-devtools/glow/llvm-glow_git.bb b/meta-arago-extras/recipes-devtools/glow/llvm-glow_git.bb
new file mode 100644
index 00000000..58d392b3
--- /dev/null
+++ b/meta-arago-extras/recipes-devtools/glow/llvm-glow_git.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "LLVM release suggested for pytorch glow neural network compiler"
+HOMEPAGE = "https://github.com/llvm-mirror/llvm"
+SECTION = "devel"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648"
+PV = "8.0"
+PR = "r0"
+
+DEPENDS = "ninja-native protobuf-native libpng-native protobuf-native protobuf-c-native gflags-native glog-native"
+
+SOLIBVER = "1"
+
+SRC_URI = "git://github.com/llvm-mirror/llvm.git;protocol=https;branch=release_80;rev=5563a6a769b48912b9c8052124520610966eda28;destsuffix=git/llvm \
+ git://github.com/llvm-mirror/clang.git;protocol=https;branch=release_80;rev=ccfe04576c13497b9c422ceef0b6efe99077a392;destsuffix=git/clang \
+ "
+
+
+S = "${WORKDIR}/git/llvm"
+
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DLLVM_INSTALL_UTILS=ON -DLLVM_ENABLE_PROJECTS=clang"
+
+inherit pkgconfig cmake
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-arago-extras/recipes-support/glog/glog_0.3.5.bbappend b/meta-arago-extras/recipes-support/glog/glog_0.3.5.bbappend
new file mode 100644
index 00000000..5e64501c
--- /dev/null
+++ b/meta-arago-extras/recipes-support/glog/glog_0.3.5.bbappend
@@ -0,0 +1,3 @@
+PR_append = ".arago0"
+
+BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-arago-extras/recipes-support/libunwind/libunwind_1.2.1.bbappend b/meta-arago-extras/recipes-support/libunwind/libunwind_1.2.1.bbappend
new file mode 100644
index 00000000..4ad6ebc2
--- /dev/null
+++ b/meta-arago-extras/recipes-support/libunwind/libunwind_1.2.1.bbappend
@@ -0,0 +1,3 @@
+PR_append = ".arago0"
+
+BBCLASSEXTEND += "native nativesdk"
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [thud/master][PATCH v2 2/3] demo-glow: Add mnist inference demo based on GLOW compiler
2019-06-20 6:38 [thud/master][PATCH v2 1/3] glow: Add pytorch neural network compiler and dependencies Djordje Senicic
@ 2019-06-20 6:38 ` Djordje Senicic
2019-06-20 6:38 ` [thud/master][PATCH v2 3/3] glow: Add glow and demo-glow to packagegroups Djordje Senicic
2019-06-21 22:27 ` [thud/master][PATCH v2 1/3] glow: Add pytorch neural network compiler and dependencies Denys Dmytriyenko
2 siblings, 0 replies; 6+ messages in thread
From: Djordje Senicic @ 2019-06-20 6:38 UTC (permalink / raw)
To: meta-arago; +Cc: Djordje Senicic
Signed-off-by: Djordje Senicic <x0157990@ti.com>
---
.../recipes-apps/demo-glow/demo-glow.bb | 46 +++++++++++++++++++
.../files/0001-fix-missing-string.patch | 10 ++++
.../demo-glow/files/Makefile.build | 18 ++++++++
.../recipes-apps/demo-glow/files/makefile | 13 ++++++
4 files changed, 87 insertions(+)
create mode 100644 meta-arago-extras/recipes-apps/demo-glow/demo-glow.bb
create mode 100644 meta-arago-extras/recipes-apps/demo-glow/files/0001-fix-missing-string.patch
create mode 100644 meta-arago-extras/recipes-apps/demo-glow/files/Makefile.build
create mode 100644 meta-arago-extras/recipes-apps/demo-glow/files/makefile
diff --git a/meta-arago-extras/recipes-apps/demo-glow/demo-glow.bb b/meta-arago-extras/recipes-apps/demo-glow/demo-glow.bb
new file mode 100644
index 00000000..c7422948
--- /dev/null
+++ b/meta-arago-extras/recipes-apps/demo-glow/demo-glow.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "Demo application based on pytorch neural network compiler glow, using mnist model"
+HOMEPAGE = "https://github.com/pytorch/glow/tree/master/examples/bundles/lenet_mnist"
+SECTION = "examples"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+PV = "1.0"
+PR = "r1"
+
+DEPENDS = "glow-native libpng"
+
+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 \
+ file://makefile;subdir=src \
+ file://Makefile.build;subdir=src \
+ http://fb-glow-assets.s3.amazonaws.com/models/lenet_mnist.tar.gz;name=lenet_mnist;subdir=src \
+ https://raw.githubusercontent.com/pytorch/glow/1af031c9c040dd4ff843d9b50f83e71f6e605631/LICENSE;name=lenet_mnist_license;subdir=src \
+ "
+
+SRC_URI[lenet_mnist.md5sum] = "7aded5f273b3198795683c238492d1a9"
+SRC_URI[lenet_mnist_main.md5sum] = "e80ec7a97dec86828ff1a51026c237bc"
+SRC_URI[lenet_mnist_license.md5sum] = "86d3f3a95c324c9479bd8986968f4327"
+
+S = "${WORKDIR}/src"
+
+do_compile() {
+ install -d ${WORKDIR}/build
+ ${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
+}
+
+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/.
+}
+
+FILES_${PN} += "${datadir}/glow"
+
+CREATE_SRCIPK = "1"
+SRCIPK_INSTALL_DIR = "example-applications/${PN}-${PV}"
diff --git a/meta-arago-extras/recipes-apps/demo-glow/files/0001-fix-missing-string.patch b/meta-arago-extras/recipes-apps/demo-glow/files/0001-fix-missing-string.patch
new file mode 100644
index 00000000..ba0533ab
--- /dev/null
+++ b/meta-arago-extras/recipes-apps/demo-glow/files/0001-fix-missing-string.patch
@@ -0,0 +1,10 @@
+--- ./main.cpp 2019-06-06 13:31:07.485528729 -0400
++++ ./main_mod.cpp 2019-06-06 13:30:50.333529003 -0400
+@@ -18,6 +18,7 @@
+ #include <png.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #include <string>
+ #include <vector>
diff --git a/meta-arago-extras/recipes-apps/demo-glow/files/Makefile.build b/meta-arago-extras/recipes-apps/demo-glow/files/Makefile.build
new file mode 100644
index 00000000..399cc3c0
--- /dev/null
+++ b/meta-arago-extras/recipes-apps/demo-glow/files/Makefile.build
@@ -0,0 +1,18 @@
+-include ../../Rules.make
+
+ENV_SETUP ?= ../../linux-devkit/environment-setup
+DESTDIR ?=
+
+all: release
+
+lenet_mnist:
+ ${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}; \
+ make
+
+clean:
+ @. ${ENV_SETUP}; \
+ make clean
+ rm lenet_mnist.*
diff --git a/meta-arago-extras/recipes-apps/demo-glow/files/makefile b/meta-arago-extras/recipes-apps/demo-glow/files/makefile
new file mode 100644
index 00000000..01b19c8c
--- /dev/null
+++ b/meta-arago-extras/recipes-apps/demo-glow/files/makefile
@@ -0,0 +1,13 @@
+PHONY: all
+
+all: infer_mnist
+LIBS = -lm -lpng
+
+infer_mnist: main.cpp lenet_mnist.o
+ $(CXX) main.cpp lenet_mnist.o -o infer_mnist $(LIBS) $(CXXFLAGS) -fpack-struct=8 -fpermissive
+
+clean:
+ rm -rf infer_mnist
+
+test:
+ ./infer_mnist ../tests/0_1009.png
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [thud/master][PATCH v2 3/3] glow: Add glow and demo-glow to packagegroups
2019-06-20 6:38 [thud/master][PATCH v2 1/3] glow: Add pytorch neural network compiler and dependencies Djordje Senicic
2019-06-20 6:38 ` [thud/master][PATCH v2 2/3] demo-glow: Add mnist inference demo based on GLOW compiler Djordje Senicic
@ 2019-06-20 6:38 ` Djordje Senicic
2019-06-21 15:26 ` [EXTERNAL] " Jacob Stiffler
2019-06-21 22:27 ` [thud/master][PATCH v2 1/3] glow: Add pytorch neural network compiler and dependencies Denys Dmytriyenko
2 siblings, 1 reply; 6+ messages in thread
From: Djordje Senicic @ 2019-06-20 6:38 UTC (permalink / raw)
To: meta-arago; +Cc: Djordje Senicic
- Add glow to nativesdk
- Add demo to target and src packagegroups
- Also include demo-glow to example-applications
Signed-off-by: Djordje Senicic <x0157990@ti.com>
---
.../packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb | 3 +++
.../packagegroup-arago-tisdk-addons-sdk-target.bb | 3 +++
.../packagegroups/packagegroup-arago-tisdk-addons.bb | 3 +++
.../recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb | 4 ++++
.../packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb | 1 +
5 files changed, 14 insertions(+)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
index 3b734554..addb4818 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
@@ -90,14 +90,17 @@ EXTRA_PACKAGES = ""
EXTRA_PACKAGES_append_omap-a15 = " \
pdm-anomaly-detection-src \
+ demo-glow-src \
"
EXTRA_PACKAGES_append_ti33x = " \
pdm-anomaly-detection-src \
+ demo-glow-src \
"
EXTRA_PACKAGES_append_ti43x = " \
pdm-anomaly-detection-src \
+ demo-glow-src \
"
EXTRA_PACKAGES_append_k3 = " \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
index 8bce1756..d998a1eb 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
@@ -161,16 +161,19 @@ EXTRA_PACKAGES_append_ti33x = " voxelsdk-dev \
arm-compute-library-dev \
${ARMNN_PACKAGES} \
pdm-anomaly-detection-dev \
+ demo-glow-dev \
"
EXTRA_PACKAGES_append_ti43x = " voxelsdk-dev \
arm-compute-library-dev \
${ARMNN_PACKAGES} \
pdm-anomaly-detection-dev \
+ demo-glow-dev \
"
EXTRA_PACKAGES_append_omap-a15 = " voxelsdk-dev \
arm-compute-library-dev \
${ARMNN_PACKAGES} \
pdm-anomaly-detection-dev \
+ demo-glow-dev \
"
EXTRA_PACKAGES_append_k3 = " arm-compute-library-dev \
${ARMNN_PACKAGES} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 6558a21a..38ec3065 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -152,12 +152,14 @@ EXTRA_PACKAGES_append_ti33x = " voxelsdk \
arm-compute-library \
${ARMNN_PACKAGES} \
pdm-anomaly-detection \
+ demo-glow \
"
EXTRA_PACKAGES_append_ti43x = " voxelsdk \
arm-compute-library \
${ARMNN_PACKAGES} \
pdm-anomaly-detection \
+ demo-glow \
"
EXTRA_PACKAGES_append_omap-a15 = " voxelsdk \
@@ -166,6 +168,7 @@ EXTRA_PACKAGES_append_omap-a15 = " voxelsdk \
arm-compute-library \
${ARMNN_PACKAGES} \
pdm-anomaly-detection \
+ demo-glow \
"
EXTRA_PACKAGES_append_k3 = " arm-compute-library \
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index e0d409a2..2200def1 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -52,6 +52,7 @@ SRC_URI = "\
file://Makefile_sysfw-image \
file://Makefile_mmwavegesture-hmi \
file://Makefile_pdm-anomaly-detection \
+ file://Makefile_demo-glow \
"
PR = "r95"
@@ -98,6 +99,7 @@ MAKEFILES_append_ti33x = " u-boot-spl \
uio-module-drv \
mmwavegesture-hmi \
pdm-anomaly-detection \
+ demo-glow \
"
MAKEFILES_append_ti43x = " u-boot-spl \
${QUICK_PLAYGROUND} \
@@ -113,6 +115,7 @@ MAKEFILES_append_ti43x = " u-boot-spl \
uio-module-drv \
mmwavegesture-hmi \
pdm-anomaly-detection \
+ demo-glow \
"
# debugss-module-drv
@@ -136,6 +139,7 @@ MAKEFILES_append_omap-a15 = " u-boot-spl \
uio-module-drv \
mmwavegesture-hmi \
pdm-anomaly-detection \
+ demo-glow \
"
MAKEFILES_append_omapl138 = " linux-dtbs \
u-boot-spl \
diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
index ef54253d..28d817da 100644
--- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
@@ -17,6 +17,7 @@ EXTRA_TI_TOOLS = " \
nativesdk-tidl-viewer \
nativesdk-tidl-utils \
nativesdk-gcc-arm-none-eabi \
+ nativesdk-glow \
"
RDEPENDS_${PN} = "\
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [EXTERNAL] [thud/master][PATCH v2 3/3] glow: Add glow and demo-glow to packagegroups
2019-06-20 6:38 ` [thud/master][PATCH v2 3/3] glow: Add glow and demo-glow to packagegroups Djordje Senicic
@ 2019-06-21 15:26 ` Jacob Stiffler
2019-06-21 15:44 ` Senicic, Djordje
0 siblings, 1 reply; 6+ messages in thread
From: Jacob Stiffler @ 2019-06-21 15:26 UTC (permalink / raw)
To: Djordje Senicic, meta-arago
On 6/20/2019 2:38 AM, Djordje Senicic wrote:
> - Add glow to nativesdk
> - Add demo to target and src packagegroups
> - Also include demo-glow to example-applications
>
> Signed-off-by: Djordje Senicic <x0157990@ti.com>
> ---
> .../packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb | 3 +++
> .../packagegroup-arago-tisdk-addons-sdk-target.bb | 3 +++
> .../packagegroups/packagegroup-arago-tisdk-addons.bb | 3 +++
> .../recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb | 4 ++++
> .../packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb | 1 +
> 5 files changed, 14 insertions(+)
>
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
> index 3b734554..addb4818 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
> @@ -90,14 +90,17 @@ EXTRA_PACKAGES = ""
>
> EXTRA_PACKAGES_append_omap-a15 = " \
> pdm-anomaly-detection-src \
> + demo-glow-src \
> "
>
> EXTRA_PACKAGES_append_ti33x = " \
> pdm-anomaly-detection-src \
> + demo-glow-src \
> "
>
> EXTRA_PACKAGES_append_ti43x = " \
> pdm-anomaly-detection-src \
> + demo-glow-src \
> "
>
> EXTRA_PACKAGES_append_k3 = " \
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
> index 8bce1756..d998a1eb 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
> @@ -161,16 +161,19 @@ EXTRA_PACKAGES_append_ti33x = " voxelsdk-dev \
> arm-compute-library-dev \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection-dev \
> + demo-glow-dev \
> "
> EXTRA_PACKAGES_append_ti43x = " voxelsdk-dev \
> arm-compute-library-dev \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection-dev \
> + demo-glow-dev \
> "
> EXTRA_PACKAGES_append_omap-a15 = " voxelsdk-dev \
> arm-compute-library-dev \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection-dev \
> + demo-glow-dev \
> "
> EXTRA_PACKAGES_append_k3 = " arm-compute-library-dev \
> ${ARMNN_PACKAGES} \
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> index 6558a21a..38ec3065 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> @@ -152,12 +152,14 @@ EXTRA_PACKAGES_append_ti33x = " voxelsdk \
> arm-compute-library \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection \
> + demo-glow \
> "
>
> EXTRA_PACKAGES_append_ti43x = " voxelsdk \
> arm-compute-library \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection \
> + demo-glow \
> "
>
> EXTRA_PACKAGES_append_omap-a15 = " voxelsdk \
> @@ -166,6 +168,7 @@ EXTRA_PACKAGES_append_omap-a15 = " voxelsdk \
> arm-compute-library \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection \
> + demo-glow \
> "
>
> EXTRA_PACKAGES_append_k3 = " arm-compute-library \
> diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
> index e0d409a2..2200def1 100644
> --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
> +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
> @@ -52,6 +52,7 @@ SRC_URI = "\
> file://Makefile_sysfw-image \
> file://Makefile_mmwavegesture-hmi \
> file://Makefile_pdm-anomaly-detection \
> + file://Makefile_demo-glow \
This file does not appear to be added.
> "
>
> PR = "r95"
> @@ -98,6 +99,7 @@ MAKEFILES_append_ti33x = " u-boot-spl \
> uio-module-drv \
> mmwavegesture-hmi \
> pdm-anomaly-detection \
> + demo-glow \
> "
> MAKEFILES_append_ti43x = " u-boot-spl \
> ${QUICK_PLAYGROUND} \
> @@ -113,6 +115,7 @@ MAKEFILES_append_ti43x = " u-boot-spl \
> uio-module-drv \
> mmwavegesture-hmi \
> pdm-anomaly-detection \
> + demo-glow \
> "
>
> # debugss-module-drv
> @@ -136,6 +139,7 @@ MAKEFILES_append_omap-a15 = " u-boot-spl \
> uio-module-drv \
> mmwavegesture-hmi \
> pdm-anomaly-detection \
> + demo-glow \
> "
> MAKEFILES_append_omapl138 = " linux-dtbs \
> u-boot-spl \
> diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
> index ef54253d..28d817da 100644
> --- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
> +++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
> @@ -17,6 +17,7 @@ EXTRA_TI_TOOLS = " \
> nativesdk-tidl-viewer \
> nativesdk-tidl-utils \
> nativesdk-gcc-arm-none-eabi \
> + nativesdk-glow \
> "
>
> RDEPENDS_${PN} = "\
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [EXTERNAL] [thud/master][PATCH v2 3/3] glow: Add glow and demo-glow to packagegroups
2019-06-21 15:26 ` [EXTERNAL] " Jacob Stiffler
@ 2019-06-21 15:44 ` Senicic, Djordje
0 siblings, 0 replies; 6+ messages in thread
From: Senicic, Djordje @ 2019-06-21 15:44 UTC (permalink / raw)
To: Stiffler, Jacob, meta-arago@arago-project.org
http://patchwork.dal.design.ti.com/patch/48179/
-----Original Message-----
From: Stiffler, Jacob
Sent: Friday, June 21, 2019 11:27 AM
To: Senicic, Djordje; meta-arago@arago-project.org
Subject: Re: [EXTERNAL] [meta-arago] [thud/master][PATCH v2 3/3] glow: Add glow and demo-glow to packagegroups
On 6/20/2019 2:38 AM, Djordje Senicic wrote:
> - Add glow to nativesdk
> - Add demo to target and src packagegroups
> - Also include demo-glow to example-applications
>
> Signed-off-by: Djordje Senicic <x0157990@ti.com>
> ---
> .../packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb | 3 +++
> .../packagegroup-arago-tisdk-addons-sdk-target.bb | 3 +++
> .../packagegroups/packagegroup-arago-tisdk-addons.bb | 3 +++
> .../recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb | 4 ++++
> .../packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb | 1 +
> 5 files changed, 14 insertions(+)
>
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
> index 3b734554..addb4818 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
> @@ -90,14 +90,17 @@ EXTRA_PACKAGES = ""
>
> EXTRA_PACKAGES_append_omap-a15 = " \
> pdm-anomaly-detection-src \
> + demo-glow-src \
> "
>
> EXTRA_PACKAGES_append_ti33x = " \
> pdm-anomaly-detection-src \
> + demo-glow-src \
> "
>
> EXTRA_PACKAGES_append_ti43x = " \
> pdm-anomaly-detection-src \
> + demo-glow-src \
> "
>
> EXTRA_PACKAGES_append_k3 = " \
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
> index 8bce1756..d998a1eb 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
> @@ -161,16 +161,19 @@ EXTRA_PACKAGES_append_ti33x = " voxelsdk-dev \
> arm-compute-library-dev \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection-dev \
> + demo-glow-dev \
> "
> EXTRA_PACKAGES_append_ti43x = " voxelsdk-dev \
> arm-compute-library-dev \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection-dev \
> + demo-glow-dev \
> "
> EXTRA_PACKAGES_append_omap-a15 = " voxelsdk-dev \
> arm-compute-library-dev \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection-dev \
> + demo-glow-dev \
> "
> EXTRA_PACKAGES_append_k3 = " arm-compute-library-dev \
> ${ARMNN_PACKAGES} \
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> index 6558a21a..38ec3065 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> @@ -152,12 +152,14 @@ EXTRA_PACKAGES_append_ti33x = " voxelsdk \
> arm-compute-library \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection \
> + demo-glow \
> "
>
> EXTRA_PACKAGES_append_ti43x = " voxelsdk \
> arm-compute-library \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection \
> + demo-glow \
> "
>
> EXTRA_PACKAGES_append_omap-a15 = " voxelsdk \
> @@ -166,6 +168,7 @@ EXTRA_PACKAGES_append_omap-a15 = " voxelsdk \
> arm-compute-library \
> ${ARMNN_PACKAGES} \
> pdm-anomaly-detection \
> + demo-glow \
> "
>
> EXTRA_PACKAGES_append_k3 = " arm-compute-library \
> diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
> index e0d409a2..2200def1 100644
> --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
> +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
> @@ -52,6 +52,7 @@ SRC_URI = "\
> file://Makefile_sysfw-image \
> file://Makefile_mmwavegesture-hmi \
> file://Makefile_pdm-anomaly-detection \
> + file://Makefile_demo-glow \
This file does not appear to be added.
> "
>
> PR = "r95"
> @@ -98,6 +99,7 @@ MAKEFILES_append_ti33x = " u-boot-spl \
> uio-module-drv \
> mmwavegesture-hmi \
> pdm-anomaly-detection \
> + demo-glow \
> "
> MAKEFILES_append_ti43x = " u-boot-spl \
> ${QUICK_PLAYGROUND} \
> @@ -113,6 +115,7 @@ MAKEFILES_append_ti43x = " u-boot-spl \
> uio-module-drv \
> mmwavegesture-hmi \
> pdm-anomaly-detection \
> + demo-glow \
> "
>
> # debugss-module-drv
> @@ -136,6 +139,7 @@ MAKEFILES_append_omap-a15 = " u-boot-spl \
> uio-module-drv \
> mmwavegesture-hmi \
> pdm-anomaly-detection \
> + demo-glow \
> "
> MAKEFILES_append_omapl138 = " linux-dtbs \
> u-boot-spl \
> diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
> index ef54253d..28d817da 100644
> --- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
> +++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
> @@ -17,6 +17,7 @@ EXTRA_TI_TOOLS = " \
> nativesdk-tidl-viewer \
> nativesdk-tidl-utils \
> nativesdk-gcc-arm-none-eabi \
> + nativesdk-glow \
> "
>
> RDEPENDS_${PN} = "\
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [thud/master][PATCH v2 1/3] glow: Add pytorch neural network compiler and dependencies
2019-06-20 6:38 [thud/master][PATCH v2 1/3] glow: Add pytorch neural network compiler and dependencies Djordje Senicic
2019-06-20 6:38 ` [thud/master][PATCH v2 2/3] demo-glow: Add mnist inference demo based on GLOW compiler Djordje Senicic
2019-06-20 6:38 ` [thud/master][PATCH v2 3/3] glow: Add glow and demo-glow to packagegroups Djordje Senicic
@ 2019-06-21 22:27 ` Denys Dmytriyenko
2 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2019-06-21 22:27 UTC (permalink / raw)
To: Djordje Senicic; +Cc: meta-arago
On Thu, Jun 20, 2019 at 02:38:13AM -0400, Djordje Senicic wrote:
> - LLVM8 is added for GLOW compilation only (native package)
So, we are adding another toolchain and a major dependency to the build.
Moreover, OE-Core already provides LLVM 6 and we also have LLVM 3.6 for
OpenCL, so there will be 3 different versions w/o re-use. I don't feel too
good about this approach. I.e. we already have whole bunch of GCC bare metal
toolchains because different components require different versions. We need
to start unifying, otherwise it is not scalable!
Denys
> - glog and libunwind packages are also only used as native packages
>
> Signed-off-by: Djordje Senicic <x0157990@ti.com>
> ---
> ...endencies-to-intermediate-executable.patch | 99 +++++++++++++++++++
> .../recipes-devtools/glow/glow_git.bb | 63 ++++++++++++
> .../recipes-devtools/glow/llvm-glow_git.bb | 24 +++++
> .../recipes-support/glog/glog_0.3.5.bbappend | 3 +
> .../libunwind/libunwind_1.2.1.bbappend | 3 +
> 5 files changed, 192 insertions(+)
> create mode 100644 meta-arago-extras/recipes-devtools/glow/files/0001-Fix-path-and-dependencies-to-intermediate-executable.patch
> create mode 100644 meta-arago-extras/recipes-devtools/glow/glow_git.bb
> create mode 100644 meta-arago-extras/recipes-devtools/glow/llvm-glow_git.bb
> create mode 100644 meta-arago-extras/recipes-support/glog/glog_0.3.5.bbappend
> create mode 100644 meta-arago-extras/recipes-support/libunwind/libunwind_1.2.1.bbappend
>
> diff --git a/meta-arago-extras/recipes-devtools/glow/files/0001-Fix-path-and-dependencies-to-intermediate-executable.patch b/meta-arago-extras/recipes-devtools/glow/files/0001-Fix-path-and-dependencies-to-intermediate-executable.patch
> new file mode 100644
> index 00000000..cdac2b63
> --- /dev/null
> +++ b/meta-arago-extras/recipes-devtools/glow/files/0001-Fix-path-and-dependencies-to-intermediate-executable.patch
> @@ -0,0 +1,99 @@
> +From 724ed36a3efc9d48baada931feef58d831bddd3e Mon Sep 17 00:00:00 2001
> +From: Djordje Senicic <x0157990@ti.com>
> +Date: Wed, 29 May 2019 03:51:13 -0400
> +Subject: [PATCH] Fix path and dependencies to intermediate executables
> +
> +Signed-off-by: Djordje Senicic <x0157990@ti.com>
> +---
> + lib/Backends/CPU/CMakeLists.txt | 3 ++-
> + lib/Backends/OpenCL/CMakeLists.txt | 12 ++++++------
> + lib/Graph/CMakeLists.txt | 4 ++--
> + lib/IR/CMakeLists.txt | 4 ++--
> + 4 files changed, 12 insertions(+), 11 deletions(-)
> +
> +diff --git a/lib/Backends/CPU/CMakeLists.txt b/lib/Backends/CPU/CMakeLists.txt
> +index 1e734539..5b79ee7d 100644
> +--- a/lib/Backends/CPU/CMakeLists.txt
> ++++ b/lib/Backends/CPU/CMakeLists.txt
> +@@ -53,8 +53,9 @@ 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
> ++ DEPENDS ${GLOW_BINARY_DIR}/bin/include-bin
> + WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}")
> +
> + add_custom_target(CPURuntime
> +diff --git a/lib/Backends/OpenCL/CMakeLists.txt b/lib/Backends/OpenCL/CMakeLists.txt
> +index fd9f965c..e37b4b35 100644
> +--- a/lib/Backends/OpenCL/CMakeLists.txt
> ++++ b/lib/Backends/OpenCL/CMakeLists.txt
> +@@ -8,25 +8,25 @@ add_custom_target(make_opencl_dir
> +
> + add_custom_command(
> + OUTPUT "${OpenCL_DIR}/kernels.cl.inc"
> +- COMMAND include-bin
> ++ COMMAND ${GLOW_BINARY_DIR}/bin/include-bin
> + "${CMAKE_CURRENT_SOURCE_DIR}/kernels.cl"
> + "${OpenCL_DIR}/kernels.cl.inc"
> +- DEPENDS make_opencl_dir include-bin "${CMAKE_CURRENT_SOURCE_DIR}/kernels.cl")
> ++ DEPENDS make_opencl_dir ${GLOW_BINARY_DIR}/bin/include-bin "${CMAKE_CURRENT_SOURCE_DIR}/kernels.cl")
> +
> + add_custom_command(
> + OUTPUT "${OpenCL_DIR}/kernels_fwd_conv.cl.inc"
> +- COMMAND include-bin
> ++ COMMAND ${GLOW_BINARY_DIR}/bin/include-bin
> + "${CMAKE_CURRENT_SOURCE_DIR}/kernels_fwd_conv.cl"
> + "${OpenCL_DIR}/kernels_fwd_conv.cl.inc"
> +- DEPENDS make_opencl_dir include-bin
> ++ DEPENDS make_opencl_dir ${GLOW_BINARY_DIR}/bin/include-bin
> + "${CMAKE_CURRENT_SOURCE_DIR}/kernels_fwd_conv.cl")
> +
> + add_custom_command(
> + OUTPUT "${OpenCL_DIR}/kernels_fwd_quantized_conv.cl.inc"
> +- COMMAND include-bin
> ++ COMMAND ${GLOW_BINARY_DIR}/bin/include-bin
> + "${CMAKE_CURRENT_SOURCE_DIR}/kernels_fwd_quantized_conv.cl"
> + "${OpenCL_DIR}/kernels_fwd_quantized_conv.cl.inc"
> +- DEPENDS make_opencl_dir include-bin
> ++ DEPENDS make_opencl_dir ${GLOW_BINARY_DIR}/bin/include-bin
> + "${CMAKE_CURRENT_SOURCE_DIR}/kernels_fwd_quantized_conv.cl")
> +
> + add_library(OpenCLBackend
> +diff --git a/lib/Graph/CMakeLists.txt b/lib/Graph/CMakeLists.txt
> +index 84589761..02a92636 100644
> +--- a/lib/Graph/CMakeLists.txt
> ++++ b/lib/Graph/CMakeLists.txt
> +@@ -7,8 +7,8 @@ add_custom_command(OUTPUT
> + "${NODES_HDR}"
> + "${NODES_SRC}"
> + "${NODES_DEF}"
> +- COMMAND NodeGen ${NODES_HDR} ${NODES_SRC} ${NODES_DEF}
> +- DEPENDS NodeGen
> ++ COMMAND ${GLOW_BINARY_DIR}/bin/NodeGen ${NODES_HDR} ${NODES_SRC} ${NODES_DEF}
> ++ DEPENDS ${GLOW_BINARY_DIR}/bin/NodeGen
> + COMMENT "NodeGen: Generating nodes." VERBATIM)
> + add_custom_target(AutoGenNode
> + DEPENDS
> +diff --git a/lib/IR/CMakeLists.txt b/lib/IR/CMakeLists.txt
> +index 7660308d..fb5302ce 100644
> +--- a/lib/IR/CMakeLists.txt
> ++++ b/lib/IR/CMakeLists.txt
> +@@ -13,10 +13,10 @@ add_custom_command(OUTPUT
> + "${INSTR_BLD_HDR}"
> + "${INSTR_BLD_SRC}"
> + "${INSTR_IR_GEN}"
> +- COMMAND InstrGen
> ++ COMMAND ${GLOW_BINARY_DIR}/bin/InstrGen
> + "${INSTR_HDR}" "${INSTR_SRC}" "${INSTR_DEF}"
> + "${INSTR_BLD_HDR}" "${INSTR_BLD_SRC}" "${INSTR_IR_GEN}"
> +- DEPENDS InstrGen
> ++ DEPENDS ${GLOW_BINARY_DIR}/bin/InstrGen
> + COMMENT "InstrGen: Generating instructions." VERBATIM)
> + add_custom_target(AutoGenInstr
> + DEPENDS
> +--
> +2.17.1
> +
> diff --git a/meta-arago-extras/recipes-devtools/glow/glow_git.bb b/meta-arago-extras/recipes-devtools/glow/glow_git.bb
> new file mode 100644
> index 00000000..3aea4b14
> --- /dev/null
> +++ b/meta-arago-extras/recipes-devtools/glow/glow_git.bb
> @@ -0,0 +1,63 @@
> +DESCRIPTION = "Pytorch neural network compiler"
> +HOMEPAGE = "https://github.com/pytorch/glow"
> +
> +SECTION = "devel"
> +LICENSE = "Apache-2.0 & MIT"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
> +PV = "0.1+git${SRCPV}"
> +PR = "r0"
> +SRCREV_FORMAT = "glow"
> +
> +DEPENDS_class-native = "zlib zlib-native llvm-glow-native ninja-native protobuf-native libpng-native protobuf-native protobuf-c-native gflags-native glog-native"
> +DEPENDS_class-nativesdk = "ncurses protobuf libpng glow-native zlib llvm-glow-native ninja-native protobuf-native libpng-native protobuf-c-native gflags-native glog-native"
> +
> +RDEPENDS_${PN}_class-nativesdk = "libpng ncurses glog"
> +
> +SRC_URI = "git://github.com/pytorch/glow.git;protocol=https;destsuffix=git;name=glow \
> + file://0001-Fix-path-and-dependencies-to-intermediate-executable.patch \
> + git://github.com/stp/OutputCheck.git;protocol=https;destsuffix=git/tests/OutputCheck;name=outcheck \
> + git://github.com/google/benchmark.git;protocol=https;destsuffix=git/tests/googlebenchmark;name=gbench \
> + git://github.com/google/googletest.git;protocol=https;destsuffix=git/tests/googletest;name=gtest \
> + git://github.com/houseroad/foxi.git;protocol=https;destsuffix=git/thirdparty/foxi;name=foxi \
> + git://github.com/Maratyszcza/FP16.git;protocol=https;destsuffix=git/thirdparty/fp16;name=fp16 \
> + git://github.com/onnx/onnx.git;protocol=https;destsuffix=git/thirdparty/onnx;name=onnx \
> + git://github.com/google/benchmark.git;protocol=https;destsuffix=git/thirdparty/onnx/third_party/benchmark;name=onnxbench \
> + git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/thirdparty/onnx/third_party/pybind11;name=onnxpybind11 \
> + git://github.com/wjakob/clang-cindex-python3.git;protocol=https;destsuffix=git/thirdparty/onnx/third_party/pybind11/tools/clang;name=onnxclang \
> + "
> +
> +SRCREV_glow = "ba8061367aea0b472b596448018107ca6e87929e"
> +SRCREV_outcheck = "eab62a5dd5129f6a4ebfbe4bbe41d35611f7c48d"
> +SRCREV_gbench = "090faecb454fbd6e6e17a75ef8146acb037118d4"
> +SRCREV_gtest = "0c799d0436e1b6d867c1738f6ff58166d153cacc"
> +SRCREV_foxi = "b2ec1a8041879b7be98d81387a14cae895f952f4"
> +SRCREV_fp16 = "34d4bf01bbf7376f2baa71b8fa148b18524d45cf"
> +SRCREV_onnx = "50dc186b50ea512d6888aa1f47414150fd782fa0"
> +SRCREV_onnxbench = "e776aa0275e293707b6a0901e0e8d8a8a3679508"
> +SRCREV_onnxpybind11 = "a1041190c8b8ff0cd9e2f0752248ad5e3789ea0c"
> +SRCREV_onnxclang = "6a00cbc4a9b8e68b71caf7f774b3f9c753ae84d5"
> +
> +S = "${WORKDIR}/git"
> +
> +inherit pkgconfig cmake
> +
> +EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS="-Wl,-dynamic-linker=/lib64/ld-linux-x86-64.so.2 " "
> +
> +do_compile() {
> + cmake_runcmake_build --target ${OECMAKE_TARGET_COMPILE}
> +}
> +
> +do_install () {
> + install -d ${D}${datadir}/glow
> + install -d ${D}${datadir}/glow/tests/images
> + cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/bin ${D}${datadir}/glow
> + cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/tests/images/EmotionSampleImages ${D}${datadir}/glow/tests/images
> + cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/tests/images/imagenet ${D}${datadir}/glow/tests/images
> + cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/tests/images/imagenet_299 ${D}${datadir}/glow/tests/images
> + cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/tests/images/mnist ${D}${datadir}/glow/tests/images
> + cp -Prf --preserve=mode,timestamps ${WORKDIR}/build/tests/images/other ${D}${datadir}/glow/tests/images
> +}
> +
> +BBCLASSEXTEND = "native nativesdk"
> +
> +FILES_${PN} = "${datadir}"
> diff --git a/meta-arago-extras/recipes-devtools/glow/llvm-glow_git.bb b/meta-arago-extras/recipes-devtools/glow/llvm-glow_git.bb
> new file mode 100644
> index 00000000..58d392b3
> --- /dev/null
> +++ b/meta-arago-extras/recipes-devtools/glow/llvm-glow_git.bb
> @@ -0,0 +1,24 @@
> +DESCRIPTION = "LLVM release suggested for pytorch glow neural network compiler"
> +HOMEPAGE = "https://github.com/llvm-mirror/llvm"
> +SECTION = "devel"
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648"
> +PV = "8.0"
> +PR = "r0"
> +
> +DEPENDS = "ninja-native protobuf-native libpng-native protobuf-native protobuf-c-native gflags-native glog-native"
> +
> +SOLIBVER = "1"
> +
> +SRC_URI = "git://github.com/llvm-mirror/llvm.git;protocol=https;branch=release_80;rev=5563a6a769b48912b9c8052124520610966eda28;destsuffix=git/llvm \
> + git://github.com/llvm-mirror/clang.git;protocol=https;branch=release_80;rev=ccfe04576c13497b9c422ceef0b6efe99077a392;destsuffix=git/clang \
> + "
> +
> +
> +S = "${WORKDIR}/git/llvm"
> +
> +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DLLVM_INSTALL_UTILS=ON -DLLVM_ENABLE_PROJECTS=clang"
> +
> +inherit pkgconfig cmake
> +
> +BBCLASSEXTEND = "native nativesdk"
> diff --git a/meta-arago-extras/recipes-support/glog/glog_0.3.5.bbappend b/meta-arago-extras/recipes-support/glog/glog_0.3.5.bbappend
> new file mode 100644
> index 00000000..5e64501c
> --- /dev/null
> +++ b/meta-arago-extras/recipes-support/glog/glog_0.3.5.bbappend
> @@ -0,0 +1,3 @@
> +PR_append = ".arago0"
> +
> +BBCLASSEXTEND += "native nativesdk"
> diff --git a/meta-arago-extras/recipes-support/libunwind/libunwind_1.2.1.bbappend b/meta-arago-extras/recipes-support/libunwind/libunwind_1.2.1.bbappend
> new file mode 100644
> index 00000000..4ad6ebc2
> --- /dev/null
> +++ b/meta-arago-extras/recipes-support/libunwind/libunwind_1.2.1.bbappend
> @@ -0,0 +1,3 @@
> +PR_append = ".arago0"
> +
> +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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-06-21 22:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-20 6:38 [thud/master][PATCH v2 1/3] glow: Add pytorch neural network compiler and dependencies Djordje Senicic
2019-06-20 6:38 ` [thud/master][PATCH v2 2/3] demo-glow: Add mnist inference demo based on GLOW compiler Djordje Senicic
2019-06-20 6:38 ` [thud/master][PATCH v2 3/3] glow: Add glow and demo-glow to packagegroups Djordje Senicic
2019-06-21 15:26 ` [EXTERNAL] " Jacob Stiffler
2019-06-21 15:44 ` Senicic, Djordje
2019-06-21 22:27 ` [thud/master][PATCH v2 1/3] glow: Add pytorch neural network compiler and dependencies Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.