TensorFlow version 2.18.0

NobuoTsukamoto · NobuoTsukamoto · commit 3ed5cd01d75a · 2024-10-26T17:33:41.000+09:00
diff --git a/.github/workflows/build_riscv.yml b/.github/workflows/build_riscv.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         target_machine: [qemuriscv64, qemuriscv32]
-        tensorflow_version: [2.16.1]
+        tensorflow_version: [2.18.0]
         
     # The type of runner that the job will run on
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/build_rpi.yml b/.github/workflows/build_rpi.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         target_machine: [raspberrypi-cm, raspberrypi-cm3, raspberrypi, raspberrypi0-2w-64, raspberrypi0-wifi, raspberrypi0, raspberrypi2, raspberrypi3-64, raspberrypi3, raspberrypi4-64, raspberrypi4, raspberrypi5]
-        tensorflow_version: [2.16.1]
+        tensorflow_version: [2.18.0]
       fail-fast: false
 
     # The type of runner that the job will run on
diff --git a/README.md b/README.md
@@ -24,11 +24,11 @@ Please note that it is not official support.
 ## Available recipes
 - framework
   - python3-tensorflow-lite  
-    [Python3 interpreter](recipes-framework/tensorflow-lite/python3-tensorflow-lite_2.16.1.bb)
+    [Python3 interpreter](recipes-framework/tensorflow-lite/python3-tensorflow-lite_2.18.0.bb)
   - libtensorflow-lite  
-    [C++ API shared library](recipes-framework/tensorflow-lite/libtensorflow-lite_2.16.1.bb)
+    [C++ API shared library](recipes-framework/tensorflow-lite/libtensorflow-lite_2.18.0.bb)
   - libtensorflow-lite-c  
-    [C API shared library](recipes-framework/tensorflow-lite/libtensorflow-lite-c_2.16.1.bb)
+    [C API shared library](recipes-framework/tensorflow-lite/libtensorflow-lite-c_2.18.0.bb)
   - libedgetpu-max / libedgetpu-std  
     [bitbake with libedgetpu](./doc/coral_libedgetpu.md)
 - examples
@@ -45,7 +45,7 @@ Please note that it is not official support.
 ### Support version
 | Recipe          | Version |
 | :--             | :--     |
-| TensorFlow Lite | v2.17.0  |
+| TensorFlow Lite | v2.18.0  |
 | libedgetpu      | e35aed18fea2e2d25d98352e5a5bd357c170bd4d |
 | FlatBuffers     | v23.5.26 |
 
diff --git a/doc/python3-tensorflow-lite-example.md b/doc/python3-tensorflow-lite-example.md
@@ -2,7 +2,7 @@
 
 ## Reference
 
-- [TensorFlow Lite Python image classification demo - tensorflow/tensorflow](https://github.com/tensorflow/tensorflow/blob/v2.16.1/tensorflow/lite/examples/python/README.md)
+- [TensorFlow Lite Python image classification demo - tensorflow/tensorflow](https://github.com/tensorflow/tensorflow/blob/v2.18.0/tensorflow/lite/examples/python/README.md)
 
 ## How to
 Build sample on Raspberry Pi 4 AArch64 (core-image-weston).
@@ -68,4 +68,4 @@ time: 369.129ms
 ## Code changes
 The original code imports `tensorflow`. I am changing this to import `tflite_runtime.interpreter`. This has been modified to work with TensorFlow Lite.  
 See below for changes to the original code.
-- [001-v2.15_label_image_py.patch](recipes-examples/tensorflow-lite/python/files/001-v2.15_label_image_py.patch)
+- [001-label_image_py.patch](recipes-examples/tensorflow-lite/python/files/001-label_image_py.patch)
diff --git a/doc/tensorflow-lite-benchmark.md b/doc/tensorflow-lite-benchmark.md
@@ -2,7 +2,7 @@
 
 ## Reference
 
-- [TFLite Model Benchmark Tool with C++ Binary - tensorflow/tensorflow](https://github.com/tensorflow/tensorflow/blob/v2.16.1/tensorflow/lite/tools/benchmark/README.md)
+- [TFLite Model Benchmark Tool with C++ Binary - tensorflow/tensorflow](https://github.com/tensorflow/tensorflow/blob/v2.18.0/tensorflow/lite/tools/benchmark/README.md)
 
 ## How to
 Build sample on qemueriscv64 (core-image-full-cmdline).
diff --git a/doc/tensorflow-lite-label-image.md b/doc/tensorflow-lite-label-image.md
@@ -2,7 +2,7 @@
 
 ## Reference
 
-- [TensorFlow Lite C++ image classification demo - tensorflow/tensorflow](https://github.com/tensorflow/tensorflow/blob/v2.16.1/tensorflow/lite/examples/label_image/README.md)
+- [TensorFlow Lite C++ image classification demo - tensorflow/tensorflow](https://github.com/tensorflow/tensorflow/blob/v2.18.0/tensorflow/lite/examples/label_image/README.md)
 
 ## How to
 Build sample on qemueriscv64 (core-image-full-cmdline).
@@ -73,6 +73,6 @@ The original sample CMake statically links tensorflow-lite.
 In this recipe, we will modify CMake to link the shared library (libtensorflow-lite.so) and change the include path of the header file so that it can be built independently.  
 
 For more information about the changes in CMake and source, please refer to the following patch.
-- [001-v2.15_label_image_cpp.patch](../recipes-examples/tensorflow-lite/files/001-v2.15_label_image_cpp.patch)
+- [001-label_image_cpp.patch](../recipes-examples/tensorflow-lite/files/001-label_image_cpp.patch)
 
-See [libtensorflow-lite](../recipes-framework/tensorflow-lite/libtensorflow-lite_2.16.1.bb) for a recipe to build a shared library for libtensorflow-lite.so.
+See [libtensorflow-lite](../recipes-framework/tensorflow-lite/libtensorflow-lite_2.18.0.bb) for a recipe to build a shared library for libtensorflow-lite.so.
diff --git a/doc/tensorflow-lite-minimal.md b/doc/tensorflow-lite-minimal.md
@@ -2,7 +2,7 @@
 
 ## Reference
 
-- [TensorFlow Lite C++ minimal example - tensorflow/tensorflow](https://github.com/tensorflow/tensorflow/blob/v2.16.1/tensorflow/lite/examples/minimal/README.md)
+- [TensorFlow Lite C++ minimal example - tensorflow/tensorflow](https://github.com/tensorflow/tensorflow/blob/v2.18.0/tensorflow/lite/examples/minimal/README.md)
 
 ## How to
 Build sample on Raspberry Pi 4 AArch64 (core-image-weston).
@@ -71,6 +71,6 @@ The original sample CMake statically links tensorflow-lite.
 In this recipe, we will modify CMake to link the shared library (libtensorflow-lite.so) so that it can be built independently.  
 
 For more information about the changes in CMake, please refer to the following patch.
-- [001-v2.15_minimal_cmake.patch](../recipes-examples/tensorflow-lite/files/001-v2.15_minimal_cmake.patch)
+- [001-minimal_cmake.patch](../recipes-examples/tensorflow-lite/files/001-minimal_cmake.patch)
 
-See [libtensorflow-lite](../recipes-framework/tensorflow-lite/libtensorflow-lite_2.16.1.bb) for a recipe to build a shared library for libtensorflow-lite.so.
+See [libtensorflow-lite](../recipes-framework/tensorflow-lite/libtensorflow-lite_2.18.0.bb) for a recipe to build a shared library for libtensorflow-lite.so.
diff --git a/recipes-examples/tensorflow-lite/files/001-label_image_cpp.patch b/recipes-examples/tensorflow-lite/files/001-label_image_cpp.patch
@@ -1,7 +1,7 @@
 Upstream-Status: Pending
 
 diff --git a/tensorflow/lite/examples/label_image/CMakeLists.txt b/tensorflow/lite/examples/label_image/CMakeLists.txt
-index 9874801f34f..545ceec2381 100644
+index 2fcb09ce96e..48b24f15f6b 100644
 --- a/tensorflow/lite/examples/label_image/CMakeLists.txt
 +++ b/tensorflow/lite/examples/label_image/CMakeLists.txt
 @@ -15,12 +15,27 @@
@@ -36,7 +36,7 @@ index 9874801f34f..545ceec2381 100644
    ${XLA_SOURCE_DIR}/xla/tsl/util/stats_calculator.cc
    ${TFLITE_SOURCE_DIR}/profiling/memory_info.cc
    ${TFLITE_SOURCE_DIR}/profiling/profile_summarizer.cc
-@@ -42,20 +57,18 @@ else()
+@@ -42,14 +57,6 @@ else()
    set(TFLITE_LABEL_IMAGE_CC_OPTIONS "-DTFLITE_WITHOUT_XNNPACK")
  endif()  # TFLITE_ENABLE_XNNPACK
  
@@ -51,25 +51,14 @@ index 9874801f34f..545ceec2381 100644
  if(TFLITE_ENABLE_GPU)
    list(APPEND TFLITE_LABEL_IMAGE_SRCS
      ${TFLITE_SOURCE_DIR}/tools/delegates/gpu_delegate_provider.cc
-   )
- endif()  # TFLITE_ENABLE_GPU
- 
-+include_directories(label_image
-+  PUBLIC
-+  ${CMAKE_BINARY_DIR}
+@@ -64,6 +71,7 @@ endif()
+ include_directories(label_image
+   PUBLIC
+   ${CMAKE_BINARY_DIR}
 +  ${TFLITE_SOURCE_DIR}/examples
-+)
-+
- if(TFLITE_ENABLE_EXTERNAL_DELEGATE)
-   list(APPEND TFLITE_LABEL_IMAGE_SRCS
-           ${TFLITE_SOURCE_DIR}/tools/delegates/external_delegate_provider.cc)
-@@ -78,4 +91,6 @@ target_compile_options(label_image
- )
- target_link_libraries(label_image
-   tensorflow-lite
-+  profiling_info_proto
-+  protobuf
  )
+ 
+ add_executable(label_image
 diff --git a/tensorflow/lite/examples/label_image/bitmap_helpers.cc b/tensorflow/lite/examples/label_image/bitmap_helpers.cc
 index d3698f3b222..c9954126e9d 100644
 --- a/tensorflow/lite/examples/label_image/bitmap_helpers.cc
diff --git a/recipes-examples/tensorflow-lite/python3-tensorflow-lite-example_2.18.0.bb b/recipes-examples/tensorflow-lite/python3-tensorflow-lite-example_2.18.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4158a261ca7f2525513e31ba9c50ae98"
 BPV = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 DPV = "${@'.'.join(d.getVar('PV').split('.')[0:3])}"
 
-SRCREV_tensorflow = "ad6d8cc177d0c868982e39e0823d0efbfb95f04c"
+SRCREV_tensorflow = "6550e4bd80223cdb8be6c3afd1f81e86a4d433c3"
 
 SRC_URI[model.sha256sum] = "1ccb74dbd9c5f7aea879120614e91617db9534bdfaa53dfea54b7c14162e126b"
 SRC_URI[label.sha256sum] = "366a2d53008df0d2a82b375e2020bbc57e43bbe19971370e47b7f74ea0aaab91"
diff --git a/recipes-examples/tensorflow-lite/tensorflow-lite-label-image_2.18.0.bb b/recipes-examples/tensorflow-lite/tensorflow-lite-label-image_2.18.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4158a261ca7f2525513e31ba9c50ae98"
 BPV = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 DPV = "${@'.'.join(d.getVar('PV').split('.')[0:3])}"
 
-SRCREV_tensorflow = "ad6d8cc177d0c868982e39e0823d0efbfb95f04c"
+SRCREV_tensorflow = "6550e4bd80223cdb8be6c3afd1f81e86a4d433c3"
 
 SRC_URI[model.sha256sum] = "1ccb74dbd9c5f7aea879120614e91617db9534bdfaa53dfea54b7c14162e126b"
 SRC_URI[label.sha256sum] = "366a2d53008df0d2a82b375e2020bbc57e43bbe19971370e47b7f74ea0aaab91"
diff --git a/recipes-examples/tensorflow-lite/tensorflow-lite-minimal_2.18.0.bb b/recipes-examples/tensorflow-lite/tensorflow-lite-minimal_2.18.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4158a261ca7f2525513e31ba9c50ae98"
 BPV = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 DPV = "${@'.'.join(d.getVar('PV').split('.')[0:3])}"
 
-SRCREV_tensorflow = "ad6d8cc177d0c868982e39e0823d0efbfb95f04c"
+SRCREV_tensorflow = "6550e4bd80223cdb8be6c3afd1f81e86a4d433c3"
 
 SRC_URI[model.sha256sum] = "1ccb74dbd9c5f7aea879120614e91617db9534bdfaa53dfea54b7c14162e126b"
 
diff --git a/recipes-framework/coral/libedgetpu-common.inc b/recipes-framework/coral/libedgetpu-common.inc
@@ -7,11 +7,11 @@ PV = "grouper"
 SRCREV_FORMAT = "libedgetpu_tensorflow"
 
 SRCREV_libedgetpu = "e35aed18fea2e2d25d98352e5a5bd357c170bd4d"
-SRCREV_tensorflow = "ad6d8cc177d0c868982e39e0823d0efbfb95f04c"
+SRCREV_tensorflow = "6550e4bd80223cdb8be6c3afd1f81e86a4d433c3"
 
 SRC_URI = " \
     git://github.com/google-coral/libedgetpu.git;name=libedgetpu;branch="master";protocol=https \
-    git://github.com/tensorflow/tensorflow.git;name=tensorflow;destsuffix=tensorflow;branch=r2.17;protocol=https \
+    git://github.com/tensorflow/tensorflow.git;name=tensorflow;destsuffix=tensorflow;branch=r2.18;protocol=https \
     file://001-libedgetpu_makefile.patch \
 "
 
diff --git a/recipes-framework/tensorflow-lite/files/001-Add-Wno-incompatible-pointer-types-flag-to-xnnpack.cmake.patch b/recipes-framework/tensorflow-lite/files/001-Add-Wno-incompatible-pointer-types-flag-to-xnnpack.cmake.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Pending
+
+diff --git a/tensorflow/lite/tools/cmake/modules/xnnpack.cmake b/tensorflow/lite/tools/cmake/modules/xnnpack.cmake
+index 0bf6fc80f62..699e88043d4 100644
+--- a/tensorflow/lite/tools/cmake/modules/xnnpack.cmake
++++ b/tensorflow/lite/tools/cmake/modules/xnnpack.cmake
+@@ -37,6 +37,7 @@ endif()
+ # dependencies by TFLite.
+ set(XNNPACK_BUILD_TESTS OFF CACHE BOOL "Disable XNNPACK test.")
+ set(XNNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "Disable XNNPACK benchmarks.")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types")
+ 
+ # The following line adds project of PTHREADPOOL, FP16 and XNNPACK which are
+ # needed to compile XNNPACK delegate of TFLite.
diff --git a/recipes-framework/tensorflow-lite/files/001-Disable-XNNPACK-RISC-V-Vector-micro-kernels.patch b/recipes-framework/tensorflow-lite/files/001-Disable-XNNPACK-RISC-V-Vector-micro-kernels.patch
@@ -1,12 +1,12 @@
 Upstream-Status: Inappropriate [https://twitter.com/MaratDukhan/status/1632582746823446529]
 
 diff --git a/tensorflow/lite/tools/cmake/modules/xnnpack.cmake b/tensorflow/lite/tools/cmake/modules/xnnpack.cmake
-index eeb86758d63..ba133f9b71c 100644
+index 699e88043d4..ca5c6294d99 100644
 --- a/tensorflow/lite/tools/cmake/modules/xnnpack.cmake
 +++ b/tensorflow/lite/tools/cmake/modules/xnnpack.cmake
-@@ -38,6 +38,9 @@ endif()
- set(XNNPACK_BUILD_TESTS OFF CACHE BOOL "Disable XNNPACK test.")
+@@ -39,6 +39,9 @@ set(XNNPACK_BUILD_TESTS OFF CACHE BOOL "Disable XNNPACK test.")
  set(XNNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "Disable XNNPACK benchmarks.")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types")
  
 +# https://twitter.com/MaratDukhan/status/1632582746823446529
 +set(XNNPACK_ENABLE_RISCV_VECTOR OFF CACHE BOOL "Disable Build XNNPACK with RISC-V Vector micro-kernels.")
diff --git a/recipes-framework/tensorflow-lite/files/001-Fix-RISCV-cpuinfo.patch b/recipes-framework/tensorflow-lite/files/001-Fix-RISCV-cpuinfo.patch
diff --git a/recipes-framework/tensorflow-lite/files/001-Set-CMAKE-SYSTEM-PROCESSOR.patch b/recipes-framework/tensorflow-lite/files/001-Set-CMAKE-SYSTEM-PROCESSOR.patch
@@ -1,14 +1,15 @@
 Upstream-Status: Pending
 
 diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt
-index a61f537365a..e8b6cce7d67 100644
+index bce9627fbd3..205a9a9940b 100644
 --- a/tensorflow/lite/CMakeLists.txt
 +++ b/tensorflow/lite/CMakeLists.txt
-@@ -82,6 +82,7 @@ if(TFLITE_KERNEL_TEST AND ${CMAKE_CROSSCOMPILING})
-                         Please specify it using -DTFLITE_HOST_TOOLS_DIR=<flatc_dir_path> launch argument.")
-   endif()
+@@ -100,6 +100,7 @@ else()
+   set(FLATBUFFERS_FLATC_EXECUTABLE "${CMAKE_BINARY_DIR}/flatbuffers-flatc/bin/flatc")
+   set(FLATC_TARGET "flatbuffers-flatc")
  endif()
 +set(CMAKE_SYSTEM_PROCESSOR ${TENSORFLOW_TARGET_ARCH})
  
  set(CMAKE_CXX_STANDARD 17)
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
diff --git a/recipes-framework/tensorflow-lite/libtensorflow-lite-c_2.18.0.bb b/recipes-framework/tensorflow-lite/libtensorflow-lite-c_2.18.0.bb
@@ -6,24 +6,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4158a261ca7f2525513e31ba9c50ae98"
 BPV = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 DPV = "${@'.'.join(d.getVar('PV').split('.')[0:3])}"
 
-SRCREV_tensorflow = "ad6d8cc177d0c868982e39e0823d0efbfb95f04c"
+SRCREV_tensorflow = "6550e4bd80223cdb8be6c3afd1f81e86a4d433c3"
 
 SRC_URI = " \
     git://github.com/tensorflow/tensorflow.git;name=tensorflow;branch=r${BPV};protocol=https \
     file://001-Set-CMAKE-SYSTEM-PROCESSOR.patch \
     file://001-Fix-neon-sse-file-name-filter.patch \
     file://001-protobuf.cmake.patch \
+    file://001-Add-Wno-incompatible-pointer-types-flag-to-xnnpack.cmake.patch \
 "
 
 SRC_URI:append:riscv32 = " \
     file://001-RISCV32_pthreads.patch \
     file://001-Disable-XNNPACK-RISC-V-Vector-micro-kernels.patch \
-    file://001-Fix-RISCV-cpuinfo.patch \
 "
 
 SRC_URI:append:riscv64 = " \
     file://001-Disable-XNNPACK-RISC-V-Vector-micro-kernels.patch \
-    file://001-Fix-RISCV-cpuinfo.patch \
 "
 
 inherit cmake
@@ -35,6 +34,7 @@ DEPENDS = " \
     libeigen \
     abseil-cpp \
     protobuf-native \
+    flatbuffers-native \
 "
 
 OECMAKE_SOURCEPATH = "${S}/tensorflow/lite/c"
@@ -71,6 +71,7 @@ TENSORFLOW_TARGET_ARCH:riscv64 = "riscv64"
 EXTRA_OECMAKE:append = " \
   -DFETCHCONTENT_FULLY_DISCONNECTED=OFF \
   -DTENSORFLOW_TARGET_ARCH=${TENSORFLOW_TARGET_ARCH} \
+  -DTFLITE_HOST_TOOLS_DIR=${WORKDIR}/recipe-sysroot-native/usr/bin/ \
  "
 
 do_configure[network] = "1"
diff --git a/recipes-framework/tensorflow-lite/libtensorflow-lite_2.18.0.bb b/recipes-framework/tensorflow-lite/libtensorflow-lite_2.18.0.bb
diff --git a/recipes-framework/tensorflow-lite/python3-tensorflow-lite_2.18.0.bb b/recipes-framework/tensorflow-lite/python3-tensorflow-lite_2.18.0.bb
diff --git a/recipes-tools/tensorflow-lite/files/001-Add-Wno-incompatible-pointer-types-flag-to-xnnpack.cmake.patch b/recipes-tools/tensorflow-lite/files/001-Add-Wno-incompatible-pointer-types-flag-to-xnnpack.cmake.patch
diff --git a/recipes-tools/tensorflow-lite/files/001-Disable-XNNPACK-RISC-V-Vector-micro-kernels.patch b/recipes-tools/tensorflow-lite/files/001-Disable-XNNPACK-RISC-V-Vector-micro-kernels.patch
diff --git a/recipes-tools/tensorflow-lite/files/001-Fix-RISCV-cpuinfo.patch b/recipes-tools/tensorflow-lite/files/001-Fix-RISCV-cpuinfo.patch
diff --git a/recipes-tools/tensorflow-lite/files/001-Set-CMAKE-SYSTEM-PROCESSOR.patch b/recipes-tools/tensorflow-lite/files/001-Set-CMAKE-SYSTEM-PROCESSOR.patch
diff --git a/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.18.0.bb b/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.18.0.bb
