Fix upstream CI failures

Fix order of decorators to expand unittest first, and then parameterized input.
Fix bug in add operator conversion to handle different scales correctly.

Signed-off-by: Per Åstrand <[email protected]>

Change-Id: Ic228cf0215e8171392776739936a53c025802fd5

Author: per

backends/arm/operators/op_add.py

@@ -47,9 +47,11 @@ def define_node(
             input_A, input_A_scale, input_A_zp, _, _, _ = getNodeArgs(input_node_A)
             input_B, input_B_scale, input_B_zp, _, _, _ = getNodeArgs(input_node_B)
 
-            max_scale_2x = 2.0 * max(input_A_scale.number, input_B_scale.number)
-            inputA_rescale_scale = input_A_scale.number / max_scale_2x
-            inputB_rescale_scale = input_B_scale.number / max_scale_2x
+            # Scale the int8 quantized input to a common scale in the integer
+            # domain.
+            min_scale = min(input_A_scale.number, input_B_scale.number)
+            inputA_rescale_scale = input_A_scale.number / min_scale
+            inputB_rescale_scale = input_B_scale.number / min_scale
 
             input_A_rescaled_to_int32 = build_rescale_to_int32(
                 tosa_graph,
@@ -81,7 +83,7 @@ def define_node(
             # Output
             output_node = list(node.users)[0]
             _, output_scale, output_zp, _, _, _ = getNodeArgs(output_node)
-            output_rescale_scale = max_scale_2x / (output_scale.number)
+            output_rescale_scale = min_scale / output_scale.number
 
             # Rescale Back to INT8
             build_rescale_from_int32(

backends/arm/test/ops/test_add.py

@@ -47,6 +47,7 @@ class Add2(torch.nn.Module):
             (torch.ones(1, 1, 4, 4), torch.ones(1, 1, 4, 4)),
             (torch.randn(1, 1, 4, 4), torch.ones(1, 1, 4, 1)),
             (torch.randn(1, 1, 4, 4), torch.randn(1, 1, 4, 1)),
+            (10000 * torch.randn(1, 1, 4, 4), torch.randn(1, 1, 4, 1)),
         ]
 
         def __init__(self):
@@ -136,11 +137,11 @@ def test_add_tosa_BI(self, test_data: torch.Tensor):
         test_data = (test_data,)
         self._test_add_tosa_BI_pipeline(self.Add(), test_data)
 
+    @parameterized.expand(Add.test_parameters)
     @unittest.skipIf(
         not VELA_INSTALLED,
         "There is no point in running U55 tests if the Vela tool is not installed",
     )
-    @parameterized.expand(Add.test_parameters)
     def test_add_u55_BI(self, test_data: torch.Tensor):
         test_data = (test_data,)
         self._test_add_u55_BI_pipeline(self.Add(), test_data)
@@ -155,11 +156,11 @@ def test_add2_tosa_BI(self, operand1: torch.Tensor, operand2: torch.Tensor):
         test_data = (operand1, operand2)
         self._test_add_tosa_BI_pipeline(self.Add2(), test_data)
 
+    @parameterized.expand(Add2.test_parameters)
     @unittest.skipIf(
         not VELA_INSTALLED,
         "There is no point in running U55 tests if the Vela tool is not installed",
     )
-    @parameterized.expand(Add2.test_parameters)
     def test_add2_u55_BI(self, operand1: torch.Tensor, operand2: torch.Tensor):
         test_data = (operand1, operand2)
         self._test_add_u55_BI_pipeline(self.Add2(), test_data)