tico 0.1.0.dev250619__py3-none-any.whl → 0.1.0.dev250622__py3-none-any.whl

tico/__init__.py

@@ -21,7 +21,7 @@ from tico.config import CompileConfigV1, get_default_config
 from tico.utils.convert import convert, convert_from_exported_program, convert_from_pt2
 
 # THIS LINE IS AUTOMATICALLY GENERATED BY setup.py
-__version__ = "0.1.0.dev250619"
+__version__ = "0.1.0.dev250622"
 
 MINIMUM_SUPPORTED_VERSION = "2.5.0"
 SECURE_TORCH_VERSION = "2.6.0"

tico/experimental/quantization/passes/fold_quant_ops.py

@@ -16,11 +16,14 @@ from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     import torch.fx
+import copy
+
 import torch
 from torch.export import ExportedProgram
 
 from tico.serialize.quant_param import QPARAM_KEY, QuantParam, to_qparam_dtype
 from tico.utils import logging
+from tico.utils.graph import create_node
 from tico.utils.passes import PassBase, PassResult
 from tico.utils.trace_decorators import trace_graph_diff_on_pass
 from tico.utils.utils import get_quant_dtype
@@ -78,6 +81,15 @@ class FoldQuantOps(PassBase):
             if q_args.dtype != dq_args.dtype:
                 continue
 
+            # Case 1. op is not quantized
+            # - Quantize op
+            # Case 2. op is quantized
+            # 2.1. op_dtype == qdq_dtype
+            # - Just skip (NOTE Need requantization?)
+            # 2.2. op_dtype != qdq_dtype
+            # - Insert Quantize operator
+
+            # Case 1
             if QPARAM_KEY not in op.meta:
                 qparam = QuantParam()
                 qparam.scale = [q_args.scale]
@@ -85,9 +97,24 @@ class FoldQuantOps(PassBase):
                 qparam.dtype = get_quant_dtype(q_args.quant_min, q_args.quant_max)
                 op.meta[QPARAM_KEY] = qparam
 
-            dq.replace_all_uses_with(op, propagate_meta=False)
-
-            logger.debug(f"{q.name} and {dq.name} are folded to {op.name}.")
+                dq.replace_all_uses_with(op, propagate_meta=False)
+
+                logger.debug(f"{q.name} and {dq.name} are folded to {op.name}.")
+            else:
+                op_qparam: QuantParam = op.meta[QPARAM_KEY]
+                qdq_dtype = get_quant_dtype(q_args.quant_min, q_args.quant_max)
+                # Case 2.2
+                if op_qparam.dtype != qdq_dtype:
+                    # If op is already quantized with a dtype different from qdq, leave quantize
+                    qparam = QuantParam()
+                    qparam.scale = [q_args.scale]
+                    qparam.zero_point = [q_args.zero_p]
+                    qparam.dtype = qdq_dtype
+                    q.meta[QPARAM_KEY] = qparam
+                    assert len(q.users) == 1, "Fix me unless"
+
+                    dq.replace_all_uses_with(q, propagate_meta=False)
+                    logger.debug(f"{dq.name} is folded ({q.name} is left).")
 
         graph.eliminate_dead_code()
         graph.lint()

tico/serialize/operators/op_avg_pool2d.py

@@ -60,6 +60,7 @@ class AvgPool2DVisitor(NodeVisitor):
         input_shape = list(extract_shape(args.input))
         kernel_size = args.kernel_size
         stride = args.stride
+        assert stride
         padding = args.padding
         # TODO Update this function when supporting ceil_mode = True
         assert args.ceil_mode is False

tico/serialize/operators/op_max_pool2d_with_indices.py

@@ -72,6 +72,7 @@ class MaxPool2DWithIndicesVisitor(NodeVisitor):
         input = args.input
         kernel_size = args.kernel_size
         stride = args.stride
+        assert stride
         padding = args.padding
 
         maxpool_input: torch.fx.Node | circle.Tensor.TensorT = input

tico/utils/register_custom_op.py

@@ -385,7 +385,7 @@ def CircleMaxPool2D():
     def maxpool2d(
         input_: torch.Tensor,
         kernel_size: List[int],
-        stride: List[int],
+        stride: Optional[List[int]] = None,
         padding: Optional[List[int]] = None,
         dilation: Optional[List[int]] = None,
         ceil_mode: Optional[bool] = None,
@@ -397,6 +397,7 @@ def CircleMaxPool2D():
         So, let's set them by None in input specs, and then, set it by default values.
         https://github.com/pytorch/pytorch/blob/6b05aafc/torch/_library/infer_schema.py#L131-L144
         """
+        stride = kernel_size if not stride else stride
         padding = [0, 0] if padding is None else padding
         dilation = [1, 1] if dilation is None else dilation
         ceil_mode = False if ceil_mode is None else ceil_mode
@@ -416,7 +417,7 @@ def CircleMaxPool2D():
     def _(
         input_: torch.Tensor,
         kernel_size: List[int],
-        stride: List[int],
+        stride: Optional[List[int]] = None,
         padding: Optional[List[int]] = None,
         dilation: Optional[List[int]] = None,
         ceil_mode: Optional[bool] = None,
@@ -428,6 +429,7 @@ def CircleMaxPool2D():
         So, let's set them by None in input specs, and then, set it by default values.
         https://github.com/pytorch/pytorch/blob/6b05aafc/torch/_library/infer_schema.py#L131-L144
         """
+        stride = kernel_size if not stride else stride
         padding = [0, 0] if padding is None else padding
         dilation = [1, 1] if dilation is None else dilation
         ceil_mode = False if ceil_mode is None else ceil_mode
@@ -449,12 +451,13 @@ def CircleAvgPool2D():
     def avgpool2d(
         input_: torch.Tensor,
         kernel_size: List[int],
-        stride: List[int],
+        stride: Optional[List[int]] = None,
         padding: Optional[List[int]] = None,
         ceil_mode: Optional[bool] = None,
         count_include_pad: Optional[bool] = None,
         divisor_override: Optional[int] = None,
     ) -> torch.Tensor:
+        stride = kernel_size if not stride else stride
         padding = [0, 0] if padding is None else padding
         ceil_mode = False if ceil_mode is None else ceil_mode
         count_include_pad = True if count_include_pad is None else count_include_pad
@@ -482,12 +485,13 @@ def CircleAvgPool2D():
     def _(
         input_: torch.Tensor,
         kernel_size: List[int],
-        stride: List[int],
+        stride: Optional[List[int]] = None,
         padding: Optional[List[int]] = None,
         ceil_mode: Optional[bool] = None,
         count_include_pad: Optional[bool] = None,
         divisor_override: Optional[int] = None,
     ):
+        stride = kernel_size if not stride else stride
         padding = [0, 0] if padding is None else padding
         ceil_mode = False if ceil_mode is None else ceil_mode
         count_include_pad = True if count_include_pad is None else count_include_pad

tico/utils/validate_args_kwargs.py

@@ -123,7 +123,7 @@ class AvgPool2dArgs:
 
     input: torch.fx.Node
     kernel_size: List[int]
-    stride: List[int] = field(default_factory=list)
+    stride: Optional[List[int]] = None
     padding: List[int] = field(default_factory=lambda: [0, 0])
     ceil_mode: bool = field(default=False)
     count_include_pad: bool = field(default=True)
@@ -131,6 +131,7 @@ class AvgPool2dArgs:
 
     def __post_init__(self):
         assert len(self.kernel_size) == 2, len(self.kernel_size)
+        self.stride = self.kernel_size if not self.stride else self.stride
         assert len(self.stride) == 2, len(self.stride)
         if self.padding is not None:
             assert len(self.padding) == 2, len(self.padding)
@@ -609,13 +610,14 @@ class MaxPool2dWithIndicesArgs:
 
     input: torch.fx.Node
     kernel_size: List[int]
-    stride: List[int] = field(default_factory=list)
+    stride: Optional[List[int]] = None
     padding: List[int] = field(default_factory=lambda: [0, 0])
     dilation: List[int] = field(default_factory=lambda: [1, 1])
     ceil_mode: bool = field(default=False)
 
     def __post_init__(self):
         assert len(self.kernel_size) == 2, len(self.kernel_size)
+        self.stride = self.kernel_size if not self.stride else self.stride
         assert len(self.stride) == 2, len(self.stride)
         if self.padding is not None:
             assert len(self.padding) == 2, len(self.padding)

{tico-0.1.0.dev250619.dist-info → tico-0.1.0.dev250622.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tico
-Version: 0.1.0.dev250619
+Version: 0.1.0.dev250622
 Summary: Convert exported Torch module to circle
 Home-page: UNKNOWN
 License: UNKNOWN

{tico-0.1.0.dev250619.dist-info → tico-0.1.0.dev250622.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tico/__init__.py,sha256=tvZ8ebod0VB1gCI6Pf4kkiUWrmA31DGVE_9E2MAjYXo,1743
+tico/__init__.py,sha256=U0yTg9CHkHxsRbkNANLYjrQ1kxP3vT3IjjtbLc8Bysk,1743
 tico/pt2_to_circle.py,sha256=PPmFNw20jw2Z2VyM3ln9pX__jTzBOAZiv0gT5a-p-Y8,2666
 tico/config/__init__.py,sha256=xZzCXjZ84qE-CsBi-dfaL05bqpQ3stKKfTXhnrJRyVs,142
 tico/config/base.py,sha256=anwOiJFkUxUi7Cef573JgQcjk6S-FSi6O_TLjYASW-g,1244
@@ -50,7 +50,7 @@ tico/experimental/quantization/evaluation/executor/backend_executor.py,sha256=3k
 tico/experimental/quantization/evaluation/executor/circle_executor.py,sha256=eCCJ9wTwR0vUJ0oN7jxtQxZ9598GRw6P6KUxiuGsIIM,2685
 tico/experimental/quantization/evaluation/executor/triv24_executor.py,sha256=sUoXl6oOO2arAKaNjOBg7HiQja145_Jv6qgY7XtR7A8,5159
 tico/experimental/quantization/passes/__init__.py,sha256=IO6FP_xYbGy0dW0HL26GXD3ouxARaxCK7bz9dn4blPQ,26
-tico/experimental/quantization/passes/fold_quant_ops.py,sha256=OYUndHaSL3GiL8koIG9_pqavW-hghrs0kkpvounsh1g,3312
+tico/experimental/quantization/passes/fold_quant_ops.py,sha256=cC5xuvqWqueKzLXUJi0pCk85vryImkhgnx-ee7G-tPI,4463
 tico/experimental/quantization/passes/insert_quantize_on_dtype_mismatch.py,sha256=AbNcI7rfIwHsQna_rFuwqFdOzFAU2lIB3sMK-vns8Dc,13072
 tico/experimental/quantization/passes/propagate_qparam_backward.py,sha256=TGtyW0Z2qOTgVIasBdGRgbwH31YYd6ek7OvLTmCV614,3118
 tico/experimental/quantization/passes/propagate_qparam_forward.py,sha256=RhUHGCR2RpBO5KYkQ7Z8U5u7HEwDq2wdKHLKAJCi-5c,5138
@@ -109,7 +109,7 @@ tico/serialize/operators/op_alias_copy.py,sha256=Xu9OiILbGf8oddh8yTqovvLfgVs8XYV
 tico/serialize/operators/op_any.py,sha256=QqAYby1WPd4l97vX-tBjAsOb_pVb1wPjj7SbWQNToCQ,5117
 tico/serialize/operators/op_arange_start_step.py,sha256=0T5lWwh3TfsFStmVv0v5qG03KENRDBmMix08RXQ4D-U,2132
 tico/serialize/operators/op_argmax.py,sha256=ARyGHlmWVmzwCct93V5x1-VyKqhxMOvV8GuM8yQWXdo,2290
-tico/serialize/operators/op_avg_pool2d.py,sha256=eVd5ngFSImAklvJFfBAaEUvAc-I60e43xCdLjd5zwYA,7522
+tico/serialize/operators/op_avg_pool2d.py,sha256=vc7WCakGXtGFPV1ix5EJmboH23tQ-cSI36ePY3PHKI4,7544
 tico/serialize/operators/op_bmm.py,sha256=AELjHC9ISFPIzEEl5Kr1s4GSNLZElwZmVZJWkEyCEoA,2189
 tico/serialize/operators/op_cat.py,sha256=XDYOh0XAyrM0TlxVm6Sa0OFFGrKk7aSDcGXC-hYX4gs,2204
 tico/serialize/operators/op_clamp.py,sha256=ZRAsXLGsZqJEh4wXxESEpRJkRtUuJWTDgAem6lr9_5I,4298
@@ -143,7 +143,7 @@ tico/serialize/operators/op_logical_and.py,sha256=WhQ8knuq32BO-WhAqkOgpcUStPkjoP
 tico/serialize/operators/op_logical_not.py,sha256=ugrVcRqR3IvUUaiRVW5cArCYJbzmkcXp88QM846jCww,2129
 tico/serialize/operators/op_lt.py,sha256=_vA7dWpV9wVBxB7JL9pLQT9BsV91NGQBq_0auAtHK5Y,2080
 tico/serialize/operators/op_max_dim.py,sha256=nS_TZl5uq4uv1LwgBD9Wddyac4atKqBiIWKIyeXse2s,2519
-tico/serialize/operators/op_max_pool2d_with_indices.py,sha256=Gd16ebLyo1x_gSXCvq-cBJEQ9jLTRLTd2zBXO7p3DvY,5724
+tico/serialize/operators/op_max_pool2d_with_indices.py,sha256=Vab8KV4w0i70P5XPdqItXEv_hLFjscVngypOltRvBV8,5746
 tico/serialize/operators/op_maximum.py,sha256=JjBr6gWEnuakLuk1_feotTHfIIm3s5YqWmqhUMpSPI0,1873
 tico/serialize/operators/op_mean.py,sha256=rVQZOxCJkHFY4kQBAS1HVK0HkcqxgkSy6zvEDLX_WYQ,2267
 tico/serialize/operators/op_minimum.py,sha256=fASjQVcTPCin02umQwFPdq2ss-Ve7S5A33J3QmmQ_wQ,1873
@@ -189,18 +189,18 @@ tico/utils/logging.py,sha256=IlbBWscsaHidI0dNqro1HEXAbIcbkR3BD5ukLy2m95k,1286
 tico/utils/model.py,sha256=Uqc92AnJXQ2pbvctS2z2F3Ku3yNrwXZ9O33hZVis7is,1250
 tico/utils/padding.py,sha256=GGO27VbaOvtaMYLDrSaKv7uxjeet566aMJD0PyYeMvQ,1484
 tico/utils/passes.py,sha256=kGmDe__5cPaO6i5EDAoXSVe6yXEoX9hAny4ROb3ZEmQ,2409
-tico/utils/register_custom_op.py,sha256=iRQvdqlBqrJxq_pNkvJyDIJD_SYtCUl88wwbbuvSwlk,22952
+tico/utils/register_custom_op.py,sha256=qheG1WqtkUaG1SnHrrKQ7-fE4IZRETApCsfMkjDKcfs,23240
 tico/utils/serialize.py,sha256=AQXMBOLu-Kg2Rn-qbqsAtHndjZAZIavlKA0QFgJREHM,1420
 tico/utils/trace_decorators.py,sha256=ddLIiKQfSaQrxgF1kNpwjFTQnXENzeSfcr1kuAW4jGI,3221
 tico/utils/utils.py,sha256=fnbZ2RLH6-J-wqb32O4qsR1ce4BJU0wYNrk84QXa6_E,13158
-tico/utils/validate_args_kwargs.py,sha256=vp1GaGhOWqQBD4axMPaULy0tWxoIDTwEqEYoR5S7ph0,25244
+tico/utils/validate_args_kwargs.py,sha256=ifzO4ikubDPU2iXRBPF8KeyubW23cjxBThOslLAcTrg,25368
 tico/utils/mx/__init__.py,sha256=IO6FP_xYbGy0dW0HL26GXD3ouxARaxCK7bz9dn4blPQ,26
 tico/utils/mx/elemwise_ops.py,sha256=V6glyAHsVR1joqpsgnNytatCD_ew92xNWZ19UFDoMTA,10281
 tico/utils/mx/formats.py,sha256=uzNWyu-1onUlwQfX5cZ6fZSUfHMRqorper7_T1k3jfk,3404
 tico/utils/mx/mx_ops.py,sha256=RcfUTYVi-wilGB2sC35OeARdwDqnixv7dG5iyZ-fQT8,8555
-tico-0.1.0.dev250619.dist-info/LICENSE,sha256=kp4JLII7bzRhPb0CPD5XTDZMh22BQ7h3k3B7t8TiSbw,12644
-tico-0.1.0.dev250619.dist-info/METADATA,sha256=Ms7oDZDD9txOcAycr9TUsJIGoC_B5FmXyF-q2AfJu58,8846
-tico-0.1.0.dev250619.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-tico-0.1.0.dev250619.dist-info/entry_points.txt,sha256=kBKYSS_IYrSXmUYevmmepqIVPScq5vF8ulQRu3I_Zf0,59
-tico-0.1.0.dev250619.dist-info/top_level.txt,sha256=oqs7UPoNSKZEwqsX8B-KAWdQwfAa7i60pbxW_Jk7P3w,5
-tico-0.1.0.dev250619.dist-info/RECORD,,
+tico-0.1.0.dev250622.dist-info/LICENSE,sha256=kp4JLII7bzRhPb0CPD5XTDZMh22BQ7h3k3B7t8TiSbw,12644
+tico-0.1.0.dev250622.dist-info/METADATA,sha256=PGKSmJTacXjjLvdGaeS4BtgUAEfmMcFQZnFxI5IpoR0,8846
+tico-0.1.0.dev250622.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+tico-0.1.0.dev250622.dist-info/entry_points.txt,sha256=kBKYSS_IYrSXmUYevmmepqIVPScq5vF8ulQRu3I_Zf0,59
+tico-0.1.0.dev250622.dist-info/top_level.txt,sha256=oqs7UPoNSKZEwqsX8B-KAWdQwfAa7i60pbxW_Jk7P3w,5
+tico-0.1.0.dev250622.dist-info/RECORD,,