Move mediatek.passes to mediatek._passes

backends/cadence/aot/TARGETS

@@ -49,7 +49,7 @@ python_library(
 python_library(
     name = "passes",
     srcs = [
-        "passes.py",
+        "_passes.py",
     ],
     deps = [
         ":utils",

backends/cadence/aot/compiler.py

@@ -11,7 +11,7 @@
 
 import torch
 
-from executorch.backends.cadence.aot.passes import (
+from executorch.backends.cadence.aot._passes import (
     InitializePipeline,
     RemoveNopExpandOpPass,
     RemoveZeroSizedCatArgsPass,

backends/mediatek/quantizer/quantizer.py

@@ -7,7 +7,7 @@
 from torch.ao.quantization.quantizer import Quantizer
 from torch.fx import GraphModule
 
-from ..passes.decompose_scaled_dot_product_attention import (
+from .._passes.decompose_scaled_dot_product_attention import (
     DecomposeScaledDotProductAttention,
 )
 from .annotator import annotate

backends/qualcomm/README.md

@@ -46,7 +46,7 @@ backends/qualcomm
 |   └── python # Python interface for using QNN libraries.
 ├── builders # Codes for lowering each operators (AoT Part).
 ├── partition # QNN Partitioner (AoT Part).
-├── passes # Various passes helping lower models to QNN backend (AoT Part).
+├── _passes # Various private passes helping lower models to QNN backend (AoT Part).
 ├── python # Places to put pybind artifacts for accessing QNN APIs, structures, etc (AoT Part).
 ├── quantizer # QNN Quantizer
 ├── runtime # Here is QNN runtime responsbile for compiling a model on x64.

backends/qualcomm/TARGETS

@@ -13,6 +13,6 @@ runtime.python_library(
         "@EXECUTORCH_CLIENTS",
     ],
     deps = [
-        "//executorch/backends/qualcomm/passes:passes",
+        "//executorch/backends/qualcomm/_passes:passes",
     ],
 )

backends/qualcomm/qnn_preprocess.py

@@ -11,15 +11,15 @@
 import executorch.backends.qualcomm.python.PyQnnManagerAdaptor as PyQnnManager
 
 import torch  # noqa: F401
-from executorch.backends.qualcomm.builders.node_visitor import get_node_visitors
-from executorch.backends.qualcomm.builders.qnn_constants import OpContextLoader
-from executorch.backends.qualcomm.passes.convert_to_linear import ConvertToLinear
-from executorch.backends.qualcomm.passes.fuse_consecutive_transpose import (
+from executorch.backends.qualcomm._passes.convert_to_linear import ConvertToLinear
+from executorch.backends.qualcomm._passes.fuse_consecutive_transpose import (
     FuseConsecutiveTranspose,
 )
-from executorch.backends.qualcomm.passes.insert_io_qdq import InsertIOQDQ
-from executorch.backends.qualcomm.passes.insert_requantize import InsertRequantize
-from executorch.backends.qualcomm.passes.layout_transform import LayoutTransform
+from executorch.backends.qualcomm._passes.insert_io_qdq import InsertIOQDQ
+from executorch.backends.qualcomm._passes.insert_requantize import InsertRequantize
+from executorch.backends.qualcomm._passes.layout_transform import LayoutTransform
+from executorch.backends.qualcomm.builders.node_visitor import get_node_visitors
+from executorch.backends.qualcomm.builders.qnn_constants import OpContextLoader
 from executorch.backends.qualcomm.utils.utils import generate_qnn_executorch_option
 from executorch.exir.backend.backend_details import (
     BackendDetails,

backends/qualcomm/quantizer/quantizer.py

@@ -7,12 +7,12 @@
 from typing import Callable, Dict, Optional, Sequence, Set
 
 import torch
-from executorch.backends.qualcomm.passes.decompose_silu import DecomposeSilu
-from executorch.backends.qualcomm.passes.recompose_pixel_unshuffle import (
+from executorch.backends.qualcomm._passes.decompose_silu import DecomposeSilu
+from executorch.backends.qualcomm._passes.recompose_pixel_unshuffle import (
     RecomposePixelUnshuffle,
 )
-from executorch.backends.qualcomm.passes.reduce_dynamic_range import ReduceDynamicRange
-from executorch.backends.qualcomm.passes.replace_inf_buffer import ReplaceInfBuffer
+from executorch.backends.qualcomm._passes.reduce_dynamic_range import ReduceDynamicRange
+from executorch.backends.qualcomm._passes.replace_inf_buffer import ReplaceInfBuffer
 from executorch.backends.transforms.decompose_sdpa import (
     DecomposeScaledDotProductAttention,
 )

backends/qualcomm/utils/constants.py

@@ -6,7 +6,7 @@
 
 # Qualcomm specific key
 
-# constants in backends/qualcomm/passes & backends/qualcomm/builders
+# constants in backends/qualcomm/_passes & backends/qualcomm/builders
 QCOM_AXIS = "axis"
 QCOM_AXIS_ORDER = "axis_order"
 QCOM_BITWIDTH = "bitwidth"

backends/qualcomm/utils/utils.py

@@ -14,40 +14,42 @@
 import executorch.exir as exir
 
 import torch
-
-from executorch.backends.qualcomm.builders.node_visitor import (
-    QNN_QUANT_TYPE_MAP,
-    QNN_TENSOR_TYPE_MAP,
-)
-from executorch.backends.qualcomm.builders.qnn_constants import OpContextLoader
-from executorch.backends.qualcomm.passes.annotate_and_quant_scalar import (
+from executorch.backends.qualcomm._passes.annotate_and_quant_scalar import (
     AnnotateAndQuantScalar,
 )
-from executorch.backends.qualcomm.passes.annotate_decomposed import AnnotateDecomposed
-from executorch.backends.qualcomm.passes.annotate_quant_attrs import AnnotateQuantAttrs
-from executorch.backends.qualcomm.passes.convert_binary_op_with_scalar import (
+from executorch.backends.qualcomm._passes.annotate_decomposed import AnnotateDecomposed
+from executorch.backends.qualcomm._passes.annotate_quant_attrs import AnnotateQuantAttrs
+from executorch.backends.qualcomm._passes.convert_binary_op_with_scalar import (
     ConvertBinaryOpsWithScalar,
 )
-from executorch.backends.qualcomm.passes.convert_bmm_to_matmul import ConvertBmmToMatmul
-from executorch.backends.qualcomm.passes.convert_interpolate_with_upsample2d import (
-    ConvertInterpolateWithUpsample2D,
+from executorch.backends.qualcomm._passes.convert_bmm_to_matmul import (
+    ConvertBmmToMatmul,
 )
-from executorch.backends.qualcomm.passes.convert_prelu import ConvertPReLU
-from executorch.backends.qualcomm.passes.convert_to_linear import ConvertToLinear
-from executorch.backends.qualcomm.passes.expand_broadcast_tensor_shape import (
-    ExpandBroadcastTensorShape,
+from executorch.backends.qualcomm._passes.convert_interpolate_with_upsample2d import (
+    ConvertInterpolateWithUpsample2D,
 )
-from executorch.backends.qualcomm.passes.fold_qdq import FoldQDQ
-from executorch.backends.qualcomm.passes.i64_to_i32 import I64toI32
-from executorch.backends.qualcomm.passes.layout_transform import LayoutTransform
-from executorch.backends.qualcomm.passes.recompose_pixel_unshuffle import (
+from executorch.backends.qualcomm._passes.convert_prelu import ConvertPReLU
+from executorch.backends.qualcomm._passes.convert_to_linear import ConvertToLinear
+from executorch.backends.qualcomm._passes.fold_qdq import FoldQDQ
+from executorch.backends.qualcomm._passes.i64_to_i32 import I64toI32
+from executorch.backends.qualcomm._passes.layout_transform import LayoutTransform
+from executorch.backends.qualcomm._passes.recompose_pixel_unshuffle import (
     RecomposePixelUnshuffle,
 )
-from executorch.backends.qualcomm.passes.recompose_rms_norm import RecomposeRmsNorm
-from executorch.backends.qualcomm.passes.remove_redundancy import RemoveRedundancy
-from executorch.backends.qualcomm.passes.replace_index_put_input import (
+from executorch.backends.qualcomm._passes.recompose_rms_norm import RecomposeRmsNorm
+from executorch.backends.qualcomm._passes.remove_redundancy import RemoveRedundancy
+from executorch.backends.qualcomm._passes.replace_index_put_input import (
     ReplaceIndexPutInput,
 )
+
+from executorch.backends.qualcomm.builders.node_visitor import (
+    QNN_QUANT_TYPE_MAP,
+    QNN_TENSOR_TYPE_MAP,
+)
+from executorch.backends.qualcomm.builders.qnn_constants import OpContextLoader
+from executorch.backends.qualcomm.passes.expand_broadcast_tensor_shape import (
+    ExpandBroadcastTensorShape,
+)
 from executorch.backends.qualcomm.serialization.qnn_compile_spec_schema import (
     _soc_info_table,
     QcomChipset,

backends/transforms/fuse_conv_with_clamp.py

@@ -7,7 +7,9 @@
 import sys
 
 import torch
-from executorch.backends.vulkan.passes.custom_ops_defs import conv_with_clamp_op  # noqa
+from executorch.backends.vulkan._passes.custom_ops_defs import (  # noqa
+    conv_with_clamp_op,
+)
 
 from executorch.exir.dialects._ops import ops as exir_ops
 from executorch.exir.pass_base import ExportPass, PassResult

backends/transforms/targets.bzl

@@ -70,7 +70,7 @@ def define_common_targets():
         deps = [
             ":utils",
             "//caffe2:torch",
-            "//executorch/backends/vulkan/passes:custom_ops_defs",
+            "//executorch/backends/vulkan/_passes:custom_ops_defs",
             "//executorch/exir:pass_base",
             "//executorch/exir:sym_util",
             "//executorch/exir/dialects:lib",

backends/vulkan/TARGETS

@@ -28,7 +28,7 @@ runtime.python_library(
         "//executorch/backends/transforms:fuse_view_copy",
         "//executorch/backends/transforms:mean_to_sum_div",
         "//executorch/backends/transforms:remove_clone_ops",
-        "//executorch/backends/vulkan/passes:remove_local_scalar_dense",
+        "//executorch/backends/vulkan/_passes:remove_local_scalar_dense",
         "//executorch/exir:graph_module",
         "//executorch/exir/_serialize:_bindings",
         "//executorch/exir/_serialize:lib",

backends/vulkan/partitioner/supported_ops.py

@@ -8,7 +8,7 @@
 
 import operator
 
-from executorch.backends.vulkan.passes.custom_ops_defs import (  # noqa
+from executorch.backends.vulkan._passes.custom_ops_defs import (  # noqa
     conv_with_clamp_op,
     grid_priors_op,
 )

backends/vulkan/vulkan_preprocess.py

@@ -17,7 +17,7 @@
 from executorch.backends.transforms.mean_to_sum_div import MeanToSumDiv
 from executorch.backends.transforms.remove_clone_ops import RemoveCloneOpsTransform
 
-from executorch.backends.vulkan.passes.remove_local_scalar_dense_ops import (
+from executorch.backends.vulkan._passes.remove_local_scalar_dense_ops import (
     RemoveLocalScalarDenseOpsTransform,
 )
 

examples/qualcomm/oss_scripts/llama2/llama.py

@@ -12,9 +12,9 @@
 from multiprocessing.connection import Client
 
 import torch
+from executorch.backends.qualcomm._passes.build_quant_io import BuildQuantIo
 
 from executorch.backends.qualcomm.partition.qnn_partitioner import QnnPartitioner
-from executorch.backends.qualcomm.passes.build_quant_io import BuildQuantIo
 
 from executorch.backends.qualcomm.quantizer.quantizer import QuantDtype
 from executorch.backends.qualcomm.serialization.qnn_compile_spec_schema import (