Sync from upstream TF. (#3488)

Author: TFLM-bot

tensorflow/lite/core/api/flatbuffer_conversions.cc

@@ -1882,9 +1882,7 @@ TfLiteStatus ParseMul(const Operator* op, ErrorReporter* error_reporter,
     params->activation =
         ConvertActivation(schema_params->fused_activation_function());
   } else {
-    // TODO(b/157480169): We should either return kTfLiteError or fill in some
-    // reasonable defaults in the params struct. We are not doing so until we
-    // better understand the ramifications of changing the legacy behavior.
+    // Default activation is none.
   }
 
   *builtin_data = params.release();
@@ -2430,6 +2428,18 @@ TfLiteStatus ParseStablehloComposite(const Operator* op,
   const StableHLOCompositeOptions* schema_params =
       op->builtin_options_2_as_StableHLOCompositeOptions();
   if (schema_params) {
+    if (schema_params->name() == nullptr) {
+      TF_LITE_REPORT_ERROR(
+          error_reporter,
+          "'stablehlo.composite' missing required option 'name'.");
+      return kTfLiteError;
+    }
+    if (schema_params->composite_attributes() == nullptr) {
+      TF_LITE_REPORT_ERROR(error_reporter,
+                           "'stablehlo.composite' missing required option "
+                           "'composite_attributes'.");
+      return kTfLiteError;
+    }
     params->name = schema_params->name()->c_str();
     params->version = schema_params->version();
     params->subgraph_index = schema_params->decomposition_subgraph_index();

tensorflow/lite/kernels/kernel_util.cc

@@ -528,51 +528,50 @@ TfLiteStatus CalculateShapeForBroadcast(TfLiteContext* context,
 
 // Size of string is not constant, return 0 in such case.
 int TfLiteTypeGetSize(TfLiteType type) {
+  int size_bits = TfLiteTypeGetSizeBits(type);
+  if (size_bits % 8 == 0) {
+    return size_bits / 8;
+  } else {
+    // For non-byte sized types, return 0.
+    return 0;
+  }
+}
+
+int TfLiteTypeGetSizeBits(TfLiteType type) {
   switch (type) {
+    case kTfLiteInt2:
+      return 2;
+    case kTfLiteInt4:
+    case kTfLiteUInt4:
+      return 4;
     case kTfLiteUInt8:
-      static_assert(sizeof(uint8_t) == 1, "");
-      return 1;
     case kTfLiteInt8:
-      static_assert(sizeof(int8_t) == 1, "");
-      return 1;
-    case kTfLiteBool:
-      return sizeof(bool);
+      return 8;
     case kTfLiteUInt16:
-      static_assert(sizeof(uint16_t) == 2, "");
-      return 2;
     case kTfLiteInt16:
-      static_assert(sizeof(int16_t) == 2, "");
-      return 2;
     case kTfLiteFloat16:
-      static_assert(sizeof(int16_t) == 2, "");
-      return 2;
+    case kTfLiteBFloat16:
+      return 16;
     case kTfLiteFloat32:
-      static_assert(sizeof(float) == 4, "");
-      return 4;
     case kTfLiteInt32:
-      static_assert(sizeof(int32_t) == 4, "");
-      return 4;
     case kTfLiteUInt32:
-      static_assert(sizeof(uint32_t) == 4, "");
-      return 4;
+      return 32;
     case kTfLiteInt64:
-      static_assert(sizeof(int64_t) == 8, "");
-      return 8;
     case kTfLiteUInt64:
-      static_assert(sizeof(uint64_t) == 8, "");
-      return 8;
     case kTfLiteFloat64:
-      static_assert(sizeof(double) == 8, "");
-      return 8;
     case kTfLiteComplex64:
-      static_assert(sizeof(std::complex<float>) == 8, "");
-      return 8;
+      return 64;
     case kTfLiteComplex128:
-      static_assert(sizeof(std::complex<double>) == 16, "");
-      return 16;
-    default:
-      return 0;
+      return 128;
+    case kTfLiteBool:
+      return sizeof(bool) * 8;
+    case kTfLiteString:
+    case kTfLiteNoType:
+    case kTfLiteResource:
+    case kTfLiteVariant:
+      break;
   }
+  return 0;
 }
 
 bool IsMobilePlatform() {

tensorflow/lite/kernels/kernel_util.h

@@ -332,6 +332,9 @@ TfLiteStatus CalculateShapeForBroadcast(TfLiteContext* context,
 // Return the size of given type in bytes. Return 0 in case of string.
 int TfLiteTypeGetSize(TfLiteType type);
 
+// Return the size of given type in bits. Returns 0 in case of string.
+int TfLiteTypeGetSizeBits(TfLiteType type);
+
 // Whether the current platform is mobile (Android or iOS).
 bool IsMobilePlatform();