bloqade-circuit 0.6.5__tar.gz → 0.6.7__tar.gz

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bloqade-circuit
-Version: 0.6.5
+Version: 0.6.7
 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.6.5 → bloqade_circuit-0.6.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bloqade-circuit"
-version = "0.6.5"
+version = "0.6.7"
 description = "The software development toolkit for neutral atom arrays."
 readme = "README.md"
 authors = [

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/src/bloqade/squin/analysis/nsites/impls.py

@@ -81,6 +81,13 @@ class SquinOp(interp.MethodTable):
         op_sites = frame.get(stmt.op)
         return (op_sites,)
 
+    @interp.impl(op.stmts.PauliString)
+    def pauli_string(
+        self, interp: NSitesAnalysis, frame: interp.Frame, stmt: op.stmts.PauliString
+    ):
+        s = stmt.string
+        return (NumberSites(sites=len(s)),)
+
 
 @scf.dialect.register(key="op.nsites")
 class ScfSquinOp(ScfTypeInfer):

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/src/bloqade/squin/cirq/__init__.py

@@ -1,4 +1,5 @@
 from typing import Any, Sequence
+from warnings import warn
 
 import cirq
 from kirin import ir, types
@@ -157,6 +158,8 @@ def load_circuit(
 def emit_circuit(
     mt: ir.Method,
     qubits: Sequence[cirq.Qid] | None = None,
+    circuit_qubits: Sequence[cirq.Qid] | None = None,
+    args: tuple = (),
     ignore_returns: bool = False,
 ) -> cirq.Circuit:
     """Converts a squin.kernel method to a cirq.Circuit object.
@@ -165,12 +168,14 @@ def emit_circuit(
         mt (ir.Method): The kernel method from which to construct the circuit.
 
     Keyword Args:
-        qubits (Sequence[cirq.Qid] | None):
+        circuit_qubits (Sequence[cirq.Qid] | None):
             A list of qubits to use as the qubits in the circuit. Defaults to None.
             If this is None, then `cirq.LineQubit`s are inserted for every `squin.qubit.new`
             statement in the order they appear inside the kernel.
             **Note**: If a list of qubits is provided, make sure that there is a sufficient
             number of qubits for the resulting circuit.
+        args (tuple):
+            The arguments of the kernel function from which to emit a circuit.
         ignore_returns (bool):
             If `False`, emitting a circuit from a kernel that returns a value will error.
             Set it to `True` in order to ignore the return value(s). Defaults to `False`.
@@ -223,7 +228,7 @@ def emit_circuit(
     # custom list of qubits on grid
     qubits = [cirq.GridQubit(i, i+1) for i in range(5)]
 
-    circuit = squin.cirq.emit_circuit(main, qubits=qubits)
+    circuit = squin.cirq.emit_circuit(main, circuit_qubits=qubits)
     print(circuit)
 
     ```
@@ -232,6 +237,12 @@ def emit_circuit(
     and manipulate the qubits in other circuits directly written in cirq as well.
     """
 
+    if circuit_qubits is None and qubits is not None:
+        circuit_qubits = qubits
+        warn(
+            "The keyword argument `qubits` is deprecated. Use `circuit_qubits` instead."
+        )
+
     if (
         not ignore_returns
         and isinstance(mt.code, func.Function)
@@ -242,17 +253,24 @@ def emit_circuit(
             " Set `ignore_returns = True` in order to simply ignore the return values and emit a circuit."
         )
 
+    if len(args) != len(mt.args):
+        raise ValueError(
+            f"The method from which you're trying to emit a circuit takes {len(mt.args)} as input, but you passed in {len(args)} via the `args` keyword!"
+        )
+
     emitter = EmitCirq(qubits=qubits)
 
     # Rewrite noise statements
     mt_ = mt.similar(mt.dialects)
     RewriteNoiseStmts(mt_.dialects)(mt_)
 
-    return emitter.run(mt_, args=())
+    return emitter.run(mt_, args=args)
 
 
 def dump_circuit(
     mt: ir.Method,
+    circuit_qubits: Sequence[cirq.Qid] | None = None,
+    args: tuple = (),
     qubits: Sequence[cirq.Qid] | None = None,
     ignore_returns: bool = False,
     **kwargs,
@@ -265,16 +283,24 @@ def dump_circuit(
         mt (ir.Method): The kernel method from which to construct the circuit.
 
     Keyword Args:
-        qubits (Sequence[cirq.Qid] | None):
+        circuit_qubits (Sequence[cirq.Qid] | None):
             A list of qubits to use as the qubits in the circuit. Defaults to None.
             If this is None, then `cirq.LineQubit`s are inserted for every `squin.qubit.new`
             statement in the order they appear inside the kernel.
             **Note**: If a list of qubits is provided, make sure that there is a sufficient
             number of qubits for the resulting circuit.
+        args (tuple):
+            The arguments of the kernel function from which to emit a circuit.
         ignore_returns (bool):
             If `False`, emitting a circuit from a kernel that returns a value will error.
             Set it to `True` in order to ignore the return value(s). Defaults to `False`.
 
     """
-    circuit = emit_circuit(mt, qubits=qubits, ignore_returns=ignore_returns)
+    circuit = emit_circuit(
+        mt,
+        circuit_qubits=circuit_qubits,
+        qubits=qubits,
+        args=args,
+        ignore_returns=ignore_returns,
+    )
     return cirq.to_json(circuit, **kwargs)

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/src/bloqade/squin/cirq/emit/emit_circuit.py

@@ -2,7 +2,7 @@ from typing import Sequence
 from dataclasses import field, dataclass
 
 import cirq
-from kirin import ir
+from kirin import ir, interp
 from kirin.emit import EmitABC, EmitError, EmitFrame
 from kirin.interp import MethodTable, impl
 from kirin.dialects import func
@@ -45,6 +45,26 @@ class EmitCirq(EmitABC[EmitCirqFrame, cirq.Circuit]):
     def run_method(self, method: ir.Method, args: tuple[cirq.Circuit, ...]):
         return self.run_callable(method.code, args)
 
+    def run_callable_region(
+        self,
+        frame: EmitCirqFrame,
+        code: ir.Statement,
+        region: ir.Region,
+        args: tuple,
+    ):
+        if len(region.blocks) > 0:
+            block_args = list(region.blocks[0].args)
+            # NOTE: skip self arg
+            frame.set_values(block_args[1:], args)
+
+        results = self.eval_stmt(frame, code)
+        if isinstance(results, tuple):
+            if len(results) == 0:
+                return self.void
+            elif len(results) == 1:
+                return results[0]
+        raise interp.InterpreterError(f"Unexpected results {results}")
+
     def emit_block(self, frame: EmitCirqFrame, block: ir.Block) -> cirq.Circuit:
         for stmt in block.stmts:
             result = self.eval_stmt(frame, stmt)

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/src/bloqade/squin/cirq/emit/qubit.py

@@ -49,7 +49,7 @@ class EmitCirqQubitMethods(MethodTable):
     ):
         qbit = frame.get(stmt.qubit)
         frame.circuit.append(cirq.measure(qbit))
-        return ()
+        return (emit.void,)
 
     @impl(qubit.MeasureQubitList)
     def measure_qubit_list(
@@ -57,4 +57,4 @@ class EmitCirqQubitMethods(MethodTable):
     ):
         qbits = frame.get(stmt.qubits)
         frame.circuit.append(cirq.measure(qbits))
-        return ()
+        return (emit.void,)

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/src/bloqade/squin/noise/rewrite.py

@@ -3,7 +3,7 @@ import itertools
 from kirin import ir
 from kirin.passes import Pass
 from kirin.rewrite import Walk
-from kirin.dialects import ilist
+from kirin.dialects import py, ilist
 from kirin.rewrite.abc import RewriteRule, RewriteResult
 
 from .stmts import (
@@ -11,6 +11,7 @@ from .stmts import (
     QubitLoss,
     Depolarize,
     PauliError,
+    Depolarize2,
     NoiseChannel,
     TwoQubitPauliChannel,
     SingleQubitPauliChannel,
@@ -58,6 +59,18 @@ class _RewriteNoiseStmts(RewriteRule):
     def rewrite_two_qubit_pauli_channel(
         self, node: TwoQubitPauliChannel
     ) -> RewriteResult:
+        operator_list = self._insert_two_qubit_paulis_before_node(node)
+        stochastic_unitary = StochasticUnitaryChannel(
+            operators=operator_list, probabilities=node.params
+        )
+
+        node.replace_by(stochastic_unitary)
+        return RewriteResult(has_done_something=True)
+
+    @staticmethod
+    def _insert_two_qubit_paulis_before_node(
+        node: TwoQubitPauliChannel | Depolarize2,
+    ) -> ir.ResultValue:
         paulis = (Identity(sites=1), X(), Y(), Z())
         for op in paulis:
             op.insert_before(node)
@@ -71,12 +84,7 @@ class _RewriteNoiseStmts(RewriteRule):
             operators.append(op.result)
 
         (operator_list := ilist.New(values=operators)).insert_before(node)
-        stochastic_unitary = StochasticUnitaryChannel(
-            operators=operator_list.result, probabilities=node.params
-        )
-
-        node.replace_by(stochastic_unitary)
-        return RewriteResult(has_done_something=True)
+        return operator_list.result
 
     def rewrite_p_p_error(self, node: PPError) -> RewriteResult:
         (operators := ilist.New(values=(node.op,))).insert_before(node)
@@ -95,8 +103,14 @@ class _RewriteNoiseStmts(RewriteRule):
             op.insert_before(node)
             operators.append(op.result)
 
+        # NOTE: need to divide the probability by 3 to get the correct total error rate
+        (three := py.Constant(3)).insert_before(node)
+        (p_over_3 := py.Div(node.p, three.result)).insert_before(node)
+
         (operator_list := ilist.New(values=operators)).insert_before(node)
-        (ps := ilist.New(values=[node.p for _ in range(3)])).insert_before(node)
+        (ps := ilist.New(values=[p_over_3.result for _ in range(3)])).insert_before(
+            node
+        )
 
         stochastic_unitary = StochasticUnitaryChannel(
             operators=operator_list.result, probabilities=ps.result
@@ -105,6 +119,21 @@ class _RewriteNoiseStmts(RewriteRule):
 
         return RewriteResult(has_done_something=True)
 
+    def rewrite_depolarize2(self, node: Depolarize2) -> RewriteResult:
+        operator_list = self._insert_two_qubit_paulis_before_node(node)
+
+        # NOTE: need to divide the probability by 15 to get the correct total error rate
+        (fifteen := py.Constant(15)).insert_before(node)
+        (p_over_15 := py.Div(node.p, fifteen.result)).insert_before(node)
+        (probs := ilist.New(values=[p_over_15.result] * 15)).insert_before(node)
+
+        stochastic_unitary = StochasticUnitaryChannel(
+            operators=operator_list, probabilities=probs.result
+        )
+        node.replace_by(stochastic_unitary)
+
+        return RewriteResult(has_done_something=True)
+
 
 class RewriteNoiseStmts(Pass):
     def unsafe_run(self, mt: ir.Method):

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/test/cirq_utils/noise/test_noise_models.py

@@ -84,5 +84,5 @@ def test_simple_model(model: cirq.NoiseModel, qubits):
 
         assert pops[0] < 0.5001
         assert pops[3] < 0.5001
-        assert pops[1] > 0.0
-        assert pops[2] > 0.0
+        assert pops[1] >= 0.0
+        assert pops[2] >= 0.0

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/test/pyqrack/squin/test_noise.py

@@ -209,3 +209,22 @@ def test_pauli_string_error():
     print(ket)
 
     assert math.isclose(abs(ket[2]) ** 2, 1.0, abs_tol=1e-5)
+
+
+def test_depolarize2():
+    @squin.kernel
+    def main():
+        q = squin.qubit.new(2)
+        err = squin.noise.depolarize2(0.1)
+        squin.qubit.apply(err, q[0], q[1])
+
+    main.print()
+
+    main_ = main.similar(main.dialects)
+
+    result = RewriteNoiseStmts(main.dialects)(main_)
+    assert result.has_done_something
+    main_.print()
+
+    sim = StackMemorySimulator(min_qubits=2)
+    sim.run(main)

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/test/squin/analysis/test_nsites_analysis.py

@@ -248,3 +248,19 @@ def test_invoke():
     assert has_n_sites[0].sites == 1
     for n_site in has_n_sites[1:]:
         assert n_site.sites == 2
+
+
+def test_pauli_string():
+    @squin.kernel(fold=False)
+    def main():
+        squin.op.pauli_string(string="XYZ")
+
+    nsites_frame, _ = nsites.NSitesAnalysis(main.dialects).run_analysis(main)
+
+    has_n_sites = []
+    for nsites_type in nsites_frame.entries.values():
+        if isinstance(nsites_type, nsites.NumberSites):
+            has_n_sites.append(nsites_type)
+
+    assert len(has_n_sites) == 1
+    assert has_n_sites[0].sites == 3

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/test/squin/cirq/test_cirq_to_squin.py

@@ -370,3 +370,39 @@ def test_ghz_simulation():
         assert ket[1] == ket[2] == 0
         assert math.isclose(abs(ket[0]) ** 2, 0.5, abs_tol=1e-5)
         assert math.isclose(abs(ket[3]) ** 2, 0.5, abs_tol=1e-5)
+
+
+def test_kernel_with_args():
+
+    @squin.kernel
+    def main(n: int):
+        q = squin.qubit.new(n)
+        x = squin.op.x()
+        for i in range(n):
+            squin.qubit.apply(x, q[i])
+
+    main.print()
+
+    n_arg = 3
+    circuit = squin.cirq.emit_circuit(main, args=(n_arg,))
+    print(circuit)
+
+    q = cirq.LineQubit.range(n_arg)
+    expected_circuit = cirq.Circuit()
+    for i in range(n_arg):
+        expected_circuit.append(cirq.X(q[i]))
+
+    assert circuit == expected_circuit
+
+    @squin.kernel
+    def multi_arg(n: int, p: float):
+        q = squin.qubit.new(n)
+        h = squin.op.h()
+        squin.qubit.apply(h, q[0])
+
+        if p > 0:
+            squin.qubit.apply(h, q[1])
+
+    circuit = squin.cirq.emit_circuit(multi_arg, args=(3, 0.1))
+
+    print(circuit)

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/test/squin/cirq/test_squin_to_cirq.py

@@ -349,4 +349,15 @@ def test_invoke_cache():
     assert len(target._cached_circuit_operations) == 2
 
 
-test_return_value()
+def test_return_measurement():
+
+    @squin.kernel
+    def coinflip():
+        qubit = squin.qubit.new(1)[0]
+        squin.gate.h(qubit)
+        return squin.qubit.measure(qubit)
+
+    coinflip.print()
+
+    circuit = squin.cirq.emit_circuit(coinflip, ignore_returns=True)
+    print(circuit)

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/test/squin/test_sugar.py

@@ -87,7 +87,7 @@ def test_apply_in_for_loop():
     sim = StackMemorySimulator(min_qubits=2)
     ket = sim.state_vector(main)
 
-    assert math.isclose(abs(ket[0]) ** 2, 1, abs_tol=1e-7)
+    assert math.isclose(abs(ket[0]) ** 2, 1, abs_tol=1e-5)
     assert ket[1] == ket[2] == ket[3] == 0
 
 

{bloqade_circuit-0.6.5 → bloqade_circuit-0.6.7}/uv.lock

@@ -102,7 +102,7 @@ wheels = [
 
 [[package]]
 name = "bloqade-circuit"
-version = "0.6.5"
+version = "0.6.7"
 source = { editable = "." }
 dependencies = [
     { name = "kirin-toolchain" },
@@ -1936,15 +1936,15 @@ wheels = [
 
 [[package]]
 name = "qpsolvers"
-version = "4.8.0"
+version = "4.8.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "numpy" },
     { name = "scipy" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/53/02/c650ed13204175e191fd8fd1bf7a8e3eb3d0a90557c009f1dbc072d85e52/qpsolvers-4.8.0.tar.gz", hash = "sha256:56addf5f60c11a5ead1e17441e06a6255feda184b2d8dc9982fef90ca258b92e", size = 98066 }
+sdist = { url = "https://files.pythonhosted.org/packages/68/87/42743adbcc31728798b26c219b14fadf02c12d49d691cd0f5813cb493c51/qpsolvers-4.8.1.tar.gz", hash = "sha256:69548b6871c57312b03b35826cc443b460adfd6d195d45bc21b12de21ca2f915", size = 97660 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ac/be/9abe51a4dbb16d7ea99f8b4202659992986eefef6dfd48c1dd380eeb56df/qpsolvers-4.8.0-py3-none-any.whl", hash = "sha256:837fe625d4257da902086ce3ca868244eeea1b1966bed3005f9a6ed73570f2f1", size = 91996 },
+    { url = "https://files.pythonhosted.org/packages/e4/02/aa2050f2beba7c07ead8d2efe1f7876a0b8cc538d4718511c46e210d9ff2/qpsolvers-4.8.1-py3-none-any.whl", hash = "sha256:ebbda8f4391968582e634bece6c865d4737f5199e2a35795092ca0ff4891a845", size = 92104 },
 ]
 
 [package.optional-dependencies]