Merge remote-tracking branch 'upstream/main 858f5a3' into macos

858f5a3	 [CI] Removed six, updated absl_py (tensorflow#3203)…	[email protected]	26.09.2025 12:37 AM

Author: Laur59

.github/workflows/ci.yml

@@ -262,7 +262,7 @@ jobs:
         with:
           ref: ${{ inputs.trigger-sha }}
       - name: Test
-        uses: docker://ghcr.io/tflm-bot/tflm-ci:0.6.4
+        uses: docker://ghcr.io/tflm-bot/tflm-ci:0.6.5
         with:
           args: /bin/sh -c tensorflow/lite/micro/tools/ci_build/test_cortex_m_qemu.sh tflite-micro/
 
@@ -278,7 +278,7 @@ jobs:
         with:
           ref: ${{ inputs.trigger-sha }}
       - name: Check
-        uses: docker://ghcr.io/tflm-bot/tflm-ci:0.6.4
+        uses: docker://ghcr.io/tflm-bot/tflm-ci:0.6.5
         with:
           args: /bin/sh -c "git config --global --add safe.directory /github/workspace && tensorflow/lite/micro/tools/ci_build/test_code_style.sh"
 

ci/Dockerfile.micro

@@ -15,8 +15,8 @@
 #
 # --- Build and upload to GHCR.IO ---
 # (Run from the root of the TFLM repository)
-#   export TFLM_CI_VERSION=0.6.4
-#   docker build -f ci/Dockerfile.micro -t ghcr.io/tflm-bot/tflm-ci:$TFLM_CI_VERSION .
+#   export TFLM_CI_VERSION=0.6.5
+#   docker build --no-cache -f ci/Dockerfile.micro -t ghcr.io/tflm-bot/tflm-ci:$TFLM_CI_VERSION .
 #   docker push ghcr.io/tflm-bot/tflm-ci:$TFLM_CI_VERSION
 #
 # --- Run locally for debugging ---
@@ -28,11 +28,17 @@
 # Use a prebuilt Python image to speed up the build process.
 FROM python:3.10-bookworm
 
+# Install qemu-user from bookworm-backports to address a known bug:
+# https://gitlab.com/qemu-project/qemu/-/issues/1697
+RUN echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends -t bookworm-backports qemu-user && \
+    rm -rf /var/lib/apt/lists/*
+
 # Install all required system dependencies
 RUN apt-get update && apt-get install -y \
     gnupg \
     lsb-release \
-    qemu-system-arm \
     software-properties-common \
     sudo \
     wget \
@@ -56,7 +62,7 @@ RUN wget https://apt.llvm.org/llvm.sh \
 # Install all Python dependencies
 # - yapf to check for Python formatting
 # - Pillow was added first for the C array generation
-# - pandas, matplotlib, and six for create_size_log scripts
+# - pandas, and matplotlib for create_size_log scripts
 # - pyyaml, requests, psutil, and robotframework for Renode test
 RUN pip install --no-cache-dir --upgrade pip && \
     pip install --no-cache-dir \
@@ -67,7 +73,6 @@ RUN pip install --no-cache-dir --upgrade pip && \
     pyyaml \
     requests \
     robotframework==4.0.1 \
-    six \
     yapf==0.40.2
 
 # Copy and run install scripts, then clean them up

ci/install_qemu.sh

@@ -63,7 +63,6 @@ py_binary(
         ":graph",
         ":inference_generator",
         "//tensorflow/lite/tools:flatbuffer_utils",
-        "@absl_py//absl:app",
-        "@absl_py//absl/flags",
+        requirement("absl_py"),
     ],
 )

codegen/BUILD

@@ -231,7 +231,7 @@ py_test(
     ],
     deps = [
         ":overlap_add_op",
-        "@absl_py//absl/testing:parameterized",
+        requirement("absl_py"),
         requirement("numpy"),
         requirement("tensorflow"),
     ],

python/tflite_micro/signal/BUILD

@@ -118,8 +118,7 @@ py_library(
         ":model_facade",
         ":spec",
         "//tensorflow/lite/micro/tools:tflite_flatbuffer_align",
-        "@absl_py//absl:app",
-        "@absl_py//absl/flags",
+        requirement("absl_py"),
         "@flatbuffers//:runtime_py",
         requirement("bitarray"),
         requirement("numpy"),
@@ -246,7 +245,7 @@ py_binary(
     deps = [
         ":metadata_py",
         "//tensorflow/lite/python:schema_py",
-        "@absl_py//absl:app",
+        requirement("absl_py"),
         requirement("bitarray"),
         requirement("prettyprinter"),
     ],

tensorflow/lite/micro/compression/BUILD

@@ -1,4 +1,5 @@
 load("@rules_python//python:defs.bzl", "py_test")
+load("@tflm_pip_deps//:requirements.bzl", "requirement")
 
 def generate_view_tests(targets):
     """Generates py_test targets for each target's path and a test_suite to
@@ -20,7 +21,7 @@ def generate_view_tests(targets):
             data = [target],
             deps = [
                 ":view",
-                "@absl_py//absl/testing:absltest",
+                requirement("absl_py"),
             ],
             size = "small",
         )

tensorflow/lite/micro/compression/view_tests.bzl

@@ -48,9 +48,7 @@ py_binary(
     srcs = ["evaluate.py"],
     data = ["//tensorflow/lite/micro/examples/hello_world/models:hello_world_float.tflite"],
     deps = [
-        "@absl_py//absl:app",
-        "@absl_py//absl/flags",
-        "@absl_py//absl/logging",
+        requirement("absl_py"),
         requirement("numpy"),
         requirement("tensorflow"),
         "//python/tflite_micro:runtime",

tensorflow/lite/micro/examples/hello_world/BUILD

@@ -6,9 +6,7 @@ py_binary(
     srcs = ["ptq.py"],
     data = ["//tensorflow/lite/micro/examples/hello_world/models:hello_world_float.tflite"],
     deps = [
-        "@absl_py//absl:app",
-        "@absl_py//absl/flags",
-        "@absl_py//absl/logging",
+        requirement("absl_py"),
         requirement("numpy"),
         requirement("tensorflow"),
         "//python/tflite_micro:runtime",

tensorflow/lite/micro/examples/hello_world/quantization/BUILD

@@ -208,8 +208,7 @@ py_binary(
         ":samples_30ms",
     ],
     deps = [
-        "@absl_py//absl:app",
-        "@absl_py//absl/flags",
+        requirement("absl_py"),
         requirement("numpy"),
         requirement("tensorflow"),
         "//python/tflite_micro:runtime",