Skip to content

Commit 866b40c

Browse files
tarun292facebook-github-bot
authored andcommitted
Move qualcomm.passes to qualcomm._passes (#5920)
Summary: Changing qualcomm.passes to qualcomm._passes to indicate that these passes are not covered under the API stability guarantee. Pull Request resolved: #5920 Reviewed By: helunwencser Differential Revision: D63926845 fbshipit-source-id: f1e3187f3012f83b388d9635ca5a244fa36950d6
1 parent e1832ef commit 866b40c

31 files changed

+41
-39
lines changed

backends/qualcomm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ backends/qualcomm
4646
| └── python # Python interface for using QNN libraries.
4747
├── builders # Codes for lowering each operators (AoT Part).
4848
├── partition # QNN Partitioner (AoT Part).
49-
├── passes # Various passes helping lower models to QNN backend (AoT Part).
49+
├── _passes # Various private passes helping lower models to QNN backend (AoT Part).
5050
├── python # Places to put pybind artifacts for accessing QNN APIs, structures, etc (AoT Part).
5151
├── quantizer # QNN Quantizer
5252
├── runtime # Here is QNN runtime responsbile for compiling a model on x64.

backends/qualcomm/TARGETS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ runtime.python_library(
1313
"@EXECUTORCH_CLIENTS",
1414
],
1515
deps = [
16-
"//executorch/backends/qualcomm/passes:passes",
16+
"//executorch/backends/qualcomm/_passes:passes",
1717
],
1818
)
File renamed without changes.

backends/qualcomm/qnn_preprocess.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
import executorch.backends.qualcomm.python.PyQnnManagerAdaptor as PyQnnManager
1212

1313
import torch # noqa: F401
14-
from executorch.backends.qualcomm.builders.node_visitor import get_node_visitors
15-
from executorch.backends.qualcomm.builders.qnn_constants import OpContextLoader
16-
from executorch.backends.qualcomm.passes.convert_to_linear import ConvertToLinear
17-
from executorch.backends.qualcomm.passes.fuse_consecutive_transpose import (
14+
from executorch.backends.qualcomm._passes.convert_to_linear import ConvertToLinear
15+
from executorch.backends.qualcomm._passes.fuse_consecutive_transpose import (
1816
FuseConsecutiveTranspose,
1917
)
20-
from executorch.backends.qualcomm.passes.insert_io_qdq import InsertIOQDQ
21-
from executorch.backends.qualcomm.passes.insert_requantize import InsertRequantize
22-
from executorch.backends.qualcomm.passes.layout_transform import LayoutTransform
18+
from executorch.backends.qualcomm._passes.insert_io_qdq import InsertIOQDQ
19+
from executorch.backends.qualcomm._passes.insert_requantize import InsertRequantize
20+
from executorch.backends.qualcomm._passes.layout_transform import LayoutTransform
21+
from executorch.backends.qualcomm.builders.node_visitor import get_node_visitors
22+
from executorch.backends.qualcomm.builders.qnn_constants import OpContextLoader
2323
from executorch.backends.qualcomm.utils.utils import generate_qnn_executorch_option
2424
from executorch.exir.backend.backend_details import (
2525
BackendDetails,

backends/qualcomm/quantizer/quantizer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
from typing import Callable, Dict, Optional, Sequence, Set
88

99
import torch
10-
from executorch.backends.qualcomm.passes.decompose_silu import DecomposeSilu
11-
from executorch.backends.qualcomm.passes.recompose_pixel_unshuffle import (
10+
from executorch.backends.qualcomm._passes.decompose_silu import DecomposeSilu
11+
from executorch.backends.qualcomm._passes.recompose_pixel_unshuffle import (
1212
RecomposePixelUnshuffle,
1313
)
14-
from executorch.backends.qualcomm.passes.reduce_dynamic_range import ReduceDynamicRange
15-
from executorch.backends.qualcomm.passes.replace_inf_buffer import ReplaceInfBuffer
14+
from executorch.backends.qualcomm._passes.reduce_dynamic_range import ReduceDynamicRange
15+
from executorch.backends.qualcomm._passes.replace_inf_buffer import ReplaceInfBuffer
1616
from executorch.backends.transforms.decompose_sdpa import (
1717
DecomposeScaledDotProductAttention,
1818
)

backends/qualcomm/utils/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# Qualcomm specific key
88

9-
# constants in backends/qualcomm/passes & backends/qualcomm/builders
9+
# constants in backends/qualcomm/_passes & backends/qualcomm/builders
1010
QCOM_AXIS = "axis"
1111
QCOM_AXIS_ORDER = "axis_order"
1212
QCOM_BITWIDTH = "bitwidth"

backends/qualcomm/utils/utils.py

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,42 @@
1414
import executorch.exir as exir
1515

1616
import torch
17-
18-
from executorch.backends.qualcomm.builders.node_visitor import (
19-
QNN_QUANT_TYPE_MAP,
20-
QNN_TENSOR_TYPE_MAP,
21-
)
22-
from executorch.backends.qualcomm.builders.qnn_constants import OpContextLoader
23-
from executorch.backends.qualcomm.passes.annotate_and_quant_scalar import (
17+
from executorch.backends.qualcomm._passes.annotate_and_quant_scalar import (
2418
AnnotateAndQuantScalar,
2519
)
26-
from executorch.backends.qualcomm.passes.annotate_decomposed import AnnotateDecomposed
27-
from executorch.backends.qualcomm.passes.annotate_quant_attrs import AnnotateQuantAttrs
28-
from executorch.backends.qualcomm.passes.convert_binary_op_with_scalar import (
20+
from executorch.backends.qualcomm._passes.annotate_decomposed import AnnotateDecomposed
21+
from executorch.backends.qualcomm._passes.annotate_quant_attrs import AnnotateQuantAttrs
22+
from executorch.backends.qualcomm._passes.convert_binary_op_with_scalar import (
2923
ConvertBinaryOpsWithScalar,
3024
)
31-
from executorch.backends.qualcomm.passes.convert_bmm_to_matmul import ConvertBmmToMatmul
32-
from executorch.backends.qualcomm.passes.convert_interpolate_with_upsample2d import (
33-
ConvertInterpolateWithUpsample2D,
25+
from executorch.backends.qualcomm._passes.convert_bmm_to_matmul import (
26+
ConvertBmmToMatmul,
3427
)
35-
from executorch.backends.qualcomm.passes.convert_prelu import ConvertPReLU
36-
from executorch.backends.qualcomm.passes.convert_to_linear import ConvertToLinear
37-
from executorch.backends.qualcomm.passes.expand_broadcast_tensor_shape import (
38-
ExpandBroadcastTensorShape,
28+
from executorch.backends.qualcomm._passes.convert_interpolate_with_upsample2d import (
29+
ConvertInterpolateWithUpsample2D,
3930
)
40-
from executorch.backends.qualcomm.passes.fold_qdq import FoldQDQ
41-
from executorch.backends.qualcomm.passes.i64_to_i32 import I64toI32
42-
from executorch.backends.qualcomm.passes.layout_transform import LayoutTransform
43-
from executorch.backends.qualcomm.passes.recompose_pixel_unshuffle import (
31+
from executorch.backends.qualcomm._passes.convert_prelu import ConvertPReLU
32+
from executorch.backends.qualcomm._passes.convert_to_linear import ConvertToLinear
33+
from executorch.backends.qualcomm._passes.fold_qdq import FoldQDQ
34+
from executorch.backends.qualcomm._passes.i64_to_i32 import I64toI32
35+
from executorch.backends.qualcomm._passes.layout_transform import LayoutTransform
36+
from executorch.backends.qualcomm._passes.recompose_pixel_unshuffle import (
4437
RecomposePixelUnshuffle,
4538
)
46-
from executorch.backends.qualcomm.passes.recompose_rms_norm import RecomposeRmsNorm
47-
from executorch.backends.qualcomm.passes.remove_redundancy import RemoveRedundancy
48-
from executorch.backends.qualcomm.passes.replace_index_put_input import (
39+
from executorch.backends.qualcomm._passes.recompose_rms_norm import RecomposeRmsNorm
40+
from executorch.backends.qualcomm._passes.remove_redundancy import RemoveRedundancy
41+
from executorch.backends.qualcomm._passes.replace_index_put_input import (
4942
ReplaceIndexPutInput,
5043
)
44+
45+
from executorch.backends.qualcomm.builders.node_visitor import (
46+
QNN_QUANT_TYPE_MAP,
47+
QNN_TENSOR_TYPE_MAP,
48+
)
49+
from executorch.backends.qualcomm.builders.qnn_constants import OpContextLoader
50+
from executorch.backends.qualcomm.passes.expand_broadcast_tensor_shape import (
51+
ExpandBroadcastTensorShape,
52+
)
5153
from executorch.backends.qualcomm.serialization.qnn_compile_spec_schema import (
5254
_soc_info_table,
5355
QcomChipset,

examples/qualcomm/oss_scripts/llama2/llama.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
from multiprocessing.connection import Client
1313

1414
import torch
15+
from executorch.backends.qualcomm._passes.build_quant_io import BuildQuantIo
1516

1617
from executorch.backends.qualcomm.partition.qnn_partitioner import QnnPartitioner
17-
from executorch.backends.qualcomm.passes.build_quant_io import BuildQuantIo
1818

1919
from executorch.backends.qualcomm.quantizer.quantizer import QuantDtype
2020
from executorch.backends.qualcomm.serialization.qnn_compile_spec_schema import (

0 commit comments

Comments
 (0)