bloqade-circuit 0.7.8__py3-none-any.whl → 0.7.10__py3-none-any.whl

bloqade/cirq_utils/noise/model.py

@@ -56,21 +56,29 @@ class GeminiNoiseModelABC(cirq.NoiseModel, MoveNoiseModelABC):
     """The correlated CZ error rates as a dictionary"""
 
     def __post_init__(self):
-        if (
+        is_ambiguous = (
+            self.cz_paired_correlated_rates is not None
+            and self.cz_paired_error_probabilities is not None
+        )
+        if is_ambiguous:
+            raise ValueError(
+                "Received both `cz_paired_correlated_rates` and `cz_paired_error_probabilities` as input. This is ambiguous, please only set one."
+            )
+
+        use_default = (
             self.cz_paired_correlated_rates is None
             and self.cz_paired_error_probabilities is None
-        ):
+        )
+        if use_default:
             # NOTE: no input, set to default value; weird setattr for frozen dataclass
             object.__setattr__(
                 self,
                 "cz_paired_error_probabilities",
                 _default_cz_paired_correlated_rates(),
             )
-        elif (
-            self.cz_paired_correlated_rates is not None
-            and self.cz_paired_correlated_rates is None
-        ):
+            return
 
+        if self.cz_paired_correlated_rates is not None:
             if self.cz_paired_correlated_rates.shape != (4, 4):
                 raise ValueError(
                     "Expected a 4x4 array of probabilities for cz_paired_correlated_rates"
@@ -82,13 +90,11 @@ class GeminiNoiseModelABC(cirq.NoiseModel, MoveNoiseModelABC):
                 "cz_paired_error_probabilities",
                 correlated_noise_array_to_dict(self.cz_paired_correlated_rates),
             )
-        elif (
-            self.cz_paired_correlated_rates is not None
-            and self.cz_paired_correlated_rates is not None
-        ):
-            raise ValueError(
-                "Received both `cz_paired_correlated_rates` and `cz_paired_correlated_rates` as input. This is ambiguous, please only set one."
-            )
+            return
+
+        assert (
+            self.cz_paired_error_probabilities is not None
+        ), "This error should not happen! Please report this issue."
 
     @staticmethod
     def validate_moments(moments: Iterable[cirq.Moment]):

bloqade/pyqrack/reg.py

@@ -2,8 +2,8 @@ import enum
 from typing import TYPE_CHECKING
 from dataclasses import dataclass
 
-from bloqade.types import MeasurementResult
 from bloqade.qasm2.types import Qubit
+from bloqade.squin.types import MeasurementResult
 
 if TYPE_CHECKING:
     from pyqrack import QrackSimulator

bloqade/qasm2/passes/fold.py

@@ -1,27 +1,12 @@
 from dataclasses import field, dataclass
 
 from kirin import ir
-from kirin.passes import Pass, TypeInfer
-from kirin.rewrite import (
-    Walk,
-    Chain,
-    Inline,
-    Fixpoint,
-    WrapConst,
-    Call2Invoke,
-    ConstantFold,
-    CFGCompactify,
-    InlineGetItem,
-    InlineGetField,
-    DeadCodeElimination,
-    CommonSubexpressionElimination,
-)
-from kirin.analysis import const
-from kirin.dialects import scf, ilist
+from kirin.passes import Pass
 from kirin.ir.method import Method
 from kirin.rewrite.abc import RewriteResult
 
 from bloqade.qasm2.dialects import expr
+from bloqade.rewrite.passes import AggressiveUnroll
 
 from .unroll_if import UnrollIfs
 
@@ -30,71 +15,27 @@ from .unroll_if import UnrollIfs
 class QASM2Fold(Pass):
     """Fold pass for qasm2.extended"""
 
-    constprop: const.Propagate = field(init=False)
     inline_gate_subroutine: bool = True
     unroll_ifs: bool = True
+    aggressive_unroll: AggressiveUnroll = field(init=False)
 
     def __post_init__(self):
-        self.constprop = const.Propagate(self.dialects)
-        self.typeinfer = TypeInfer(self.dialects)
+        def inline_simple(node: ir.Statement):
+            if isinstance(node, expr.GateFunction):
+                return self.inline_gate_subroutine
 
-    def unsafe_run(self, mt: Method) -> RewriteResult:
-        result = RewriteResult()
-        frame, _ = self.constprop.run_analysis(mt)
-        result = Walk(WrapConst(frame)).rewrite(mt.code).join(result)
-        rule = Chain(
-            ConstantFold(),
-            Call2Invoke(),
-            InlineGetField(),
-            InlineGetItem(),
-            DeadCodeElimination(),
-            CommonSubexpressionElimination(),
-        )
-        result = Fixpoint(Walk(rule)).rewrite(mt.code).join(result)
+            return True
 
-        result = (
-            Walk(
-                Chain(
-                    scf.unroll.PickIfElse(),
-                    scf.unroll.ForLoop(),
-                    scf.trim.UnusedYield(),
-                )
-            )
-            .rewrite(mt.code)
-            .join(result)
+        self.aggressive_unroll = AggressiveUnroll(
+            self.dialects, inline_simple, no_raise=self.no_raise
         )
 
-        if self.unroll_ifs:
-            UnrollIfs(mt.dialects).unsafe_run(mt).join(result)
-
-        # run typeinfer again after unroll etc. because we now insert
-        # a lot of new nodes, which might have more precise types
-        self.typeinfer.unsafe_run(mt)
-        result = (
-            Walk(Chain(ilist.rewrite.ConstList2IList(), ilist.rewrite.Unroll()))
-            .rewrite(mt.code)
-            .join(result)
-        )
-
-        def inline_simple(node: ir.Statement):
-            if isinstance(node, expr.GateFunction):
-                return self.inline_gate_subroutine
+    def unsafe_run(self, mt: Method) -> RewriteResult:
+        result = RewriteResult()
 
-            if not isinstance(node.parent_stmt, (scf.For, scf.IfElse)):
-                return True  # always inline calls outside of loops and if-else
+        if self.unroll_ifs:
+            result = UnrollIfs(mt.dialects).unsafe_run(mt).join(result)
 
-            # inside loops and if-else, only inline simple functions, i.e. functions with a single block
-            if (trait := node.get_trait(ir.CallableStmtInterface)) is None:
-                return False  # not a callable, don't inline to be safe
-            region = trait.get_callable_region(node)
-            return len(region.blocks) == 1
+        result = self.aggressive_unroll.unsafe_run(mt).join(result)
 
-        result = (
-            Walk(
-                Inline(inline_simple),
-            )
-            .rewrite(mt.code)
-            .join(result)
-        )
-        result = Walk(Fixpoint(CFGCompactify())).rewrite(mt.code).join(result)
         return result

bloqade/rewrite/passes/__init__.py

@@ -1 +1,2 @@
+from .aggressive_unroll import AggressiveUnroll as AggressiveUnroll
 from .canonicalize_ilist import CanonicalizeIList as CanonicalizeIList

bloqade/rewrite/passes/aggressive_unroll.py

@@ -0,0 +1,93 @@
+from typing import Callable
+from dataclasses import field, dataclass
+
+from kirin import ir
+from kirin.passes import Pass, HintConst, TypeInfer
+from kirin.rewrite import (
+    Walk,
+    Chain,
+    Inline,
+    Fixpoint,
+    Call2Invoke,
+    ConstantFold,
+    CFGCompactify,
+    InlineGetItem,
+    InlineGetField,
+    DeadCodeElimination,
+)
+from kirin.dialects import scf, ilist
+from kirin.ir.method import Method
+from kirin.rewrite.abc import RewriteResult
+from kirin.rewrite.cse import CommonSubexpressionElimination
+from kirin.passes.aggressive import UnrollScf
+
+
+@dataclass
+class Fold(Pass):
+    hint_const: HintConst = field(init=False)
+
+    def __post_init__(self):
+        self.hint_const = HintConst(self.dialects, no_raise=self.no_raise)
+
+    def unsafe_run(self, mt: Method) -> RewriteResult:
+        result = RewriteResult()
+        result = self.hint_const.unsafe_run(mt).join(result)
+        rule = Chain(
+            ConstantFold(),
+            Call2Invoke(),
+            InlineGetField(),
+            InlineGetItem(),
+            ilist.rewrite.InlineGetItem(),
+            ilist.rewrite.HintLen(),
+        )
+        result = Fixpoint(Walk(rule)).rewrite(mt.code).join(result)
+
+        return result
+
+
+@dataclass
+class AggressiveUnroll(Pass):
+    """A pass to unroll structured control flow"""
+
+    additional_inline_heuristic: Callable[[ir.Statement], bool] = lambda node: True
+
+    fold: Fold = field(init=False)
+    typeinfer: TypeInfer = field(init=False)
+    scf_unroll: UnrollScf = field(init=False)
+
+    def __post_init__(self):
+        self.fold = Fold(self.dialects, no_raise=self.no_raise)
+        self.typeinfer = TypeInfer(self.dialects, no_raise=self.no_raise)
+        self.scf_unroll = UnrollScf(self.dialects, no_raise=self.no_raise)
+
+    def unsafe_run(self, mt: Method) -> RewriteResult:
+        result = RewriteResult()
+        result = self.scf_unroll.unsafe_run(mt).join(result)
+        result = (
+            Walk(Chain(ilist.rewrite.ConstList2IList(), ilist.rewrite.Unroll()))
+            .rewrite(mt.code)
+            .join(result)
+        )
+        result = self.typeinfer.unsafe_run(mt).join(result)
+        result = self.fold.unsafe_run(mt).join(result)
+        result = Walk(Inline(self.inline_heuristic)).rewrite(mt.code).join(result)
+        result = Walk(Fixpoint(CFGCompactify())).rewrite(mt.code).join(result)
+
+        rule = Chain(
+            CommonSubexpressionElimination(),
+            DeadCodeElimination(),
+        )
+        result = Fixpoint(Walk(rule)).rewrite(mt.code).join(result)
+
+        return result
+
+    def inline_heuristic(self, node: ir.Statement) -> bool:
+        """The heuristic to decide whether to inline a function call or not.
+        inside loops and if-else, only inline simple functions, i.e.
+        functions with a single block
+        """
+        return not isinstance(
+            node.parent_stmt, (scf.For, scf.IfElse)
+        ) and self.additional_inline_heuristic(
+            node
+        )  # always inline calls outside of loops and if-else

bloqade/rewrite/passes/canonicalize_ilist.py

@@ -1,28 +1,32 @@
-from dataclasses import dataclass
+from dataclasses import field, dataclass
 
-from kirin import ir
-from kirin.passes import Pass
+from kirin import ir, passes
 from kirin.rewrite import (
     Walk,
     Chain,
     Fixpoint,
 )
-from kirin.analysis import const
-
-from ..rules.flatten_ilist import FlattenAddOpIList
-from ..rules.inline_getitem_ilist import InlineGetItemFromIList
+from kirin.dialects.ilist import rewrite
 
 
 @dataclass
-class CanonicalizeIList(Pass):
+class CanonicalizeIList(passes.Pass):
 
-    def unsafe_run(self, mt: ir.Method):
+    fold_pass: passes.Fold = field(init=False)
 
-        cp_result_frame, _ = const.Propagate(dialects=mt.dialects).run_analysis(mt)
+    def __post_init__(self):
+        self.fold_pass = passes.Fold(self.dialects, no_raise=self.no_raise)
 
-        return Fixpoint(
-            Chain(
-                Walk(InlineGetItemFromIList(constprop_result=cp_result_frame.entries)),
-                Walk(FlattenAddOpIList()),
+    def unsafe_run(self, mt: ir.Method):
+        result = Fixpoint(
+            Walk(
+                Chain(
+                    rewrite.InlineGetItem(),
+                    rewrite.FlattenAdd(),
+                    rewrite.HintLen(),
+                )
             )
         ).rewrite(mt.code)
+
+        result = self.fold_pass(mt).join(result)
+        return result

{bloqade_circuit-0.7.8.dist-info → bloqade_circuit-0.7.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bloqade-circuit
-Version: 0.7.8
+Version: 0.7.10
 Summary: The software development toolkit for neutral atom arrays.
 Author-email: Roger-luo <rluo@quera.com>, kaihsin <khwu@quera.com>, weinbe58 <pweinberg@quera.com>, johnzl-777 <jlong@quera.com>
 License-File: LICENSE

{bloqade_circuit-0.7.8.dist-info → bloqade_circuit-0.7.10.dist-info}/RECORD

@@ -19,7 +19,7 @@ bloqade/cirq_utils/parallelize.py,sha256=u9AP6l7YwBatFfIvrcCjbcYMiavk7MU6HKSKPkq
 bloqade/cirq_utils/noise/__init__.py,sha256=hUBi53U0wE4u3AqGh5cNdgdCspt3O-Vw-SR68cfBZYc,421
 bloqade/cirq_utils/noise/_two_zone_utils.py,sha256=iq4nwdJQITFlGB61wfrV7vyPA2194p-i_nv36powZ90,17883
 bloqade/cirq_utils/noise/conflict_graph.py,sha256=ZUwPWTknrb6SgtZUVPeICn3YA-nUeWQJDuKKX5jL9tE,7179
-bloqade/cirq_utils/noise/model.py,sha256=tKzK_d1u81miQu1LMeum7wKRXeuyP1M182SEJ8lNTbo,18605
+bloqade/cirq_utils/noise/model.py,sha256=fhznG0P_SUtl7LBNIANuNi5MGY9ks241UW7m0rg2iNs,18782
 bloqade/cirq_utils/noise/transform.py,sha256=pauFnOKbk2QjxeyXEV_x2zyRGypr5wiQ6ySirU7C2zg,2278
 bloqade/native/__init__.py,sha256=MtQZmq7KqNGkjxsO_22DpY-13X23Ovw8JKs7lfuv55w,443
 bloqade/native/_prelude.py,sha256=znle4mSTLZtRMCmmiZ-bCPfHqNdgVxsKuY64Fgj2kko,1258
@@ -35,7 +35,7 @@ bloqade/pyqrack/__init__.py,sha256=OV8-2fw44gP_JgY8mAUiwISO_qYxS-t0fKsbuUB-r9Y,8
 bloqade/pyqrack/base.py,sha256=Q2GjAcqEZBo-Lhe2jpXuNCB0xXVIdwtdy6cUmDM_OZI,4623
 bloqade/pyqrack/device.py,sha256=ruseNWt3scvjw0KyHZjwnM6Z6lFjROgmW3Zdi1lucgQ,15195
 bloqade/pyqrack/native.py,sha256=ErbVQCatn_JT3Ej-iQzMMfb_q50JF_K1Iv1vRYvu5VA,1857
-bloqade/pyqrack/reg.py,sha256=75XW6qJLYOJp9BtpyYMUFmpqFfGrCydNLS40bKcghGM,1853
+bloqade/pyqrack/reg.py,sha256=2GK7QW1dhCfqDHtwzYK-C37fNtnbGK8DhdhMrMidP_w,1859
 bloqade/pyqrack/target.py,sha256=c78VtLWAiDNp_0sXwvVzhaEoeFsr1fUVsupxWuo6p3s,3661
 bloqade/pyqrack/task.py,sha256=nRmI3tM_y4134_Uld-D9xwNXG9ie-OHNAqwRT5Ss-Y0,5266
 bloqade/pyqrack/noise/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -104,7 +104,7 @@ bloqade/qasm2/parse/qasm2.lark,sha256=IYrBydUoVLn1VCNDPP5uNN5BHDET3fQ2yG11cOy900
 bloqade/qasm2/parse/visitor.py,sha256=W4NUkBw97e3Z4Y1ek6jVNn-5lLVd3A5HXxc-FYTGYbY,427
 bloqade/qasm2/parse/visitor.pyi,sha256=JafCo1QztL6fvmWtJXu4dlqwbTJ6iLVrSa8L-Zd72t4,1851
 bloqade/qasm2/passes/__init__.py,sha256=9vz9F9Mgb5OFgnPWqw8pOJ-7r-tShoa7XevJ41ZmPXM,262
-bloqade/qasm2/passes/fold.py,sha256=NMT9MVpc7eWtqmdCztcztrfVewk5SCz5OTDMjSNPGaE,3046
+bloqade/qasm2/passes/fold.py,sha256=OA4mVarUYRAfZSODOA9wgoW7HNNmpQWfPG5qGVEbA6I,1117
 bloqade/qasm2/passes/glob.py,sha256=qGmUTJSvDPf6qatapg4U69bTRKOAwZEHcFdts3mRxjI,3563
 bloqade/qasm2/passes/lift_qubits.py,sha256=VgIuqaZecozA3cwGAq8Nzqdv8IqQlzyQv2XlaqY4H4g,759
 bloqade/qasm2/passes/noise.py,sha256=w7U91jOAabcCZZXm8uPxojsVRtcIkxtpZS2hwEDsDN0,2709
@@ -130,11 +130,10 @@ bloqade/qbraid/schema.py,sha256=dTPexUFOiBNBnFv0GEbGh6jpIbMIFHk4hFXmXbeihxA,7854
 bloqade/qbraid/simulation_result.py,sha256=zdCJcAdbQkEDzFFuC2q3gqOFTOLAXHk4wh8RRDB6cgc,3956
 bloqade/qbraid/target.py,sha256=LcFHHyLe74yBmrHI9251xHgLN_nUz35lN8RPNwrT6mI,3149
 bloqade/rewrite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bloqade/rewrite/passes/__init__.py,sha256=Qfe1PDADGySGuqNn5UuXiH48P70EykEMDaEKkd80ikk,71
-bloqade/rewrite/passes/canonicalize_ilist.py,sha256=LmX09aPjagT6NzU-M87V8kZaCGkYR_qvmtRNCRuVK1U,689
+bloqade/rewrite/passes/__init__.py,sha256=-J8Ng97AlSCy6hJGmQORbVPjSCWhXdyU4EJx6XHnqXE,139
+bloqade/rewrite/passes/aggressive_unroll.py,sha256=bXXOjooo_qJVIejniSfPMxa9ySrTaK3C57PgkpYa1dw,3025
+bloqade/rewrite/passes/canonicalize_ilist.py,sha256=Y7twcmmtEEnXb4ulKhLi7JFBicCMxaP76_KiQMkOq7w,749
 bloqade/rewrite/rules/__init__.py,sha256=3e1Z5T3INqNtP6OU0Vivu_SdMOR_2KDixeA0Yjoddgg,82
-bloqade/rewrite/rules/flatten_ilist.py,sha256=QoIxMaBXSlatpWzi5s_MAPnV3bV3GeoWc31RBw0WQ3s,1465
-bloqade/rewrite/rules/inline_getitem_ilist.py,sha256=uIXQRCsr3_GPMciDT4ghI-ezhQmkDcGcC6pguABPUVw,875
 bloqade/rewrite/rules/split_ifs.py,sha256=KhwvUx-oBrBO2F1j-J5kwNbdnrnEZcZtJflzyQm-UOI,2613
 bloqade/squin/__init__.py,sha256=j9jgH39eQHedbVR9poKx2YHxOihclAI0GpIA05NejHM,675
 bloqade/squin/_typeinfer.py,sha256=bilWfC6whTMwewFCqDgB6vDHZsgXPr3azNOYqqnvtB4,780
@@ -243,7 +242,7 @@ bloqade/visual/animation/runtime/atoms.py,sha256=EmjxhujLiHHPS_HtH_B-7TiqeHgvW5u
 bloqade/visual/animation/runtime/ppoly.py,sha256=JB9IP53N1w6adBJEue6J5Nmj818Id9JvrlgrmiQTU1I,1385
 bloqade/visual/animation/runtime/qpustate.py,sha256=rlmxQeJSvaohXrTpXQL5y-NJcpvfW33xPaYM1slv7cc,4270
 bloqade/visual/animation/runtime/utils.py,sha256=ju9IzOWX-vKwfpqUjlUKu3Ssr_UFPFFq-tzH_Nqyo_c,1212
-bloqade_circuit-0.7.8.dist-info/METADATA,sha256=svrqjS1xWz1xDQDyERLzAfIUnKfY-9uVedF-S_aGS3U,3724
-bloqade_circuit-0.7.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bloqade_circuit-0.7.8.dist-info/licenses/LICENSE,sha256=S5GIJwR6QCixPA9wryYb44ZEek0Nz4rt_zLUqP05UbU,13160
-bloqade_circuit-0.7.8.dist-info/RECORD,,
+bloqade_circuit-0.7.10.dist-info/METADATA,sha256=U60f2ctIawKmXlnu1z7MAnuEZliCMychHmnsCpst9FU,3725
+bloqade_circuit-0.7.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+bloqade_circuit-0.7.10.dist-info/licenses/LICENSE,sha256=S5GIJwR6QCixPA9wryYb44ZEek0Nz4rt_zLUqP05UbU,13160
+bloqade_circuit-0.7.10.dist-info/RECORD,,

bloqade/rewrite/rules/flatten_ilist.py

@@ -1,51 +0,0 @@
-from dataclasses import dataclass
-
-from kirin import ir
-from kirin.dialects import py, ilist
-from kirin.rewrite.abc import RewriteRule, RewriteResult
-
-
-@dataclass
-class FlattenAddOpIList(RewriteRule):
-
-    def rewrite_Statement(self, node: ir.Statement) -> RewriteResult:
-        if not isinstance(node, py.binop.Add):
-            return RewriteResult()
-
-        # check if we are adding two ilist.New objects
-        new_data = ()
-
-        # lhs:
-        if not isinstance(node.lhs.owner, ilist.New):
-            if not (
-                isinstance(node.lhs.owner, py.Constant)
-                and isinstance(
-                    const_ilist := node.lhs.owner.value.unwrap(), ilist.IList
-                )
-                and len(const_ilist.data) == 0
-            ):
-                return RewriteResult()
-
-        else:
-            new_data += node.lhs.owner.values
-
-        # rhs:
-        if not isinstance(node.rhs.owner, ilist.New):
-            if not (
-                isinstance(node.rhs.owner, py.Constant)
-                and isinstance(
-                    const_ilist := node.rhs.owner.value.unwrap(), ilist.IList
-                )
-                and len(const_ilist.data) == 0
-            ):
-                return RewriteResult()
-
-        else:
-            new_data += node.rhs.owner.values
-
-        new_stmt = ilist.New(values=new_data)
-        node.replace_by(new_stmt)
-
-        return RewriteResult(
-            has_done_something=True,
-        )

bloqade/rewrite/rules/inline_getitem_ilist.py

@@ -1,31 +0,0 @@
-from dataclasses import dataclass
-
-from kirin import ir
-from kirin.analysis import const
-from kirin.dialects import py, ilist
-from kirin.rewrite.abc import RewriteRule, RewriteResult
-
-
-@dataclass
-class InlineGetItemFromIList(RewriteRule):
-    constprop_result: dict[ir.SSAValue, const.Result]
-
-    def rewrite_Statement(self, node: ir.Statement) -> RewriteResult:
-        if not isinstance(node, py.indexing.GetItem):
-            return RewriteResult()
-
-        if not isinstance(node.obj.owner, ilist.New):
-            return RewriteResult()
-
-        if not isinstance(
-            index_value := self.constprop_result.get(node.index), const.Value
-        ):
-            return RewriteResult()
-
-        elem_ssa = node.obj.owner.values[index_value.data]
-
-        node.result.replace_by(elem_ssa)
-
-        return RewriteResult(
-            has_done_something=True,
-        )