* [thud/master] [PATCH v2] armnn: add installation of header files and .so links
@ 2019-08-22 20:59 Jianzhong Xu
2019-08-23 21:48 ` Xu, Jianzhong
0 siblings, 1 reply; 2+ messages in thread
From: Jianzhong Xu @ 2019-08-22 20:59 UTC (permalink / raw)
To: meta-arago
* Install header files that are needed to build tidl-api examples
* Add armnn-dev to packagegroups to include armnn*.so links in file system for building armnn applications on the target
* Rename TESTVECS_INSTALL_DIR to ARMNN_INSTALL_DIR
Signed-off-by: Jianzhong Xu <xuj@ti.com>
---
.../packagegroup-arago-tisdk-addons.bb | 5 +++-
.../recipes-support/armnn/armnn_git.bb | 25 +++++++++++++------
2 files changed, 21 insertions(+), 9 deletions(-)
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 eb39cadf..ac3835bd 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
@@ -147,7 +147,10 @@ EXTRA_PACKAGES_omapl138 = " \
protobuf \
"
-ARMNN_PACKAGES = "armnn"
+ARMNN_PACKAGES = " \
+ armnn \
+ armnn-dev \
+"
EXTRA_PACKAGES_append_ti33x = " voxelsdk \
arm-compute-library \
diff --git a/meta-arago-extras/recipes-support/armnn/armnn_git.bb b/meta-arago-extras/recipes-support/armnn/armnn_git.bb
index 076ea3aa..76875ee3 100644
--- a/meta-arago-extras/recipes-support/armnn/armnn_git.bb
+++ b/meta-arago-extras/recipes-support/armnn/armnn_git.bb
@@ -65,25 +65,34 @@ EXTRA_OECMAKE=" \
-DGENERIC_LIB_VERSION=${PV} -DGENERIC_LIB_SOVERSION=${PV_MAJOR} \
"
-TESTVECS_INSTALL_DIR = "${datadir}/arm/armnn"
+ARMNN_INSTALL_DIR = "${datadir}/arm/armnn"
do_install_append() {
CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
install -d ${D}${bindir}
find ${WORKDIR}/build/tests -maxdepth 1 -type f -executable -exec cp $CP_ARGS {} ${D}${bindir} \;
cp $CP_ARGS ${WORKDIR}/build/UnitTests ${D}${bindir}
- install -d ${D}${TESTVECS_INSTALL_DIR}/models
- cp ${WORKDIR}/tfmodel/mobilenet_v1_1.0_224_frozen.pb ${D}${TESTVECS_INSTALL_DIR}/models
- cp ${WORKDIR}/git/tests/TfMobileNet-Armnn/labels.txt ${D}${TESTVECS_INSTALL_DIR}/models
- install -d ${D}${TESTVECS_INSTALL_DIR}/testvecs
- cp ${WORKDIR}/tidl-api/examples/classification/clips/*.mp4 ${D}${TESTVECS_INSTALL_DIR}/testvecs
- cp ${WORKDIR}/tidl-api/examples/classification/images/*.jpg ${D}${TESTVECS_INSTALL_DIR}/testvecs
+ install -d ${D}${ARMNN_INSTALL_DIR}/models
+ cp ${WORKDIR}/tfmodel/mobilenet_v1_1.0_224_frozen.pb ${D}${ARMNN_INSTALL_DIR}/models
+ cp ${WORKDIR}/git/tests/TfMobileNet-Armnn/labels.txt ${D}${ARMNN_INSTALL_DIR}/models
+ install -d ${D}${ARMNN_INSTALL_DIR}/testvecs
+ cp ${WORKDIR}/tidl-api/examples/classification/clips/*.mp4 ${D}${ARMNN_INSTALL_DIR}/testvecs
+ cp ${WORKDIR}/tidl-api/examples/classification/images/*.jpg ${D}${ARMNN_INSTALL_DIR}/testvecs
+ cp $CP_ARGS ${WORKDIR}/git/include ${D}${ARMNN_INSTALL_DIR}
+ install -d ${D}${ARMNN_INSTALL_DIR}/src/armnn
+ cp ${WORKDIR}/git/src/armnn/*.hpp ${D}${ARMNN_INSTALL_DIR}/src/armnn
+ install -d ${D}${ARMNN_INSTALL_DIR}/src/armnnUtils
+ cp ${WORKDIR}/git/src/armnnUtils/{CsvReader.hpp,HeapProfiling.hpp,Logging.hpp,TensorIOUtils.hpp} ${D}${ARMNN_INSTALL_DIR}/src/armnnUtils
+ install -d ${D}${ARMNN_INSTALL_DIR}/src/backends/backendsCommon
+ cp ${WORKDIR}/git/src/backends/backendsCommon/BackendRegistry.hpp ${D}${ARMNN_INSTALL_DIR}/src/backends/backendsCommon
+ install -d ${D}${ARMNN_INSTALL_DIR}/tests
+ cp ${WORKDIR}/git/tests/{InferenceModel.hpp,InferenceTest.hpp,InferenceTest.inl} ${D}${ARMNN_INSTALL_DIR}/tests
chrpath -d ${D}${bindir}/*
}
CXXFLAGS += "-fopenmp"
LIBS += "-larmpl_lp64_mp"
-FILES_${PN} += "${TESTVECS_INSTALL_DIR}"
+FILES_${PN} += "${ARMNN_INSTALL_DIR}"
FILES_${PN}-dev += "{libdir}/cmake/*"
INSANE_SKIP_${PN}-dev = "dev-elf"
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [thud/master] [PATCH v2] armnn: add installation of header files and .so links
2019-08-22 20:59 [thud/master] [PATCH v2] armnn: add installation of header files and .so links Jianzhong Xu
@ 2019-08-23 21:48 ` Xu, Jianzhong
0 siblings, 0 replies; 2+ messages in thread
From: Xu, Jianzhong @ 2019-08-23 21:48 UTC (permalink / raw)
To: meta-arago
NACK
Please discard this patch as development plan has changed.
On 8/22/2019 4:59 PM, Jianzhong Xu wrote:
> * Install header files that are needed to build tidl-api examples
> * Add armnn-dev to packagegroups to include armnn*.so links in file system for building armnn applications on the target
> * Rename TESTVECS_INSTALL_DIR to ARMNN_INSTALL_DIR
>
> Signed-off-by: Jianzhong Xu <xuj@ti.com>
> ---
> .../packagegroup-arago-tisdk-addons.bb | 5 +++-
> .../recipes-support/armnn/armnn_git.bb | 25 +++++++++++++------
> 2 files changed, 21 insertions(+), 9 deletions(-)
>
> 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 eb39cadf..ac3835bd 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
> @@ -147,7 +147,10 @@ EXTRA_PACKAGES_omapl138 = " \
> protobuf \
> "
>
> -ARMNN_PACKAGES = "armnn"
> +ARMNN_PACKAGES = " \
> + armnn \
> + armnn-dev \
> +"
>
> EXTRA_PACKAGES_append_ti33x = " voxelsdk \
> arm-compute-library \
> diff --git a/meta-arago-extras/recipes-support/armnn/armnn_git.bb b/meta-arago-extras/recipes-support/armnn/armnn_git.bb
> index 076ea3aa..76875ee3 100644
> --- a/meta-arago-extras/recipes-support/armnn/armnn_git.bb
> +++ b/meta-arago-extras/recipes-support/armnn/armnn_git.bb
> @@ -65,25 +65,34 @@ EXTRA_OECMAKE=" \
> -DGENERIC_LIB_VERSION=${PV} -DGENERIC_LIB_SOVERSION=${PV_MAJOR} \
> "
>
> -TESTVECS_INSTALL_DIR = "${datadir}/arm/armnn"
> +ARMNN_INSTALL_DIR = "${datadir}/arm/armnn"
>
> do_install_append() {
> CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
> install -d ${D}${bindir}
> find ${WORKDIR}/build/tests -maxdepth 1 -type f -executable -exec cp $CP_ARGS {} ${D}${bindir} \;
> cp $CP_ARGS ${WORKDIR}/build/UnitTests ${D}${bindir}
> - install -d ${D}${TESTVECS_INSTALL_DIR}/models
> - cp ${WORKDIR}/tfmodel/mobilenet_v1_1.0_224_frozen.pb ${D}${TESTVECS_INSTALL_DIR}/models
> - cp ${WORKDIR}/git/tests/TfMobileNet-Armnn/labels.txt ${D}${TESTVECS_INSTALL_DIR}/models
> - install -d ${D}${TESTVECS_INSTALL_DIR}/testvecs
> - cp ${WORKDIR}/tidl-api/examples/classification/clips/*.mp4 ${D}${TESTVECS_INSTALL_DIR}/testvecs
> - cp ${WORKDIR}/tidl-api/examples/classification/images/*.jpg ${D}${TESTVECS_INSTALL_DIR}/testvecs
> + install -d ${D}${ARMNN_INSTALL_DIR}/models
> + cp ${WORKDIR}/tfmodel/mobilenet_v1_1.0_224_frozen.pb ${D}${ARMNN_INSTALL_DIR}/models
> + cp ${WORKDIR}/git/tests/TfMobileNet-Armnn/labels.txt ${D}${ARMNN_INSTALL_DIR}/models
> + install -d ${D}${ARMNN_INSTALL_DIR}/testvecs
> + cp ${WORKDIR}/tidl-api/examples/classification/clips/*.mp4 ${D}${ARMNN_INSTALL_DIR}/testvecs
> + cp ${WORKDIR}/tidl-api/examples/classification/images/*.jpg ${D}${ARMNN_INSTALL_DIR}/testvecs
> + cp $CP_ARGS ${WORKDIR}/git/include ${D}${ARMNN_INSTALL_DIR}
> + install -d ${D}${ARMNN_INSTALL_DIR}/src/armnn
> + cp ${WORKDIR}/git/src/armnn/*.hpp ${D}${ARMNN_INSTALL_DIR}/src/armnn
> + install -d ${D}${ARMNN_INSTALL_DIR}/src/armnnUtils
> + cp ${WORKDIR}/git/src/armnnUtils/{CsvReader.hpp,HeapProfiling.hpp,Logging.hpp,TensorIOUtils.hpp} ${D}${ARMNN_INSTALL_DIR}/src/armnnUtils
> + install -d ${D}${ARMNN_INSTALL_DIR}/src/backends/backendsCommon
> + cp ${WORKDIR}/git/src/backends/backendsCommon/BackendRegistry.hpp ${D}${ARMNN_INSTALL_DIR}/src/backends/backendsCommon
> + install -d ${D}${ARMNN_INSTALL_DIR}/tests
> + cp ${WORKDIR}/git/tests/{InferenceModel.hpp,InferenceTest.hpp,InferenceTest.inl} ${D}${ARMNN_INSTALL_DIR}/tests
> chrpath -d ${D}${bindir}/*
> }
>
> CXXFLAGS += "-fopenmp"
> LIBS += "-larmpl_lp64_mp"
>
> -FILES_${PN} += "${TESTVECS_INSTALL_DIR}"
> +FILES_${PN} += "${ARMNN_INSTALL_DIR}"
> FILES_${PN}-dev += "{libdir}/cmake/*"
> INSANE_SKIP_${PN}-dev = "dev-elf"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-23 21:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-22 20:59 [thud/master] [PATCH v2] armnn: add installation of header files and .so links Jianzhong Xu
2019-08-23 21:48 ` Xu, Jianzhong
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.