Merge branch 'main' of https://github.com/pytorch/executorch into dev/refactor_unittests

Author: AdrianLundell

backends/arm/test/common.py

@@ -17,7 +17,11 @@
 from executorch.backends.arm.arm_backend import ArmCompileSpecBuilder
 from executorch.backends.arm.tosa_specification import TosaSpecification
 from executorch.exir.backend.compile_spec_schema import CompileSpec
-from runner_utils import corstone300_installed, corstone320_installed, RunnerUtil
+from runner_utils import (
+    arm_executor_runner_exists,
+    corstone300_installed,
+    corstone320_installed,
+)
 
 
 def get_time_formatted_path(path: str, log_prefix: str) -> str:
@@ -151,27 +155,14 @@ def get_u85_compile_spec_unbuilt(
     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
-
-
 SkipIfNoCorstone300 = pytest.mark.skipif(
-    not corstone300_installed()
-    or not RunnerUtil.arm_executor_runner_exists("corstone-300"),
+    not corstone300_installed() or not arm_executor_runner_exists("corstone-300"),
     reason="Did not find Corstone-300 FVP or executor_runner on path",
 )
 """Skips a test if Corsone300 FVP is not installed, or if the executor runner is not built"""
 
 SkipIfNoCorstone320 = pytest.mark.skipif(
-    not corstone320_installed()
-    or not RunnerUtil.arm_executor_runner_exists("corstone-320"),
+    not corstone320_installed() or not arm_executor_runner_exists("corstone-320"),
     reason="Did not find Corstone-320 FVP or executor_runner on path",
 )
 """Skips a test if Corsone320 FVP is not installed, or if the executor runner is not built."""

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,
             )