ddavis-2015
diff --git a/‎.bazelrc
+9 b/‎.bazelrc
+9
diff --git a/‎.github/mergify.yml
+4-4 b/‎.github/mergify.yml
+4-4
diff --git a/‎WORKSPACE
+2-1 b/‎WORKSPACE
+2-1
diff --git a/‎codegen/build_def.bzl
+17-3 b/‎codegen/build_def.bzl
+17-3
diff --git a/‎python/tflite_micro/numpy_utils.cc
+6-2 b/‎python/tflite_micro/numpy_utils.cc
+6-2
diff --git a/‎tensorflow/lite/BUILD
+1 b/‎tensorflow/lite/BUILD
+1
diff --git a/‎tensorflow/lite/array.cc
+2 b/‎tensorflow/lite/array.cc
+2
diff --git a/‎tensorflow/lite/kernels/internal/reference/batch_matmul.h
+7-2 b/‎tensorflow/lite/kernels/internal/reference/batch_matmul.h
+7-2
diff --git a/‎tensorflow/lite/micro/BUILD
+1 b/‎tensorflow/lite/micro/BUILD
+1
diff --git a/‎tensorflow/lite/micro/compression/BUILD
+22-19 b/‎tensorflow/lite/micro/compression/BUILD
+22-19
@@ -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
 
@@ -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:
 
@@ -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"],
 )
@@ -18,10 +18,24 @@ 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) --quiet " +
-              "--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"],
     )
 
 
@@ -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;
 
@@ -8,6 +8,7 @@ cc_library(
     srcs = ["array.cc"],
     hdrs = ["array.h"],
     deps = [
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/core/c:common",
     ],
 )
 
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/lite/array.h"
 
+#include "tensorflow/lite/c/common.h"
+
 namespace tflite {
 namespace array_internal {
 
 
@@ -111,7 +111,8 @@ inline void BatchMatMul(const RuntimeShape& lhs_shape, const int8_t* lhs_data,
                         const float* scaling_factors,
                         const int32_t* input_offset, int32_t* row_sums,
                         const RuntimeShape& output_shape, float* output_data,
-                        bool* compute_row_sums) {
+                        bool* compute_row_sums,
+                        const float* per_channel_scales) {
   const RuntimeShape extended_lhs_shape =
       RuntimeShape::ExtendedShape(5, lhs_shape);
   const RuntimeShape extended_rhs_shape =
@@ -188,7 +189,11 @@ inline void BatchMatMul(const RuntimeShape& lhs_shape, const int8_t* lhs_data,
             int32_t row_sum = woff_ptr2[i];
             total -= row_sum * batch_offset;
             int idx = lhs_rows * j + i;
-            out_ptr[idx] += batch_scaling_factor * total;
+            float scale = batch_scaling_factor;
+            if (per_channel_scales) {
+              scale *= per_channel_scales[i];
+            }
+            out_ptr[idx] += scale * total;
           }
         }
       }
 
@@ -177,6 +177,7 @@ tflm_cc_library(
 tflm_cc_library(
     name = "micro_allocator",
     srcs = [
+        "compression.h",
         "micro_allocation_info.cc",
         "micro_allocator.cc",
     ],
 
@@ -73,8 +73,9 @@ py_binary(
         "compress.py",
     ],
     deps = [
-        ":lib",
         ":metadata_py",
+        ":model_facade",
+        ":spec",
         "//tensorflow/lite/python:schema_py",
         "@absl_py//absl:app",
         "@absl_py//absl/flags",
@@ -93,6 +94,7 @@ py_test(
     ],
     deps = [
         ":compress",
+        ":model_facade",
         requirement("tensorflow"),
     ],
 )
@@ -150,24 +152,6 @@ sh_test(
     ],
 )
 
-py_library(
-    name = "lib",
-    srcs = ["lib.py"],
-    deps = [
-        "model_facade",
-    ],
-)
-
-py_test(
-    name = "lib_test",
-    size = "small",
-    srcs = ["lib_test.py"],
-    deps = [
-        "lib",
-        requirement("tensorflow"),
-    ],
-)
-
 py_library(
     name = "model_facade",
     srcs = ["model_facade.py"],
@@ -183,6 +167,7 @@ py_library(
     deps = [
         "//tensorflow/lite/python:schema_py",
         requirement("flatbuffers"),
+        requirement("numpy"),
     ],
 )
 
@@ -219,3 +204,21 @@ py_binary(
         "@absl_py//absl/flags",
     ],
 )
+
+py_library(
+    name = "spec",
+    srcs = ["spec.py"],
+    deps = [
+        requirement("pyyaml"),
+    ],
+)
+
+py_test(
+    name = "spec_test",
+    size = "small",
+    srcs = ["spec_test.py"],
+    deps = [
+        ":spec",
+        requirement("tensorflow"),
+    ],
+)
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ load("//python:py_pkg_cc_deps.bzl", "py_pkg_cc_deps")`
`86`	`86`
`87`	`87`	`py_pkg_cc_deps(`
`88`	`88`	`name = "numpy_cc_deps",`
`89`		`- includes = ["numpy/core/include"],`
	`89`	`+ includes = ["numpy/_core/include"],`
`90`	`90`	`pkg = requirement("numpy"),`
`91`	`91`	`)`
`92`	`92`
`@@ -101,6 +101,7 @@ py_pkg_cc_deps(`
`101`	`101`	`http_archive(`
`102`	`102`	`name = "nnlib_hifi4",`
`103`	`103`	`build_file = "@tflite_micro//third_party/xtensa/nnlib_hifi4:nnlib_hifi4.BUILD",`
	`104`	`+ integrity = "sha256-ulZ+uY4dRsbDUMZbZtD972eghclWQrqYRb0Y4Znfyyc=",`
`104`	`105`	`strip_prefix = "nnlib-hifi4-34f5f995f28d298ae2b6e2ba6e76c32a5cb34989",`
`105`	`106`	`urls = ["https://github.com/foss-xtensa/nnlib-hifi4/archive/34f5f995f28d298ae2b6e2ba6e76c32a5cb34989.zip"],`
`106`	`107`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ cc_library(`
`8`	`8`	`srcs = ["array.cc"],`
`9`	`9`	`hdrs = ["array.h"],`
`10`	`10`	`deps = [`
	`11`	`+ "//tensorflow/lite/c:common",`
`11`	`12`	`"//tensorflow/lite/core/c:common",`
`12`	`13`	`],`
`13`	`14`	`)`