Draft PR: testing

.bazelrc

@@ -33,6 +33,15 @@ build --cxxopt -std=c++17
 # Treat warnings as errors
 build --copt -Werror
 
+# Common options for --config=ci
+build:ci --curses=no 
+build:ci --color=no 
+build:ci --noshow_progress
+build:ci --noshow_loading_progress
+build:ci --show_timestamps
+build:ci --terminal_columns=0
+build:ci --verbose_failures
+
 # When building with the address sanitizer
 # E.g., bazel build --config asan
 build:asan --repo_env CC=clang

.github/mergify.yml

@@ -2,9 +2,13 @@ queue_rules:
   - name: default
     checks_timeout: 2 h
     branch_protection_injection_mode: queue
+    merge_method: squash
     conditions:
       - base=main
       - label=ci:ready_to_merge
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body_raw  }}
 
 
 pull_request_rules:
@@ -15,10 +19,6 @@ pull_request_rules:
     actions:
       queue:
         name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body_raw  }}
 
   - name: remove ci:ready_to_merge label
     conditions:

.github/workflows/sync.yml

@@ -62,5 +62,5 @@ jobs:
           author: TFLM-bot <[email protected]>
           body: "BUG=automated sync from upstream\nNO_CHECK_TFLITE_FILES=automated sync from upstream"
           labels: bot:sync-tf, ci:run
-          reviewers: rascani
+          reviewers: suleshahid
 

.style.yapf

@@ -0,0 +1,3 @@
+[style]
+based_on_style = pep8
+indent_width = 2

BUILD

@@ -7,3 +7,17 @@ refresh_compile_commands(
     name = "refresh_compile_commands",
     targets = ["//..."],
 )
+
+load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
+
+bool_flag(
+    name = "with_compression",
+    build_setting_default = False,
+)
+
+config_setting(
+    name = "with_compression_enabled",
+    flag_values = {
+        ":with_compression": "True",
+    },
+)

CODEOWNERS

@@ -1,4 +1,4 @@
 *          @tensorflow/micro
 
-/.github/  @advaitjain @rockyrhodes @rascani
-/ci/       @advaitjain @rockyrhodes @rascani
+/.github/  @advaitjain @rockyrhodes @suleshahid
+/ci/       @advaitjain @rockyrhodes @suleshahid

CONTRIBUTING.md

@@ -190,7 +190,7 @@ Below are some tips that might be useful and improve the development experience.
 
   ```
   pip install yapf
-  yapf log_parser.py -i --style='{based_on_style: pep8, indent_width: 2}'
+  yapf log_parser.py -i'
   ```
 
 * Add a git hook to check for code style etc. prior to creating a pull request:

WORKSPACE

@@ -86,7 +86,7 @@ load("//python:py_pkg_cc_deps.bzl", "py_pkg_cc_deps")
 
 py_pkg_cc_deps(
     name = "numpy_cc_deps",
-    includes = ["numpy/core/include"],
+    includes = ["numpy/_core/include"],
     pkg = requirement("numpy"),
 )
 
@@ -101,6 +101,7 @@ py_pkg_cc_deps(
 http_archive(
     name = "nnlib_hifi4",
     build_file = "@tflite_micro//third_party/xtensa/nnlib_hifi4:nnlib_hifi4.BUILD",
+    integrity = "sha256-ulZ+uY4dRsbDUMZbZtD972eghclWQrqYRb0Y4Znfyyc=",
     strip_prefix = "nnlib-hifi4-34f5f995f28d298ae2b6e2ba6e76c32a5cb34989",
     urls = ["https://github.com/foss-xtensa/nnlib-hifi4/archive/34f5f995f28d298ae2b6e2ba6e76c32a5cb34989.zip"],
 )

codegen/build_def.bzl

@@ -1,6 +1,6 @@
 """ Build rule for generating ML inference code from TFLite model. """
 
-load("//tensorflow/lite/micro:build_def.bzl", "micro_copts")
+load("//tensorflow/lite/micro:build_def.bzl", "tflm_cc_library")
 
 def tflm_inference_library(
         name,
@@ -18,14 +18,28 @@ def tflm_inference_library(
     native.genrule(
         name = generated_target,
         srcs = [tflite_model],
-        outs = [name + ".h", name + ".cc"],
+        outs = [
+            name + ".h",
+            name + ".cc",
+            name + ".log",
+        ],
         tools = ["//codegen:code_generator"],
-        cmd = "$(location //codegen:code_generator) " +
-              "--model=$< --output_dir=$(RULEDIR) --output_name=%s" % name,
+        cmd = """
+            # code_generator (partially because it uses Tensorflow) outputs
+            # much noise to the console. Intead, write output to a logfile to
+            # prevent noise in the error-free bazel output.
+            NAME=%s
+            LOGFILE=$(RULEDIR)/$$NAME.log
+            $(location //codegen:code_generator) \
+                    --model=$< \
+                    --output_dir=$(RULEDIR) \
+                    --output_name=$$NAME \
+                    >$$LOGFILE 2>&1
+        """ % name,
         visibility = ["//visibility:private"],
     )
 
-    native.cc_library(
+    tflm_cc_library(
         name = name,
         hdrs = [name + ".h"],
         srcs = [name + ".cc"],
@@ -39,6 +53,9 @@ def tflm_inference_library(
             "//tensorflow/lite/micro:micro_common",
             "//tensorflow/lite/micro:micro_context",
         ],
-        copts = micro_copts(),
+        target_compatible_with = select({
+            "//conditions:default": [],
+            "//:with_compression_enabled": ["@platforms//:incompatible"],
+        }),
         visibility = visibility,
     )

codegen/code_generator.py

@@ -15,14 +15,14 @@
 """ Generates C/C++ source code capable of performing inference for a model. """
 
 import os
+import pathlib
 
 from absl import app
 from absl import flags
 from collections.abc import Sequence
 
 from tflite_micro.codegen import inference_generator
 from tflite_micro.codegen import graph
-from tflite_micro.tensorflow.lite.tools import flatbuffer_utils
 
 # Usage information:
 # Default:
@@ -48,15 +48,33 @@
           "'model' basename."),
     required=False)
 
+_QUIET = flags.DEFINE_bool(
+    name="quiet",
+    default=False,
+    help="Suppress informational output (e.g., for use in for build system)",
+    required=False)
+
 
 def main(argv: Sequence[str]) -> None:
+  if _QUIET.value:
+    restore = os.environ.get("TF_CPP_MIN_LOG_LEVEL", "0")
+    os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3"
+    from tflite_micro.tensorflow.lite.tools import flatbuffer_utils
+    os.environ["TF_CPP_MIN_LOG_LEVEL"] = restore
+  else:
+    from tflite_micro.tensorflow.lite.tools import flatbuffer_utils
+
   output_dir = _OUTPUT_DIR.value or os.path.dirname(_MODEL_PATH.value)
   output_name = _OUTPUT_NAME.value or os.path.splitext(
       os.path.basename(_MODEL_PATH.value))[0]
 
   model = flatbuffer_utils.read_model(_MODEL_PATH.value)
 
-  print("Generating inference code for model: {}".format(_MODEL_PATH.value))
+  if not _QUIET.value:
+    print("Generating inference code for model: {}".format(_MODEL_PATH.value))
+    output_path = pathlib.Path(output_dir) / output_name
+    print(f"Generating {output_path}.h")
+    print(f"Generating {output_path}.cc")
 
   inference_generator.generate(output_dir, output_name,
                                graph.OpCodeTable([model]), graph.Graph(model))

codegen/inference_generator.py

@@ -35,7 +35,6 @@ class ModelData(TypedDict):
 
 def _render(output_file: pathlib.Path, template_file: pathlib.Path,
             model_data: ModelData) -> None:
-  print("Generating {}".format(output_file))
   t = template.Template(filename=str(template_file))
   with output_file.open('w+') as file:
     file.write(t.render(**model_data))

codegen/runtime/BUILD

@@ -1,12 +1,11 @@
-load("//tensorflow/lite/micro:build_def.bzl", "micro_copts")
+load("//tensorflow/lite/micro:build_def.bzl", "tflm_cc_library")
 
 package(default_visibility = ["//visibility:public"])
 
-cc_library(
+tflm_cc_library(
     name = "micro_codegen_context",
     srcs = ["micro_codegen_context.cc"],
     hdrs = ["micro_codegen_context.h"],
-    copts = micro_copts(),
     deps = [
         "//tensorflow/lite/c:common",
         "//tensorflow/lite/kernels:op_macros",

python/tflite_micro/BUILD

@@ -7,7 +7,7 @@ load("@rules_python//python:packaging.bzl", "py_package", "py_wheel")
 load("@tflm_pip_deps//:requirements.bzl", "requirement")
 load(
     "//tensorflow/lite/micro:build_def.bzl",
-    "micro_copts",
+    "tflm_cc_library",
 )
 load(
     "//tensorflow:extra_rules.bzl",
@@ -24,15 +24,14 @@ package_group(
     packages = tflm_python_op_resolver_friends(),
 )
 
-cc_library(
+tflm_cc_library(
     name = "python_ops_resolver",
     srcs = [
         "python_ops_resolver.cc",
     ],
     hdrs = [
         "python_ops_resolver.h",
     ],
-    copts = micro_copts(),
     visibility = [
         ":op_resolver_friends",
         "//tensorflow/lite/micro/integration_tests:__subpackages__",

python/tflite_micro/interpreter_wrapper.cc

@@ -104,11 +104,6 @@ bool CheckTensor(const TfLiteTensor* tensor) {
     return false;
   }
 
-  if (tensor->sparsity != nullptr) {
-    PyErr_SetString(PyExc_ValueError, "TFLM doesn't support sparse tensors");
-    return false;
-  }
-
   int py_type_num = TfLiteTypeToPyArrayType(tensor->type);
   if (py_type_num == NPY_NOTYPE) {
     PyErr_SetString(PyExc_ValueError, "Unknown tensor type.");

python/tflite_micro/numpy_utils.cc

@@ -41,8 +41,8 @@ int TfLiteTypeToPyArrayType(TfLiteType tf_lite_type) {
     case kTfLiteFloat16:
       return NPY_FLOAT16;
     case kTfLiteBFloat16:
-      // TODO(b/329491949): NPY_BFLOAT16 currently doesn't exist
-      return NPY_FLOAT16;
+      // TODO(b/329491949): Supports other ml_dtypes user-defined types.
+      return NPY_USERDEF;
     case kTfLiteFloat64:
       return NPY_FLOAT64;
     case kTfLiteInt32:
@@ -114,6 +114,10 @@ TfLiteType TfLiteTypeFromPyType(int py_type) {
       return kTfLiteComplex64;
     case NPY_COMPLEX128:
       return kTfLiteComplex128;
+    case NPY_USERDEF:
+      // User-defined types are defined in ml_dtypes. (bfloat16, float8, etc.)
+      // Fow now, we only support bfloat16.
+      return kTfLiteBFloat16;
       // Avoid default so compiler errors created when new types are made.
   }
   return kTfLiteNoType;

signal/micro/kernels/BUILD

@@ -1,11 +1,11 @@
 load(
     "//tensorflow/lite/micro:build_def.bzl",
-    "micro_copts",
+    "tflm_cc_library",
 )
 
 package(licenses = ["notice"])
 
-cc_library(
+tflm_cc_library(
     name = "register_signal_ops",
     srcs = [
         "delay.cc",
@@ -31,7 +31,6 @@ cc_library(
         "irfft.h",
         "rfft.h",
     ],
-    copts = micro_copts(),
     visibility = [
         "//tensorflow/lite/micro",
     ],

tensorflow/compiler/mlir/lite/core/api/BUILD

@@ -1,15 +1,19 @@
 load("//tensorflow/lite:build_def.bzl", "tflite_copts")
-load("//tensorflow/lite/micro:build_def.bzl", "micro_copts")
+load(
+    "//tensorflow/lite/micro:build_def.bzl",
+    "tflm_cc_library",
+    "tflm_copts",
+)
 
 package(
     default_visibility = ["//visibility:public"],
     licenses = ["notice"],
 )
 
-cc_library(
+tflm_cc_library(
     name = "error_reporter",
     srcs = ["error_reporter.cc"],
     hdrs = ["error_reporter.h"],
-    copts = tflite_copts() + micro_copts(),
+    copts = tflm_copts() + tflite_copts(),
     deps = [],
 )

tensorflow/lite/BUILD

@@ -8,6 +8,7 @@ cc_library(
     srcs = ["array.cc"],
     hdrs = ["array.h"],
     deps = [
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/core/c:common",
     ],
 )

tensorflow/lite/array.cc

@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/lite/array.h"
 
+#include "tensorflow/lite/c/common.h"
+
 namespace tflite {
 namespace array_internal {