Make Default Testing Config Canonical Config

Differential Revision: D49214927

fbshipit-source-id: 98d914e23ebdfac0483f99e3623c0813124cbc89

Author: mcr229

backends/xnnpack/test/models/mobilenet_v2.py

@@ -35,7 +35,7 @@ def test_fp32_mv2(self):
 
         (
             Tester(self.mv2, self.model_inputs)
-            .export(Export(CaptureConfig(enable_aot=True)))
+            .export()
             .to_edge()
             .check(list(self.all_operators))
             .partition()
@@ -56,7 +56,7 @@ def test_qs8_mv2(self):
         (
             Tester(self.mv2, self.model_inputs)
             .quantize()
-            .export(Export(CaptureConfig(enable_aot=True)))
+            .export()
             .to_edge()
             .check(list(ops_after_quantization))
             .partition(Partition(partitioner=XnnpackQuantizedPartitioner))

backends/xnnpack/test/models/mobilenet_v3.py

@@ -37,7 +37,7 @@ class TestMobileNetV3(unittest.TestCase):
     def test_fp32_mv3(self):
         (
             Tester(self.mv3, self.model_inputs)
-            .export(Export(CaptureConfig(enable_aot=True)))
+            .export()
             .to_edge()
             .check(list(self.all_operators))
             .partition()
@@ -66,7 +66,7 @@ def test_qs8_mv3(self):
         (
             Tester(self.mv3, self.model_inputs)
             .quantize()
-            .export(Export(CaptureConfig(enable_aot=True)))
+            .export()
             .to_edge()
             .check(list(ops_after_quantization))
             .partition(Partition(partitioner=XnnpackQuantizedPartitioner))

backends/xnnpack/test/tester/tester.py

@@ -14,10 +14,7 @@
 from executorch import exir
 from executorch.backends.xnnpack.partition.xnnpack_partitioner import XnnpackPartitioner
 from executorch.backends.xnnpack.passes import XNNPACKPassManager
-from executorch.backends.xnnpack.utils.configs import (
-    get_xnnpack_capture_config,
-    get_xnnpack_edge_compile_config,
-)
+from executorch.backends.xnnpack.utils.configs import get_xnnpack_edge_compile_config
 from executorch.exir import (
     CaptureConfig,
     EdgeCompileConfig,
@@ -124,7 +121,7 @@ def graph_module(self) -> str:
 @register_stage
 class Export(Stage):
     def __init__(self, capture_config: Optional[CaptureConfig] = None):
-        self.capture_conf = capture_config or get_xnnpack_capture_config()
+        self.capture_conf = capture_config or CaptureConfig(enable_aot=True)
         self.exir_exported_program = None
 
     def run(self, artifact: torch.nn.Module, inputs) -> None: