Revert "Arm backend: Populate __init__.py for quantizer and Arm root" (#10395)

Reverts #10351

Author: digantdesai

backends/arm/__init__.py

@@ -14,9 +14,9 @@
 import logging
 from typing import final, List
 
-from executorch.backends.arm import TOSABackend
-
 from executorch.backends.arm.arm_vela import vela_compile
+
+from executorch.backends.arm.tosa_backend import TOSABackend
 from executorch.exir.backend.backend_details import BackendDetails, PreprocessResult
 from executorch.exir.backend.compile_spec_schema import CompileSpec
 from torch.export.exported_program import ExportedProgram

backends/arm/ethosu_backend.py

@@ -10,7 +10,8 @@
 from executorch.backends.arm.arm_backend import (
     is_ethosu,
 )  # usort: skip
-from executorch.backends.arm import EthosUBackend, TOSAPartitioner
+from executorch.backends.arm.ethosu_backend import EthosUBackend
+from executorch.backends.arm.tosa_partitioner import TOSAPartitioner
 from executorch.exir.backend.compile_spec_schema import CompileSpec
 from executorch.exir.backend.partitioner import DelegationSpec
 from torch.fx.passes.operator_support import OperatorSupportBase

backends/arm/ethosu_partitioner.py

@@ -1,12 +1,4 @@
-# Copyright 2024-2025 Arm Limited and/or its affiliates.
+# Copyright 2024 Arm Limited and/or its affiliates.
 #
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
-
-
-from .quantization_config import QuantizationConfig  # noqa  # usort: skip
-from .arm_quantizer import (  # noqa
-    EthosUQuantizer,
-    get_symmetric_quantization_config,
-    TOSAQuantizer,
-)

backends/arm/quantizer/__init__.py

@@ -19,14 +19,15 @@
 import torch
 from executorch.backends.arm._passes import ArmPassManager
 
-from executorch.backends.arm.quantizer import arm_quantizer_utils, QuantizationConfig
+from executorch.backends.arm.quantizer import arm_quantizer_utils
 from executorch.backends.arm.quantizer.arm_quantizer_utils import (  # type: ignore[attr-defined]
     mark_node_as_annotated,
 )
 from executorch.backends.arm.quantizer.quantization_annotator import (  # type: ignore[import-not-found]
     annotate_graph,
 )
 
+from executorch.backends.arm.quantizer.quantization_config import QuantizationConfig
 from executorch.backends.arm.tosa_specification import TosaSpecification
 from executorch.backends.arm.arm_backend import (
     get_tosa_spec,

backends/arm/quantizer/arm_quantizer.py

@@ -10,7 +10,8 @@
 
 import torch
 import torch.fx
-from executorch.backends.arm.quantizer import arm_quantizer_utils, QuantizationConfig
+from executorch.backends.arm.quantizer import arm_quantizer_utils
+from executorch.backends.arm.quantizer.quantization_config import QuantizationConfig
 from executorch.backends.arm.tosa_utils import get_node_debug_info
 from torch.ao.quantization.quantizer import QuantizationSpecBase, SharedQuantizationSpec
 from torch.ao.quantization.quantizer.utils import (

backends/arm/quantizer/quantization_annotator.py

@@ -15,7 +15,7 @@
 
 import torch
 
-from executorch.backends.arm.quantizer import (
+from executorch.backends.arm.quantizer.arm_quantizer import (
     EthosUQuantizer,
     get_symmetric_quantization_config,
     TOSAQuantizer,

backends/arm/test/ops/test_expand.py

@@ -13,7 +13,7 @@
 
 import torch
 
-from executorch.backends.arm.quantizer import (
+from executorch.backends.arm.quantizer.arm_quantizer import (
     EthosUQuantizer,
     get_symmetric_quantization_config,
     TOSAQuantizer,

backends/arm/test/ops/test_hardtanh.py

@@ -12,7 +12,7 @@
 import pytest
 
 import torch
-from executorch.backends.arm.quantizer import (
+from executorch.backends.arm.quantizer.arm_quantizer import (
     EthosUQuantizer,
     get_symmetric_quantization_config,
     TOSAQuantizer,

backends/arm/test/ops/test_max_pool.py

@@ -13,7 +13,7 @@
 
 import torch
 
-from executorch.backends.arm.quantizer import (
+from executorch.backends.arm.quantizer.arm_quantizer import (
     EthosUQuantizer,
     get_symmetric_quantization_config,
     TOSAQuantizer,