Address merge issues

Fix a merge issue causing the build to fail + update tests after
merging of #15590

Signed-off-by: Adrian Lundell <[email protected]>

Author: AdrianLundell

backends/cortex_m/ops/op_quantized_linear.cpp

@@ -21,16 +21,15 @@ Tensor& quantized_linear_out(
     KernelRuntimeContext& context,
     const Tensor& input,
     const Tensor& weights,
-    const Tensor& weight_zero_point,
-    const Tensor& weight_multiplier,
-    const Tensor& weight_shift,
     const torch::executor::optional<Tensor>& bias,
-    const Tensor& bias_multiplier,
-    const Tensor& bias_shift,
-    const Tensor& scratch_buffer,
-    const Scalar& output_zero_point,
-    const Scalar& in_features,
-    const Scalar& out_features,
+    const torch::executor::optional<Tensor>& kernel_sum,
+    const Scalar& input_offset,
+    const Scalar& filter_offset,
+    const Scalar& output_offset,
+    const IntArrayRef requantize_multipliers,
+    const IntArrayRef requantize_shifts,
+    const Scalar& activation_max,
+    const Scalar& activation_min,
     Tensor& out) {
   ET_LOG(Info, "quantized_linear_out: called");
 

backends/cortex_m/test/ops/test_add.py

@@ -59,17 +59,6 @@ class CortexMTensorAdd(Model):
     }
 
 
-class CortexMTensorAddBroadcast(Model):
-    # TODO: Quantize and accelerate broadcasted adds
-    ops_before_transforms = {
-        "executorch_exir_dialects_edge__ops_aten_add_Tensor": 1,
-    }
-
-    ops_after_transforms = {
-        "executorch_exir_dialects_edge__ops_aten_add_Tensor": 1,
-    }
-
-
 class CortexMAlphaAdd(ModelAlpha):
     ops_before_transforms = {
         "executorch_exir_dialects_edge__ops_aten_add_Tensor": 1,
@@ -126,15 +115,15 @@ class CortexMAlphaAdd(ModelAlpha):
         (torch.rand(2, 2) * 10, torch.rand(2, 2)),
     ),
     "broadcast_1": McuTestCase(
-        CortexMTensorAddBroadcast(),
+        CortexMTensorAdd(),
         (torch.ones(1), torch.ones(2, 2, 2, 2)),
     ),
     "broadcast_2": McuTestCase(
-        CortexMTensorAddBroadcast(),
+        CortexMTensorAdd(),
         (torch.ones((2, 1, 1, 1)), torch.ones(1)),
     ),
     "broadcast_3": McuTestCase(
-        CortexMTensorAddBroadcast(),
+        CortexMTensorAdd(),
         (
             ramp_tensor(-2, 2, (2, 1, 2, 1)),
             ramp_tensor(-5, 5, (1, 2, 1, 2)),
@@ -183,6 +172,18 @@ def test_dialect_add(test_case):
         "'float' object has not attribute 'fake_mode' - scalar only ops not supported.",
         AttributeError,
     ),
+    "broadcast_1": (
+        " assert failed (input1.sizes() == input2.sizes()): Input1 and Input2 must have the same sizes.",
+        RuntimeError,
+    ),
+    "broadcast_2": (
+        " assert failed (input1.sizes() == input2.sizes()): Input1 and Input2 must have the same sizes.",
+        RuntimeError,
+    ),
+    "broadcast_3": (
+        " assert failed (input1.sizes() == input2.sizes()): Input1 and Input2 must have the same sizes.",
+        RuntimeError,
+    ),
     "alpha": (
         "Expecting kwargs for aten op IR to be empty - alpha arg not supported.",
         AssertionError,