Merge branch 'main' into gh/jorgep31415/130/orig

Author: kirklandsign

backends/apple/coreml/test/test_coreml_partitioner.py

@@ -16,8 +16,7 @@
 
 
 class TestCoreMLPartitioner(unittest.TestCase):
-    # TODO(T182928844): Delegate dim order op to backend.
-    edge_compile_config = executorch.exir.EdgeCompileConfig(_skip_dim_order=True)
+    edge_compile_config = executorch.exir.EdgeCompileConfig()
 
     def test_add_sub_skip_mm(self):
         class Model(torch.nn.Module):

backends/arm/_passes/fold_qdq_with_annotated_qparams_pass.py

@@ -32,10 +32,16 @@ def get_input_qparams(node: Node) -> dict[int, QuantArgs]:
     Raises a ValueError if the node doesn't have any parameters set.
     """
     if "input_qparams" not in node.meta.keys():
-        raise ValueError(f"No input quantization parameter found in node {node}")
+        raise ValueError(
+            f"No input quantization parameter found in node {node}\n"
+            f"original_aten={node.meta.get('original_aten', 'None')}"
+        )
     input_qparams = cast(dict[int, QuantArgs], node.meta["input_qparams"])
     if len(input_qparams) == 0:
-        raise ValueError(f"No input quantization parameter found in node {node}")
+        raise ValueError(
+            f"No input quantization parameter found in node {node}\n"
+            f"original_aten={node.meta.get('original_aten', 'None')}"
+        )
     return input_qparams
 
 
@@ -45,11 +51,17 @@ def get_output_qparams(node: Node) -> dict[int, QuantArgs]:
     Raises a ValueError if the node doesn't have any parameters set.
     """
     if "output_qparams" not in node.meta.keys():
-        raise ValueError(f"No output quantization parameter found in node {node}")
-    input_qparams = cast(dict[int, QuantArgs], node.meta["output_qparams"])
-    if len(input_qparams) == 0:
-        raise ValueError(f"No output quantization parameter found in node {node}")
-    return input_qparams
+        raise ValueError(
+            f"No output quantization parameter found in node {node}\n"
+            f"original_aten={node.meta.get('original_aten', 'None')}"
+        )
+    output_qparams = cast(dict[int, QuantArgs], node.meta["output_qparams"])
+    if len(output_qparams) == 0:
+        raise ValueError(
+            f"No output quantization parameter found in node {node}\n"
+            f"original_aten={node.meta.get('original_aten', 'None')}"
+        )
+    return output_qparams
 
 
 class FoldAndAnnotateQParamsPass(ExportPass):

backends/arm/arm_backend.py

@@ -50,6 +50,7 @@ def __init__(self):
         self.output_format = None
         self.path_for_intermediates = None
         self.tosa_version = None
+        self.tosa_spec = None
         self.input_order = None
 
     def ethosu_compile_spec(

backends/arm/test/common.py

@@ -145,14 +145,3 @@ def get_u85_compile_spec_unbuilt(
         .dump_intermediate_artifacts_to(artifact_path)
     )
     return compile_spec
-
-
-def get_target_board(compile_spec: list[CompileSpec]) -> str | None:
-    for spec in compile_spec:
-        if spec.key == "compile_flags":
-            flags = spec.value.decode()
-            if "u55" in flags:
-                return "corstone-300"
-            elif "u85" in flags:
-                return "corstone-320"
-    return None

backends/arm/test/models/test_mobilenet_v2_arm.py

@@ -98,7 +98,7 @@ def test_mv2_u55_BI(self):
         )
         if conftest.is_option_enabled("corstone_fvp"):
             tester.run_method_and_compare_outputs(
-                atol=1.0, qtol=1, inputs=self.model_inputs, target_board="corstone-300"
+                atol=1.0, qtol=1, inputs=self.model_inputs
             )
 
     @pytest.mark.slow
@@ -118,5 +118,5 @@ def test_mv2_u85_BI(self):
         )
         if conftest.is_option_enabled("corstone_fvp"):
             tester.run_method_and_compare_outputs(
-                atol=1.0, qtol=1, inputs=self.model_inputs, target_board="corstone-320"
+                atol=1.0, qtol=1, inputs=self.model_inputs
             )

backends/arm/test/ops/test_max_pool.py

@@ -173,9 +173,7 @@ def test_maxpool2d_tosa_u55_BI(
             (test_data,),
         )
         if conftest.is_option_enabled("corstone_fvp"):
-            tester.run_method_and_compare_outputs(
-                qtol=1, inputs=(test_data,), target_board="corstone-300"
-            )
+            tester.run_method_and_compare_outputs(qtol=1, inputs=(test_data,))
 
     @parameterized.expand(test_data_suite)
     @pytest.mark.corstone_fvp
@@ -191,9 +189,7 @@ def test_maxpool2d_tosa_u85_BI(
             (test_data,),
         )
         if conftest.is_option_enabled("corstone_fvp"):
-            tester.run_method_and_compare_outputs(
-                qtol=1, inputs=(test_data,), target_board="corstone-320"
-            )
+            tester.run_method_and_compare_outputs(qtol=1, inputs=(test_data,))
 
     @parameterized.expand(test_data_suite_mult_batches)
     def test_maxpool2d_tosa_MI_mult_batches(
@@ -232,9 +228,7 @@ def test_maxpool2d_tosa_u55_BI_mult_batches(
             (test_data,),
         )
         if conftest.is_option_enabled("corstone_fvp"):
-            tester.run_method_and_compare_outputs(
-                qtol=1, inputs=(test_data,), target_board="corstone-300"
-            )
+            tester.run_method_and_compare_outputs(qtol=1, inputs=(test_data,))
 
     @parameterized.expand(test_data_suite_mult_batches)
     @pytest.mark.corstone_fvp
@@ -251,6 +245,4 @@ def test_maxpool2d_tosa_u85_BI_mult_batches(
             (test_data,),
         )
         if conftest.is_option_enabled("corstone_fvp"):
-            tester.run_method_and_compare_outputs(
-                qtol=1, inputs=(test_data,), target_board="corstone-320"
-            )
+            tester.run_method_and_compare_outputs(qtol=1, inputs=(test_data,))

backends/arm/test/ops/test_maximum.py

@@ -121,9 +121,7 @@ def test_maximum_u55_BI(self, operand1: torch.Tensor, operand2: torch.Tensor):
             self.Maximum(), common.get_u55_compile_spec(), test_data
         )
         if conftest.is_option_enabled("corstone_fvp"):
-            tester.run_method_and_compare_outputs(
-                qtol=1, inputs=test_data, target_board="corstone-300"
-            )
+            tester.run_method_and_compare_outputs(qtol=1, inputs=test_data)
 
     @parameterized.expand(Maximum.test_parameters)
     def test_maximum_u85_BI(self, operand1: torch.Tensor, operand2: torch.Tensor):
@@ -132,6 +130,4 @@ def test_maximum_u85_BI(self, operand1: torch.Tensor, operand2: torch.Tensor):
             self.Maximum(), common.get_u85_compile_spec(), test_data
         )
         if conftest.is_option_enabled("corstone_fvp"):
-            tester.run_method_and_compare_outputs(
-                qtol=1, inputs=test_data, target_board="corstone-320"
-            )
+            tester.run_method_and_compare_outputs(qtol=1, inputs=test_data)

backends/arm/test/ops/test_minimum.py

@@ -121,9 +121,7 @@ def test_minimum_u55_BI(self, operand1: torch.Tensor, operand2: torch.Tensor):
             self.Minimum(), common.get_u55_compile_spec(), test_data
         )
         if conftest.is_option_enabled("corstone_fvp"):
-            tester.run_method_and_compare_outputs(
-                qtol=1, inputs=test_data, target_board="corstone-300"
-            )
+            tester.run_method_and_compare_outputs(qtol=1, inputs=test_data)
 
     @parameterized.expand(Minimum.test_parameters)
     def test_minimum_u85_BI(self, operand1: torch.Tensor, operand2: torch.Tensor):
@@ -133,5 +131,6 @@ def test_minimum_u85_BI(self, operand1: torch.Tensor, operand2: torch.Tensor):
         )
         if conftest.is_option_enabled("corstone_fvp"):
             tester.run_method_and_compare_outputs(
-                qtol=1, inputs=test_data, target_board="corstone-320"
+                qtol=1,
+                inputs=test_data,
             )