From 19bba6638b89b1ab3b8f16eaa799e47041432461 Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Tue, 15 Aug 2023 16:28:02 -0400 Subject: [PATCH 1/2] tensorflow-lite: factorize library Do not install the tensorflow-lite 2.* library as tensorflow2-lite because packages will expect libtensorflow-lite.a and tensorflow-lite.pc. This also allows us to use the same pkg-config file. Signed-off-by: Vivien Didelot --- .../tensorflow-lite/files/tensorflow2-lite.pc.in | 6 ------ .../tensorflow-lite/tensorflow-lite_2.11.0.bb | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 recipes-tensorflow/tensorflow-lite/files/tensorflow2-lite.pc.in diff --git a/recipes-tensorflow/tensorflow-lite/files/tensorflow2-lite.pc.in b/recipes-tensorflow/tensorflow-lite/files/tensorflow2-lite.pc.in deleted file mode 100644 index 5028e58..0000000 --- a/recipes-tensorflow/tensorflow-lite/files/tensorflow2-lite.pc.in +++ /dev/null @@ -1,6 +0,0 @@ - Name: tensorflow lite - Description: tensorflow lite static library - Version: @version@ - Requires: - Libs: -L@libdir@ -ltensorflow2-lite -lrt - Cflags: -I@includedir@ diff --git a/recipes-tensorflow/tensorflow-lite/tensorflow-lite_2.11.0.bb b/recipes-tensorflow/tensorflow-lite/tensorflow-lite_2.11.0.bb index 0f786f1..5e00f9b 100644 --- a/recipes-tensorflow/tensorflow-lite/tensorflow-lite_2.11.0.bb +++ b/recipes-tensorflow/tensorflow-lite/tensorflow-lite_2.11.0.bb @@ -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 \ " inherit cmake @@ -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 @@ -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 From 664b5656944dc1a25819965bf9e78c014ae0cf62 Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Tue, 15 Aug 2023 16:34:27 -0400 Subject: [PATCH 2/2] neuralnetwork: add compat layer for mickledore Add mickledore to the list of supported version. Signed-off-by: Vivien Didelot --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index c58da54..33e3c6b 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -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"