tico 0.1.0.dev250622__py3-none-any.whl → 0.1.0.dev250624__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.dev250622"
+__version__ = "0.1.0.dev250624"
 
 MINIMUM_SUPPORTED_VERSION = "2.5.0"
 SECURE_TORCH_VERSION = "2.6.0"

tico/experimental/quantization/passes/fold_quant_ops.py

@@ -21,9 +21,8 @@ import copy
 import torch
 from torch.export import ExportedProgram
 
-from tico.serialize.quant_param import QPARAM_KEY, QuantParam, to_qparam_dtype
+from tico.serialize.quant_param import QPARAM_KEY, QuantParam
 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
@@ -42,11 +41,33 @@ class FoldQuantOps(PassBase):
     To export quantized circle, this pass removes (Q - DQ) nodes and saves those quantization info
      to previous op's metadata.
 
-    [BEFORE]
-      op (float) - Quantize - Dequantize - (float)
-
-    [AFTER]
-      op (float with meta[QPARAM_KEY])
+    ────────────────────────────────────────────────────────────────
+    BEFORE                             AFTER
+    ────────────────────────────────────────────────────────────────
+      op(float) ─ Q ─ DQ ─ …            op(float, meta[QPARAM])
+
+      op ─ Q1 ─ DQ1 ─ Q2 ─ DQ2          op(meta[QPARAM]) ─ Q2
+                 ▲                                          ▲
+                 │ (Q1, DQ1 folded)                         │ (re-quantization kept)
+
+      op ─ Q ─┬─ DQ0                    op(meta[QPARAM])
+              ├─ DQ1                    (each DQ* folded, Q dropped when orphaned)
+              └─ DQ2
+    ────────────────────────────────────────────────────────────────
+
+    Algorithm
+    ---------
+    1. Iterate over *all* Dequantize nodes.
+    2. For each DQ, verify it is driven by a Quantize node `q` and that
+       `q` and `dq` share identical (scale, zero-point, dtype).
+    3. a) If the producer op has **no** QPARAM, attach one, then replace
+          *this* DQ's usages with the producer op.
+       b) If the producer is already quantized with a different dtype,
+          this is a *re-quantization*: attach QPARAM to `q` and keep it,
+          but still remove the DQ.
+    4. After all replacements, run `graph.eliminate_dead_code()`.
+       Any Quantize that became orphaned because *all* its DQs were folded
+       is deleted automatically.
     """
 
     def __init__(self):
@@ -81,15 +102,9 @@ 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
+            # ───────────────────────────────────────────
+            # Case 1: op not yet quantized
+            # ───────────────────────────────────────────
             if QPARAM_KEY not in op.meta:
                 qparam = QuantParam()
                 qparam.scale = [q_args.scale]
@@ -100,21 +115,36 @@ class FoldQuantOps(PassBase):
                 dq.replace_all_uses_with(op, propagate_meta=False)
 
                 logger.debug(f"{q.name} and {dq.name} are folded to {op.name}.")
+            # ───────────────────────────────────────────
+            # Case 2: op already quantized
+            #        2.1 same dtype  → nothing to do
+            #        2.2 diff dtype  → leave Q in place
+            # ───────────────────────────────────────────
             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"
+                    # Attach QPARAM to Q once
+                    if QPARAM_KEY not in q.meta:
+                        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).")
+                else:
+                    # Same dtype → the Quantize–Dequantize pair is redundant.
+                    assert op_qparam.scale and op_qparam.scale[0] == q_args.scale
+                    assert (
+                        op_qparam.zero_point
+                        and op_qparam.zero_point[0] == q_args.zero_p
+                    )
+                    dq.replace_all_uses_with(op, propagate_meta=False)
+                    logger.debug(f"Removed redundant {dq.name}")
 
         graph.eliminate_dead_code()
         graph.lint()

tico/passes/cast_mixed_type_args.py

@@ -117,6 +117,7 @@ class CastMixedTypeArgs(PassBase):
                 lhs_val, rhs_val, type_promotion_kind=ops_to_promote[node.target]
             )[1]
             arg_to_promote = None
+            ori_type = None
             if lhs_val.dtype == type_to_promote:
                 ori_type = rhs_val.dtype
                 arg_to_promote = rhs

tico/passes/convert_conv1d_to_conv2d.py

@@ -110,6 +110,8 @@ class ConvertConv1dToConv2d(PassBase):
                 conv2d_op = torch.ops.aten.conv2d.default
             elif isinstance(padding, str):
                 conv2d_op = torch.ops.aten.conv2d.padding
+            else:
+                raise RuntimeError("Invalid input")
 
             conv2d = create_node(
                 graph,

tico/passes/fuse_redundant_reshape_to_mean.py

@@ -86,6 +86,8 @@ class FuseRedundantReshapeToMean(PassBase):
                 updated_args = node.args + (keep_dims,)
             elif len(mean_args) == 3:
                 updated_args = node.args
+            else:
+                raise RuntimeError("Invalid input")
             node.args = updated_args
             node.meta["val"] = fused_val
             user_node.replace_all_uses_with(node, propagate_meta=False)

tico/passes/legalize_predefined_layout_operators.py

@@ -163,6 +163,7 @@ class LegalizePreDefinedLayoutOperators(PassBase):
                 node.update_arg(node.args.index(weight), weight_permute)
 
         with graph.inserting_before(node):
+            legalized_op = None
             if groups == 1:
                 if isinstance(padding, list):
                     legalized_op = torch.ops.circle_custom.conv2d
@@ -175,6 +176,7 @@ class LegalizePreDefinedLayoutOperators(PassBase):
                     legalized_op = torch.ops.circle_custom.depthwise_conv2d.padding
             else:
                 assert groups == 1 or groups == input_shape[1]  # Cannot reach here
+            assert legalized_op is not None
 
             circle_op = create_node(
                 graph, legalized_op, args=node.args, kwargs=node.kwargs, origin=node

tico/passes/remove_redundant_reshape.py

@@ -242,12 +242,16 @@ class RemoveRedundantReshapePattern3(PassBase):
             softmax = reshape_1_args.input
 
             # softmax
+            softmax_args = None
             if not is_target_node(softmax, ops.aten.softmax):
                 continue
             if softmax.target == torch.ops.aten._softmax.default:
                 softmax_args = SoftmaxArgs(*softmax.args, **softmax.kwargs)  # type: ignore[arg-type, assignment]
             elif softmax.target == torch.ops.aten._safe_softmax.default:
                 softmax_args = SafeSoftmaxArgs(*softmax.args, **softmax.kwargs)  # type: ignore[arg-type, assignment]
+            else:
+                raise RuntimeError("Invalid input")
+            assert softmax_args is not None
             add, softmax_dim = (
                 softmax_args.input,
                 softmax_args.dim,

tico/pt2_to_circle.py

@@ -14,6 +14,7 @@
 
 import argparse
 import os
+from typing import Optional
 
 import torch
 import yaml
@@ -27,8 +28,10 @@ def convert(
     input: str,
     output: str,
     verbose: bool = False,
-    config: CompileConfigBase = get_default_config(),
+    config: Optional[CompileConfigBase] = None,
 ):
+    if config is None:
+        config = get_default_config()
     # TODO Check input and output
 
     if verbose:
@@ -73,6 +76,7 @@ def main():
 
     args = parser.parse_args()
 
+    config = None
     if args.config:
         with open(args.config) as f:
             config_dict = yaml.safe_load(f)

tico/serialize/operators/op_any.py

@@ -102,6 +102,7 @@ class AnyVisitor(NodeVisitor):
         input_shape = list(extract_shape(input))
         output_shape = list(extract_shape(node))
 
+        dim_i32 = None
         if dim is None:
             dims = tuple(i for i in range(0, len(input_shape)))
             dim_i32 = tuple(
@@ -111,8 +112,12 @@ class AnyVisitor(NodeVisitor):
             dim_i32 = circle_legalize_dtype_to(dim, dtype=torch.int32)
         if isinstance(dim, tuple):
             dim_i32 = tuple(circle_legalize_dtype_to(d, dtype=torch.int32) for d in dim)
+        assert dim_i32 is not None
 
-        inputs = [input, dim_i32]
+        inputs = [
+            input,
+            dim_i32,
+        ]  # type: ignore[list-item]
         outputs = [node]
 
         dtype_torch = extract_torch_dtype(input)

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

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

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

@@ -1,5 +1,5 @@
-tico/__init__.py,sha256=U0yTg9CHkHxsRbkNANLYjrQ1kxP3vT3IjjtbLc8Bysk,1743
-tico/pt2_to_circle.py,sha256=PPmFNw20jw2Z2VyM3ln9pX__jTzBOAZiv0gT5a-p-Y8,2666
+tico/__init__.py,sha256=XB8eztAKREkVE9vb9rfJU_Wx55LClZwOdTLgFv6whGU,1743
+tico/pt2_to_circle.py,sha256=gu3MD4Iqc0zMZcCZ2IT8oGbyj21CTSbT3Rgd9s2B_9A,2767
 tico/config/__init__.py,sha256=xZzCXjZ84qE-CsBi-dfaL05bqpQ3stKKfTXhnrJRyVs,142
 tico/config/base.py,sha256=anwOiJFkUxUi7Cef573JgQcjk6S-FSi6O_TLjYASW-g,1244
 tico/config/factory.py,sha256=il0zqB6Lm5NX2LnG-TUhmiP9vVeZ_3TucJMorVZIodY,1324
@@ -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=cC5xuvqWqueKzLXUJi0pCk85vryImkhgnx-ee7G-tPI,4463
+tico/experimental/quantization/passes/fold_quant_ops.py,sha256=iaBMyO49CwVkhebMz3rjkHWfWE2LhwH6fORe7n4S6XQ,7040
 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
@@ -61,9 +61,9 @@ tico/interpreter/infer.py,sha256=vJ3b69ce9HrxNT0gFwbEhHpAyvVyuiunTgAeiqn5t64,435
 tico/interpreter/interpreter.py,sha256=tGbluCbrehTCqBu8mtGDNzby_ieJ2ry8_RH_eC0CQxk,3828
 tico/passes/__init__.py,sha256=IO6FP_xYbGy0dW0HL26GXD3ouxARaxCK7bz9dn4blPQ,26
 tico/passes/cast_aten_where_arg_type.py,sha256=ybtGj1L7_2zGyfb_G-_y1N1mRgKHVq6fBZc-9-fH9sA,7229
-tico/passes/cast_mixed_type_args.py,sha256=s1lAwYvJdYdkE11fK2n1faybPyA5CJtZkOkU46rhXXA,7590
+tico/passes/cast_mixed_type_args.py,sha256=ArJpIPnQP1LPNaWIwee13Nbj749_awFKDO-pAYvdYvI,7618
 tico/passes/const_prop_pass.py,sha256=QOeR2u3fo9ZhWXRhfAUW1dTtuWgqgoqdDJoQ516UDbQ,11532
-tico/passes/convert_conv1d_to_conv2d.py,sha256=2AAs8q9BYuvMr0F1Mrua1rpGvwxOVIE10c798P5sFf8,5231
+tico/passes/convert_conv1d_to_conv2d.py,sha256=7YljWJQBX5vBUMgGgRv8TvbJ9UpEL9hf4ZU3dNUhEZ8,5301
 tico/passes/convert_layout_op_to_reshape.py,sha256=sCAFjkmVtiKjvDQSAgnjNBHl3_hWXJZElGDXQiTH-7s,2963
 tico/passes/convert_repeat_to_expand_copy.py,sha256=JbtFTmWyfJS2SSd_higP1IEhQeh7wHdN5dmTbbiFVCs,3237
 tico/passes/convert_to_relu6.py,sha256=1BJpUwUb6Zli_1y3eyJQo7dg9B1xvZ7sYjMbvEQsFJM,6442
@@ -77,9 +77,9 @@ tico/passes/decompose_slice_scatter.py,sha256=xqMHKhW2595YoAeubKZ4jRhYW4TQ09EXPg
 tico/passes/extract_dtype_kwargs.py,sha256=ObpsaFlrTPYQw2hJ7UsC5CocyAtBkT_bMtzkMUqAyKc,4333
 tico/passes/fill_meta_val.py,sha256=Xbam6Aq90ZfWItZw1dgLIwH_q8RCiU5JodKNqkj-ink,1797
 tico/passes/fuse_leading_unsqueeze_reshape.py,sha256=88jwTP35yRyXOk9xdO6YW2OEfdKAws3KFRT16WQz0RI,4291
-tico/passes/fuse_redundant_reshape_to_mean.py,sha256=2SEZ0TfXsmUkuqUdNtS_mQzLd49su5TsQViCLMGL4f4,3691
+tico/passes/fuse_redundant_reshape_to_mean.py,sha256=GhJS1ZKB6Ns4AhwcW3uUQ6q-0N-AzlD32B2EwusUJHg,3761
 tico/passes/legalize_causal_mask_value.py,sha256=xKdFwwMaSFCSQpSk8xISOAqFpZ1jIhgbBIqf7KTSGuk,4017
-tico/passes/legalize_predefined_layout_operators.py,sha256=oUwog9TGHT86MMy-T_ymTh5pQN0srSefiAA6CNiWVgA,15826
+tico/passes/legalize_predefined_layout_operators.py,sha256=6jd_FmXX5rbBxqp3H5MQoCnL3vY3qoAdXaXkVdfXEjI,15902
 tico/passes/lower_pow2_to_mul.py,sha256=nfJXa9ZTZMiLg6ownSyvkM4KF2z9tZW34Q3CCWI_vmQ,2402
 tico/passes/lower_to_resize_nearest_neighbor.py,sha256=N6F56Of8Aiv-KIiYLHnh33WX72W60ZVQSBEYWHdYqNQ,9005
 tico/passes/lower_to_slice.py,sha256=0qAX3WzZdyMFDW4DiO9b5JFXd4rL1-0doBT6lJvaw_I,7260
@@ -89,7 +89,7 @@ tico/passes/remove_nop.py,sha256=Hf91p_EJAOC6DyWNthash0_UWtEcNc_M7znamQfYQ5Y,268
 tico/passes/remove_redundant_assert_nodes.py,sha256=IONd3xBy6I8tH6_Y1eN3_eCHH7WTC8soBgjXzOju9cQ,1612
 tico/passes/remove_redundant_expand.py,sha256=5SIqN7eIIcqF68tlrB31n1482jSBSBOgKb1wddLX6lw,2197
 tico/passes/remove_redundant_permute.py,sha256=98UsaZzFZdQzEEAR1pIzRisAf6hgfXLa88aayjalt3E,4292
-tico/passes/remove_redundant_reshape.py,sha256=inp5fMNXM675Rj29wmHn5xoPmOqbiDkgMmmsqguCeMk,16308
+tico/passes/remove_redundant_reshape.py,sha256=ScLYTShXMXJBTzOByAEhX-qJe5pmu92pLsXv5mh7u5c,16454
 tico/passes/remove_redundant_slice.py,sha256=Iv7TbB39fktNb4eq0VdyZnwxL_VsKLJ90diMmaf3kZk,2087
 tico/passes/remove_redundant_to_copy.py,sha256=tKy4XKkO2l33fMxVPQ_iFkUeFvP15kbPvzPPhT_g0c8,3292
 tico/passes/restore_linear.py,sha256=xGJdNb-1CrkOKS9BnLbcblkZc6P2vVjKIi-7lRcs7Bk,4111
@@ -106,7 +106,7 @@ tico/serialize/operators/node_visitor.py,sha256=UYyCwXqSCeRyimThMShstHnt7vKM9tsu
 tico/serialize/operators/op_abs.py,sha256=Y-vy7rcqPT-qD3QS5R8zbApWWTPpjY6xuMMVnbIhYmQ,1827
 tico/serialize/operators/op_add.py,sha256=otm062DMHVAThWmOtSTZdPyP3P5-2cv5VL_UWBJeLms,2346
 tico/serialize/operators/op_alias_copy.py,sha256=Xu9OiILbGf8oddh8yTqovvLfgVs8XYV7Cg4n6CesWcg,2175
-tico/serialize/operators/op_any.py,sha256=QqAYby1WPd4l97vX-tBjAsOb_pVb1wPjj7SbWQNToCQ,5117
+tico/serialize/operators/op_any.py,sha256=9oxP-8vS5R4oKX6KaePygzC4-jh8MVgbiS8Z5AWYOAw,5237
 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=vc7WCakGXtGFPV1ix5EJmboH23tQ-cSI36ePY3PHKI4,7544
@@ -198,9 +198,9 @@ 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.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,,
+tico-0.1.0.dev250624.dist-info/LICENSE,sha256=kp4JLII7bzRhPb0CPD5XTDZMh22BQ7h3k3B7t8TiSbw,12644
+tico-0.1.0.dev250624.dist-info/METADATA,sha256=wYEKWsf_DVC6nkCMwq4beejH_uGQrEQazoBsDJHlcAU,8846
+tico-0.1.0.dev250624.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+tico-0.1.0.dev250624.dist-info/entry_points.txt,sha256=kBKYSS_IYrSXmUYevmmepqIVPScq5vF8ulQRu3I_Zf0,59
+tico-0.1.0.dev250624.dist-info/top_level.txt,sha256=oqs7UPoNSKZEwqsX8B-KAWdQwfAa7i60pbxW_Jk7P3w,5
+tico-0.1.0.dev250624.dist-info/RECORD,,