Skip to content

NXP backend: Fix group convolution merge conflict. #13867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

NXP backend: Fix group convolution merge conflict. #13867

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions backends/nxp/tests/test_split_group_convolution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,50 @@

import numpy as np
import torch
from parameterized import parameterized
from torch.fx import GraphModule

from executorch.backends.nxp.aten_passes.neutron_aten_pass_manager import (
NeutronAtenPassManager,
)
from executorch.backends.nxp.aten_passes.split_group_convolution import (
SplitGroupConvolution,
)
from executorch.backends.nxp.tests.executorch_pipeline import to_quantized_edge_program
from executorch.backends.nxp.neutron_partitioner import NeutronPartitioner
from executorch.backends.nxp.nxp_backend import generate_neutron_compile_spec
from executorch.backends.nxp.tests.executorch_pipeline import (
_quantize_model,
get_random_calibration_inputs,
to_model_input_spec,
)
from executorch.backends.nxp.tests.executors import graph_contains_any_of_ops
from executorch.backends.nxp.tests.models import (
Conv1dModule,
Conv2dModule,
Conv3dModule,
)
from executorch.exir import EdgeCompileConfig, EdgeProgramManager
from executorch.exir.dialects._ops import ops as exir_ops
from parameterized import parameterized
from executorch.extension.export_util import export_to_edge


def _quantize_and_lower_module(
module: GraphModule, input_shape: tuple[int, ...], target="imxrt700"
) -> EdgeProgramManager:
calibration_inputs = get_random_calibration_inputs(to_model_input_spec(input_shape))

exir_program_aten__module_quant = _quantize_model(module, calibration_inputs)

edge_compile_config = EdgeCompileConfig(_check_ir_validity=False)
edge_program_manager = export_to_edge(
exir_program_aten__module_quant,
calibration_inputs[0],
edge_compile_config=edge_compile_config,
)

compile_spec = generate_neutron_compile_spec(target, "SDK_25_03")
partitioner = NeutronPartitioner(compile_spec)
return edge_program_manager.to_backend(partitioner)


class TestSplitGroupConvolution(unittest.TestCase):
Expand Down Expand Up @@ -81,7 +109,7 @@ def test_split_group_convolution__2d(self, _, input_shape: list[int], group: int
assert np.allclose(out1, out2, atol=2.0e-7)

# Make sure the graph can be correctly quantized and lowered to edge.
ep = to_quantized_edge_program(
ep = _quantize_and_lower_module(
modified_module, tuple(input_shape)
).exported_program()
nodes = list(ep.graph.nodes)
Expand Down Expand Up @@ -138,7 +166,7 @@ def test_split_group_convolution__1d(self, _, input_shape: list[int], group: int
assert np.allclose(out1, out2, atol=2.0e-7)

# Make sure the graph can be correctly quantized and lowered to edge.
ep = to_quantized_edge_program(
ep = _quantize_and_lower_module(
modified_module, tuple(input_shape)
).exported_program()
nodes = list(ep.graph.nodes)
Expand Down Expand Up @@ -226,7 +254,7 @@ def test_split_group_convolution__applied_by_default(self):
assert np.allclose(out1, out2, atol=5.0e-7)

# Make sure the graph can be correctly quantized and lowered to edge.
ep = to_quantized_edge_program(
ep = _quantize_and_lower_module(
modified_module, tuple(input_shape)
).exported_program()
nodes = list(ep.graph.nodes)
Expand Down
Loading