diff --git a/backends/nxp/backend/ir/converter/builder/model_builder.py b/backends/nxp/backend/ir/converter/builder/model_builder.py index 87b1e55bcf9..826b0038fae 100755 --- a/backends/nxp/backend/ir/converter/builder/model_builder.py +++ b/backends/nxp/backend/ir/converter/builder/model_builder.py @@ -1,6 +1,6 @@ # # Copyright 2023 Martin Pavella -# Copyright 2023-2025 NXP +# Copyright 2023-2026 NXP # # License: MIT # See the LICENSE_MIT for more details. @@ -34,6 +34,7 @@ BuiltinOperator, ) from executorch.backends.nxp.backend.ir.lib.tflite.TensorType import TensorType +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing import optimizer from executorch.backends.nxp.backend.ir.tensor_formatting import TensorFormat from executorch.backends.nxp.backend.ir.tflite_generator.builtin_options import ( cast_options, @@ -49,7 +50,6 @@ from executorch.backends.nxp.backend.ir.tflite_generator.custom_options.flex_transpose_options import ( FlexTranspose, ) -from executorch.backends.nxp.backend.ir.tflite_optimizer import optimizer from executorch.backends.nxp.backend.neutron_operator_support import ( transposition_is_supported_on_neutron, ) diff --git a/backends/nxp/backend/ir/tflite_optimizer/README.md b/backends/nxp/backend/ir/neutron_ir_post_processing/README.md similarity index 100% rename from backends/nxp/backend/ir/tflite_optimizer/README.md rename to backends/nxp/backend/ir/neutron_ir_post_processing/README.md diff --git a/backends/nxp/backend/ir/tflite_optimizer/__init__.py b/backends/nxp/backend/ir/neutron_ir_post_processing/__init__.py similarity index 100% rename from backends/nxp/backend/ir/tflite_optimizer/__init__.py rename to backends/nxp/backend/ir/neutron_ir_post_processing/__init__.py diff --git a/backends/nxp/backend/ir/tflite_optimizer/graph_utils.py b/backends/nxp/backend/ir/neutron_ir_post_processing/graph_utils.py similarity index 100% rename from backends/nxp/backend/ir/tflite_optimizer/graph_utils.py rename to backends/nxp/backend/ir/neutron_ir_post_processing/graph_utils.py diff --git a/backends/nxp/backend/ir/tflite_optimizer/operator_rules.py b/backends/nxp/backend/ir/neutron_ir_post_processing/operator_rules.py similarity index 92% rename from backends/nxp/backend/ir/tflite_optimizer/operator_rules.py rename to backends/nxp/backend/ir/neutron_ir_post_processing/operator_rules.py index e861eff0d18..85b568f228c 100755 --- a/backends/nxp/backend/ir/tflite_optimizer/operator_rules.py +++ b/backends/nxp/backend/ir/neutron_ir_post_processing/operator_rules.py @@ -1,4 +1,4 @@ -# Copyright 2024-2025 NXP +# Copyright 2024-2026 NXP # # This source code is licensed under the BSD-style license found in the # LICENSE file in the root directory of this source tree. @@ -10,15 +10,15 @@ from executorch.backends.nxp.backend.ir.lib.tflite.ActivationFunctionType import ( ActivationFunctionType, ) -from executorch.backends.nxp.backend.ir.tflite_generator import tflite_model -from executorch.backends.nxp.backend.ir.tflite_optimizer.graph_utils import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.graph_utils import ( NameToTensorMap, operator_is_type, ) -from executorch.backends.nxp.backend.ir.tflite_optimizer.optimizations.base_optimization import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.optimizations.base_optimization import ( InputTensorToOpsMap, OutputTensorToOpMap, ) +from executorch.backends.nxp.backend.ir.tflite_generator import tflite_model class OpRule(ABC): diff --git a/backends/nxp/backend/ir/tflite_optimizer/optimizations/__init__.py b/backends/nxp/backend/ir/neutron_ir_post_processing/optimizations/__init__.py similarity index 100% rename from backends/nxp/backend/ir/tflite_optimizer/optimizations/__init__.py rename to backends/nxp/backend/ir/neutron_ir_post_processing/optimizations/__init__.py diff --git a/backends/nxp/backend/ir/tflite_optimizer/optimizations/base_optimization.py b/backends/nxp/backend/ir/neutron_ir_post_processing/optimizations/base_optimization.py similarity index 92% rename from backends/nxp/backend/ir/tflite_optimizer/optimizations/base_optimization.py rename to backends/nxp/backend/ir/neutron_ir_post_processing/optimizations/base_optimization.py index 18e397cc1bd..4e199243868 100755 --- a/backends/nxp/backend/ir/tflite_optimizer/optimizations/base_optimization.py +++ b/backends/nxp/backend/ir/neutron_ir_post_processing/optimizations/base_optimization.py @@ -1,4 +1,4 @@ -# Copyright 2024 NXP +# Copyright 2024-2026 NXP # # This source code is licensed under the BSD-style license found in the # LICENSE file in the root directory of this source tree. @@ -7,7 +7,7 @@ from executorch.backends.nxp.backend.ir.conversion_config import ConversionConfig from executorch.backends.nxp.backend.ir.converter.builder import model_builder -from executorch.backends.nxp.backend.ir.tflite_optimizer.graph_utils import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.graph_utils import ( create_tensor_to_operator_dictionaries, InputTensorToOpsMap, OutputTensorToOpMap, diff --git a/backends/nxp/backend/ir/tflite_optimizer/optimizations/permute_fully_connected_weights_after_reshape.py b/backends/nxp/backend/ir/neutron_ir_post_processing/optimizations/permute_fully_connected_weights_after_reshape.py similarity index 94% rename from backends/nxp/backend/ir/tflite_optimizer/optimizations/permute_fully_connected_weights_after_reshape.py rename to backends/nxp/backend/ir/neutron_ir_post_processing/optimizations/permute_fully_connected_weights_after_reshape.py index ef76fad90de..dd1f209bf87 100755 --- a/backends/nxp/backend/ir/tflite_optimizer/optimizations/permute_fully_connected_weights_after_reshape.py +++ b/backends/nxp/backend/ir/neutron_ir_post_processing/optimizations/permute_fully_connected_weights_after_reshape.py @@ -1,4 +1,4 @@ -# Copyright 2024-2025 NXP +# Copyright 2024-2026 NXP # # This source code is licensed under the BSD-style license found in the # LICENSE file in the root directory of this source tree. @@ -7,14 +7,14 @@ from executorch.backends.nxp.backend.ir import logger from executorch.backends.nxp.backend.ir.converter.conversion import translator -from executorch.backends.nxp.backend.ir.tflite_optimizer.optimizations.base_optimization import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.optimizations.base_optimization import ( BaseOptimization, ) -from executorch.backends.nxp.backend.ir.tflite_optimizer.pattern_matcher import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.pattern_matcher import ( Op, PatternMatcher, ) -from executorch.backends.nxp.backend.ir.tflite_optimizer.tensor_rules import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.tensor_rules import ( TensorDimensionsMatch, TensorHasRank, TensorIsChannelsFirst, diff --git a/backends/nxp/backend/ir/tflite_optimizer/optimizations/prune_transpose_operators.py b/backends/nxp/backend/ir/neutron_ir_post_processing/optimizations/prune_transpose_operators.py similarity index 95% rename from backends/nxp/backend/ir/tflite_optimizer/optimizations/prune_transpose_operators.py rename to backends/nxp/backend/ir/neutron_ir_post_processing/optimizations/prune_transpose_operators.py index 053e53d9df8..d57b67d92b8 100755 --- a/backends/nxp/backend/ir/tflite_optimizer/optimizations/prune_transpose_operators.py +++ b/backends/nxp/backend/ir/neutron_ir_post_processing/optimizations/prune_transpose_operators.py @@ -1,4 +1,4 @@ -# Copyright 2024-2025 NXP +# Copyright 2024-2026 NXP # # This source code is licensed under the BSD-style license found in the # LICENSE file in the root directory of this source tree. @@ -9,21 +9,21 @@ apply_permutation_to, combine_permutations, ) -from executorch.backends.nxp.backend.ir.tflite_generator import tflite_model -from executorch.backends.nxp.backend.ir.tflite_optimizer.optimizations.base_optimization import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.optimizations.base_optimization import ( BaseOptimization, ) -from executorch.backends.nxp.backend.ir.tflite_optimizer.pattern_matcher import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.pattern_matcher import ( MultipleSameOps, Op, PatternMatcher, ) -from executorch.backends.nxp.backend.ir.tflite_optimizer.tensor_rules import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.tensor_rules import ( RuleOr, TensorHasData, TensorIsNotModelOutput, TensorsHaveData, ) +from executorch.backends.nxp.backend.ir.tflite_generator import tflite_model from executorch.backends.nxp.backend.neutron_operator_support import ( transposition_is_supported_on_neutron, ) diff --git a/backends/nxp/backend/ir/tflite_optimizer/optimizer.py b/backends/nxp/backend/ir/neutron_ir_post_processing/optimizer.py similarity index 94% rename from backends/nxp/backend/ir/tflite_optimizer/optimizer.py rename to backends/nxp/backend/ir/neutron_ir_post_processing/optimizer.py index 1a96422e377..cea514e6a1c 100755 --- a/backends/nxp/backend/ir/tflite_optimizer/optimizer.py +++ b/backends/nxp/backend/ir/neutron_ir_post_processing/optimizer.py @@ -1,6 +1,6 @@ # # Copyright 2023 Martin Pavella -# Copyright 2024-2025 NXP +# Copyright 2024-2026 NXP # # License: MIT # See the LICENSE_MIT for more details. @@ -11,10 +11,10 @@ from executorch.backends.nxp.backend.ir import logger from executorch.backends.nxp.backend.ir.conversion_config import ConversionConfig -from executorch.backends.nxp.backend.ir.tflite_optimizer.optimizations.permute_fully_connected_weights_after_reshape import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.optimizations.permute_fully_connected_weights_after_reshape import ( PermuteFullyConnectedWeightsAfterReshape, ) -from executorch.backends.nxp.backend.ir.tflite_optimizer.optimizations.prune_transpose_operators import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.optimizations.prune_transpose_operators import ( FuseTransposeOperators, RemoveIdentityTransposeOperators, ) diff --git a/backends/nxp/backend/ir/tflite_optimizer/pattern_matcher.py b/backends/nxp/backend/ir/neutron_ir_post_processing/pattern_matcher.py similarity index 99% rename from backends/nxp/backend/ir/tflite_optimizer/pattern_matcher.py rename to backends/nxp/backend/ir/neutron_ir_post_processing/pattern_matcher.py index 84d65d817b2..98512cee4b5 100755 --- a/backends/nxp/backend/ir/tflite_optimizer/pattern_matcher.py +++ b/backends/nxp/backend/ir/neutron_ir_post_processing/pattern_matcher.py @@ -1,4 +1,4 @@ -# Copyright 2024 NXP +# Copyright 2024-2026 NXP # # This source code is licensed under the BSD-style license found in the # LICENSE file in the root directory of this source tree. @@ -10,8 +10,7 @@ import executorch.backends.nxp.backend.ir.converter.builder.model_builder as model_builder from executorch.backends.nxp.backend.ir import logger -from executorch.backends.nxp.backend.ir.tflite_generator import tflite_model -from executorch.backends.nxp.backend.ir.tflite_optimizer.graph_utils import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.graph_utils import ( builtin_operator_for_op_type, create_tensor_to_operator_dictionaries, InputTensorToOpsMap, @@ -19,8 +18,13 @@ operator_is_type, OutputTensorToOpMap, ) -from executorch.backends.nxp.backend.ir.tflite_optimizer.operator_rules import OpRule -from executorch.backends.nxp.backend.ir.tflite_optimizer.tensor_rules import TensorRule +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.operator_rules import ( + OpRule, +) +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.tensor_rules import ( + TensorRule, +) +from executorch.backends.nxp.backend.ir.tflite_generator import tflite_model class OperatorBlock(ABC): diff --git a/backends/nxp/backend/ir/tflite_optimizer/tensor_rules.py b/backends/nxp/backend/ir/neutron_ir_post_processing/tensor_rules.py similarity index 98% rename from backends/nxp/backend/ir/tflite_optimizer/tensor_rules.py rename to backends/nxp/backend/ir/neutron_ir_post_processing/tensor_rules.py index 270f38f9a0c..16d3d674297 100755 --- a/backends/nxp/backend/ir/tflite_optimizer/tensor_rules.py +++ b/backends/nxp/backend/ir/neutron_ir_post_processing/tensor_rules.py @@ -1,4 +1,4 @@ -# Copyright 2024 NXP +# Copyright 2024-2026 NXP # # This source code is licensed under the BSD-style license found in the # LICENSE file in the root directory of this source tree. @@ -10,16 +10,16 @@ import numpy as np from executorch.backends.nxp.backend.ir.lib.tflite.TensorType import TensorType -from executorch.backends.nxp.backend.ir.tensor_formatting import TensorFormat -from executorch.backends.nxp.backend.ir.tflite_generator import tflite_model -from executorch.backends.nxp.backend.ir.tflite_optimizer.optimizations.base_optimization import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.optimizations.base_optimization import ( InputTensorToOpsMap, OutputTensorToOpMap, ) -from executorch.backends.nxp.backend.ir.tflite_optimizer.pattern_matcher import ( +from executorch.backends.nxp.backend.ir.neutron_ir_post_processing.pattern_matcher import ( NameToTensorMap, operator_is_type, ) +from executorch.backends.nxp.backend.ir.tensor_formatting import TensorFormat +from executorch.backends.nxp.backend.ir.tflite_generator import tflite_model class TensorRule(ABC):