Integrate NeutronAtenPassManager passes into pipeline

Author: skywall

backends/nxp/quantizer/neutron_quantizer.py

@@ -7,6 +7,9 @@
 from typing import List, Optional, Tuple, Union
 
 import torch
+from executorch.backends.nxp.aten_passes.neutron_aten_pass_manager import (
+    NeutronAtenPassManager,
+)
 
 from executorch.backends.nxp.quantizer.patterns import (
     AddmmPattern,
@@ -202,4 +205,5 @@ def __init__(self):
     def transform_for_annotation(
         self, model: torch.fx.GraphModule
     ) -> torch.fx.GraphModule:
-        return model
+        pass_runner = NeutronAtenPassManager()
+        return pass_runner(model).graph_module

backends/nxp/tests/executorch_pipeline.py

@@ -8,9 +8,6 @@
 from executorch import exir
 from executorch.backends.nxp.neutron_partitioner import NeutronPartitioner
 from executorch.backends.nxp.nxp_backend import generate_neutron_compile_spec
-
-# TODO (Robert Kalmar) Uncomment when NXP passes are ported to main
-# from executorch.backends.nxp.pytorch_passes.nxp_pytorch_pass_manager import NXPPyTorchPassManager
 from executorch.backends.nxp.quantizer.neutron_quantizer import NeutronQuantizer
 from executorch.exir import (
     EdgeCompileConfig,
@@ -27,7 +24,7 @@ def _quantize_model(model, calibration_inputs: list[tuple[torch.Tensor]]):
     quantizer = NeutronQuantizer()
 
     m = prepare_pt2e(model, quantizer)
-    for _i, data in enumerate(calibration_inputs):
+    for data in calibration_inputs:
         m(*data)
     m = convert_pt2e(m)
 
@@ -48,14 +45,8 @@ def to_quantized_edge_program(
         model, example_input, strict=True
     )
 
-    # TODO(Robert Kalmar) uncoment when NXP passes are ported to main
-    # Run pre-processing passes of the float32 aten dialect program.
-    # pass_manager = NXPPyTorchPassManager(exir_program_aten)
-    # pass_manager.run()  # All passes by default.
-
-    exir_program_aten_module = exir_program_aten.module()
     exir_program_aten__module_quant = _quantize_model(
-        exir_program_aten_module, calibration_inputs
+        exir_program_aten.module(), calibration_inputs
     )
 
     compile_spec = generate_neutron_compile_spec(