Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tensorflow-lite fixes #85

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

tensorflow-lite fixes #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19bba66
tensorflow-lite: factorize library
vivien Aug 15, 2023
664b565
neuralnetwork: add compat layer for mickledore
vivien Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conf/layer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ BBFILE_COLLECTIONS += "neuralnetwork"
BBFILE_PATTERN_neuralnetwork = "^${LAYERDIR}/"
BBFILE_PRIORITY_neuralnetwork = "7"
LAYERVERSION_neuralnetwork = "6"
LAYERSERIES_COMPAT_neuralnetwork = "kirkstone langdale"
LAYERSERIES_COMPAT_neuralnetwork = "kirkstone langdale mickledore"
6 changes: 0 additions & 6 deletions recipes-tensorflow/tensorflow-lite/files/tensorflow2-lite.pc.in
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions recipes-tensorflow/tensorflow-lite/tensorflow-lite_2.11.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SRC_URI = " \
file://0001-change-flatbuffers-version.patch \
file://0001-build-Add-bundle-static-lib-script-in-CMakeLists.txt.patch \
file://0001-build-Remove-mcpu-flag-when-build-XNNPACK.patch \
file://tensorflow2-lite.pc.in \
file://tensorflow-lite.pc.in \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a few systems that install both tf-lite 1.x and tf2-lite 2.x, which forced us to install this file as tensorflow2-lite.pc.

For your needs, I'd recommend to make a "meta package" that creates symbolic links from tensorflow2-lite* to tensorflow-lite* for the compatibility of both tensorflow2* users and tensorflow* users.

Copy link
Contributor Author

@vivien vivien Aug 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I replied in the PR conversation for clarity ;)

"

inherit cmake
Expand All @@ -31,9 +31,9 @@ do_compile[network] = "1"
do_install() {
# install libraries
install -d ${D}${libdir}
install -m 0644 ${B}/libtensorflow-lite-bundled.a ${D}${libdir}/libtensorflow2-lite.a
install -m 0644 ${B}/libtensorflow-lite-bundled.a ${D}${libdir}/libtensorflow-lite.a
install -d ${D}${libdir}/pkgconfig
install -m 0644 ${WORKDIR}/tensorflow2-lite.pc.in ${D}${libdir}/pkgconfig/tensorflow2-lite.pc
install -m 0644 ${WORKDIR}/tensorflow-lite.pc.in ${D}${libdir}/pkgconfig/tensorflow-lite.pc

# install header files
install -d ${D}${includedir}/tensorflow/lite
Expand All @@ -48,7 +48,7 @@ do_install() {

sed -i 's:@version@:${PV}:g
s:@libdir@:${libdir}:g
s:@includedir@:${includedir}:g' ${D}${libdir}/pkgconfig/tensorflow2-lite.pc
s:@includedir@:${includedir}:g' ${D}${libdir}/pkgconfig/tensorflow-lite.pc

# flatbuffers
install -d ${D}${includedir}/flatbuffers
Expand Down