Skip to content

Commit dab563d

Browse files
NXP backend: Enable Amax with new Neutron flow
1 parent d900599 commit dab563d

11 files changed

Lines changed: 512 additions & 1 deletion

File tree

backends/nxp/backend/edge_helper.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
from executorch.backends.nxp.tests.ops_aliases import (
1212
AddTensor,
13+
Amax,
1314
Amin,
1415
Cat,
1516
Clone,
@@ -46,6 +47,7 @@
4647
no_op_candidates = {
4748
AddTensor,
4849
Amin,
50+
Amax,
4951
MulTensor,
5052
PermuteCopy,
5153
SubTensor,

backends/nxp/backend/edge_program_converter.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
exir_ops.edge.aten._adaptive_avg_pool2d.default: AdaptiveAvgPool2dConverter, # noqa F405
3232
exir_ops.edge.aten.addmm.default: AddMMConverter, # noqa F405
3333
exir_ops.edge.aten.add.Tensor: AddTensorConverter, # noqa F405
34+
exir_ops.edge.aten.amax.default: AmaxConverter, # noqa F405
3435
exir_ops.edge.aten.amin.default: AminConverter, # noqa F405
3536
exir_ops.edge.aten.avg_pool2d.default: AvgPool2dConverter, # noqa F405
3637
exir_ops.edge.aten.bmm.default: BMMConverter, # noqa F405

backends/nxp/backend/ir/converter/node_converters/ops_converters/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
from executorch.backends.nxp.backend.ir.converter.node_converters.ops_converters.addmm_converter import (
1111
AddMMConverter,
1212
)
13+
from executorch.backends.nxp.backend.ir.converter.node_converters.ops_converters.amax_converter import (
14+
AmaxConverter,
15+
)
1316
from executorch.backends.nxp.backend.ir.converter.node_converters.ops_converters.amin_converter import (
1417
AminConverter,
1518
)
@@ -110,6 +113,7 @@
110113
"AdaptiveAvgPool2dConverter",
111114
"AddMMConverter",
112115
"AddTensorConverter",
116+
"AmaxConverter",
113117
"AminConverter",
114118
"AvgPool2dConverter",
115119
"BMMConverter",
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Copyright 2026 NXP
2+
#
3+
# This source code is licensed under the BSD-style license found in the
4+
# LICENSE file in the root directory of this source tree.
5+
6+
import torch
7+
8+
from executorch.backends.nxp.backend.ir.converter.conversion.common import OpsList
9+
from executorch.backends.nxp.backend.ir.converter.node_converter import (
10+
CustomDelegationOptions,
11+
NodeConverter,
12+
)
13+
from executorch.backends.nxp.backend.ir.converter.node_converters.shared.reduce_utils import (
14+
convert_axes_from_attribute,
15+
get_dim_and_handle_io_formats,
16+
get_reduce_node_attrs,
17+
)
18+
from executorch.backends.nxp.backend.ir.tflite_generator.builtin_options import (
19+
reduce_max_options,
20+
)
21+
from executorch.backends.nxp.backend.neutron_target_spec import NeutronTargetSpec
22+
from torch.fx import Node
23+
from torch.nn import Parameter
24+
25+
26+
class AmaxConverter(NodeConverter):
27+
28+
@staticmethod
29+
def _is_supported_on_target(
30+
node: Node,
31+
neutron_target_spec: NeutronTargetSpec,
32+
parameters_mapping: dict[str, Parameter],
33+
custom_delegation_options: CustomDelegationOptions,
34+
) -> bool:
35+
if not NodeConverter.uses_quantization_type_for_io(
36+
node,
37+
supported_types=[torch.int8, torch.uint8],
38+
input_indices=[0],
39+
output_indices=[0],
40+
):
41+
return False
42+
43+
return True
44+
45+
@staticmethod
46+
def _is_supported_in_IR(
47+
node: Node,
48+
parameters_mapping: dict[str, Parameter],
49+
custom_delegation_options: CustomDelegationOptions,
50+
) -> bool:
51+
if not NodeConverter._has_shared_q_params_if_quantized(node):
52+
return False
53+
54+
return True
55+
56+
def convert(self, node: Node):
57+
"""Convert the 'amax' operator to NeutronIR 'ReduceMax'.
58+
The ExecuTorch schema is:
59+
amax(
60+
Tensor self,
61+
int[1]? dim,
62+
bool keepdim=False,
63+
) -> Tensor
64+
"""
65+
self.assert_convertible(node)
66+
67+
dim, keepdim = get_reduce_node_attrs(node)
68+
69+
t_op = self._create_tflite_op_with_io_tensors(node)
70+
t_op.builtin_options = reduce_max_options.ReduceMax(keepdim)
71+
72+
ops = OpsList(middle_op=t_op)
73+
dim = get_dim_and_handle_io_formats(self.builder, ops, dim, keepdim)
74+
75+
convert_axes_from_attribute(t_op, self.builder, dim)
76+
self.builder.append_operators(ops.flatten())

backends/nxp/backend/node_format_inference.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from executorch.backends.nxp.backend.edge_program_converter import functions_converters
1717
from executorch.backends.nxp.tests.ops_aliases import (
1818
AdaptiveAvgPool2D,
19+
Amax,
1920
Amin,
2021
AvgPool2D,
2122
Convolution,
@@ -59,6 +60,7 @@ class NodeFormatInference:
5960
ViewCopy,
6061
PermuteCopy,
6162
MeanDim,
63+
Amax,
6264
Amin,
6365
}
6466

@@ -136,7 +138,7 @@ def _infer_format_of_nodes(self, node: Node):
136138
self._node_inputs[node][0], DataFormat.FORMATLESS
137139
)
138140

139-
elif op_type in [MeanDim, Amin]:
141+
elif op_type in [MeanDim, Amax, Amin]:
140142
# The operator schema is:
141143
# <reduce_op>(Tensor self, int[1]? dim, bool keepdim=False, *, ScalarType? dtype=None) -> Tensor
142144
keep_dim = try_get_arg(node, 2) or False

backends/nxp/neutron_partitioner.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ def tag_qdq_clusters(self, nodes: list[torch.fx.Node]):
204204
exir_ops.edge.aten._adaptive_avg_pool2d.default: AdaptiveAvgPool2dConverter, # noqa F405
205205
exir_ops.edge.aten.addmm.default: AddMMConverter, # noqa F405
206206
exir_ops.edge.aten.add.Tensor: AddTensorConverter, # noqa F405
207+
exir_ops.edge.aten.amax.default: AmaxConverter, # noqa F405
207208
exir_ops.edge.aten.amin.default: AminConverter, # noqa F405
208209
exir_ops.edge.aten.avg_pool2d.default: AvgPool2dConverter, # noqa F405
209210
exir_ops.edge.aten.bmm.default: BMMConverter, # noqa F405

backends/nxp/quantizer/neutron_quantizer.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
AdaptiveAvgPoolPattern,
1717
AddmmPattern,
1818
AddTensorPattern,
19+
AmaxPattern,
1920
AminPattern,
2021
AvgPool1DPattern,
2122
AvgPool2DPattern,
@@ -261,6 +262,7 @@ def __init__(self, neutron_target_spec: NeutronTargetSpec, is_qat: bool = False)
261262
OpQuantizer(AdaptiveAvgPoolPattern(is_qat=is_qat), static_qconfig),
262263
OpQuantizer(AddTensorPattern(is_qat=is_qat), static_qconfig),
263264
OpQuantizer(AddmmPattern(self, is_qat=is_qat), static_fc_qconfig),
265+
OpQuantizer(AmaxPattern(is_qat=is_qat), static_qconfig),
264266
OpQuantizer(AminPattern(is_qat=is_qat), static_qconfig),
265267
OpQuantizer(AvgPool1DPattern(is_qat=is_qat), static_qconfig),
266268
OpQuantizer(AvgPool2DPattern(is_qat=is_qat), static_qconfig),

backends/nxp/quantizer/patterns.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,15 @@ def get_anchors(
319319
)
320320

321321

322+
class AmaxPattern(SharedSpecPattern):
323+
"""
324+
Quantizer for Amax operator.
325+
"""
326+
327+
def partition_types(self):
328+
return [torch.ops.aten.amax.default]
329+
330+
322331
class AminPattern(SharedSpecPattern):
323332
"""
324333
Quantizer for Amin operator.

0 commit comments

Comments
 (0)