Merge branch 'main' into david/571-kirin-upgrade-branch

Author: david-pl

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }} # required
       - name: Archive code coverage results
         if: matrix.python-version == '3.12'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: code-coverage-report
           path: coverage.xml
@@ -55,7 +55,7 @@ jobs:
     steps:
         - uses: actions/checkout@v5
         - name: download covearge
-          uses: actions/download-artifact@v5
+          uses: actions/download-artifact@v6
           with:
             name: code-coverage-report
         - name: check coverage

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Build distribution 📦
       run: uv build
     - name: Store the distribution packages
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: python-package-distributions
         path: dist/
@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: python-package-distributions
         path: dist/
@@ -60,12 +60,12 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: python-package-distributions
         path: dist/
     - name: Sign the dists with Sigstore
-      uses: sigstore/gh-action-sigstore-python@v3.0.1
+      uses: sigstore/gh-action-sigstore-python@v3.1.0
       with:
         inputs: >-
           ./dist/*.tar.gz

src/bloqade/cirq_utils/emit/base.py

@@ -170,9 +170,6 @@ class EmitCirq(EmitABC[EmitCirqFrame, cirq.Circuit]):
     dialects: ir.DialectGroup = field(default_factory=_default_kernel)
     void = cirq.Circuit()
     qubits: Sequence[cirq.Qid] | None = None
-    _cached_invokes: dict[int, cirq.FrozenCircuit] = field(
-        init=False, default_factory=dict
-    )
 
     def initialize(self) -> Self:
         return super().initialize()

src/bloqade/squin/rewrite/U3_to_clifford.py

@@ -15,6 +15,14 @@ class Sdag(ir.Statement):
     pass
 
 
+class SqrtXdag(ir.Statement):
+    pass
+
+
+class SqrtYdag(ir.Statement):
+    pass
+
+
 # (theta, phi, lam)
 U3_HALF_PI_ANGLE_TO_GATES: dict[
     tuple[int, int, int], list[type[ir.Statement]] | list[None]
@@ -27,21 +35,21 @@ class Sdag(ir.Statement):
     (1, 0, 1): [gate.stmts.S, gate.stmts.SqrtY],
     (1, 0, 2): [gate.stmts.H],
     (1, 0, 3): [Sdag, gate.stmts.SqrtY],
-    (1, 1, 0): [gate.stmts.SqrtY, gate.stmts.S],
-    (1, 1, 1): [gate.stmts.S, gate.stmts.SqrtY, gate.stmts.S],
-    (1, 1, 2): [gate.stmts.Z, gate.stmts.SqrtY, gate.stmts.S],
-    (1, 1, 3): [Sdag, gate.stmts.SqrtY, gate.stmts.S],
-    (1, 2, 0): [gate.stmts.SqrtY, gate.stmts.Z],
-    (1, 2, 1): [gate.stmts.S, gate.stmts.SqrtY, gate.stmts.Z],
-    (1, 2, 2): [gate.stmts.Z, gate.stmts.SqrtY, gate.stmts.Z],
-    (1, 2, 3): [Sdag, gate.stmts.SqrtY, gate.stmts.Z],
-    (1, 3, 0): [gate.stmts.SqrtY, Sdag],
-    (1, 3, 1): [gate.stmts.S, gate.stmts.SqrtY, Sdag],
-    (1, 3, 2): [gate.stmts.Z, gate.stmts.SqrtY, Sdag],
-    (1, 3, 3): [Sdag, gate.stmts.SqrtY, Sdag],
+    (1, 1, 0): [gate.stmts.S, SqrtXdag],
+    (1, 1, 1): [gate.stmts.Z, SqrtXdag],
+    (1, 1, 2): [Sdag, SqrtXdag],
+    (1, 1, 3): [SqrtXdag],
+    (1, 2, 0): [gate.stmts.Z, SqrtYdag],
+    (1, 2, 1): [Sdag, SqrtYdag],
+    (1, 2, 2): [SqrtYdag],
+    (1, 2, 3): [gate.stmts.S, SqrtYdag],
+    (1, 3, 0): [Sdag, gate.stmts.SqrtX],
+    (1, 3, 1): [gate.stmts.SqrtX],
+    (1, 3, 2): [gate.stmts.S, gate.stmts.SqrtX],
+    (1, 3, 3): [gate.stmts.Z, gate.stmts.SqrtX],
     (2, 0, 0): [gate.stmts.Y],
     (2, 0, 1): [gate.stmts.S, gate.stmts.Y],
-    (2, 0, 2): [gate.stmts.Z, gate.stmts.Y],
+    (2, 0, 2): [gate.stmts.X],
     (2, 0, 3): [Sdag, gate.stmts.Y],
 }
 
@@ -106,6 +114,10 @@ def rewrite_U3(self, node: gate.stmts.U3) -> RewriteResult:
         for gate_stmt in gates:
             if gate_stmt is Sdag:
                 new_stmt = gate.stmts.S(adjoint=True, qubits=node.qubits)
+            elif gate_stmt is SqrtXdag:
+                new_stmt = gate.stmts.SqrtX(adjoint=True, qubits=node.qubits)
+            elif gate_stmt is SqrtYdag:
+                new_stmt = gate.stmts.SqrtY(adjoint=True, qubits=node.qubits)
             else:
                 new_stmt = gate_stmt(qubits=node.qubits)
             new_stmt.insert_before(node)

src/bloqade/stim/emit/__init__.py

@@ -1 +1,2 @@
+from . import impls as impls
 from .stim_str import FuncEmit as FuncEmit, EmitStimMain as EmitStimMain

src/bloqade/stim/emit/impls.py

@@ -0,0 +1,17 @@
+from kirin.emit import EmitStrFrame
+from kirin.interp import MethodTable, impl
+from kirin.dialects.debug import Info, dialect
+
+from bloqade.stim.emit.stim_str import EmitStimMain
+
+
+@dialect.register(key="emit.stim")
+class EmitStimDebugMethods(MethodTable):
+
+    @impl(Info)
+    def info(self, emit: EmitStimMain, frame: EmitStrFrame, stmt: Info):
+
+        msg: str = frame.get(stmt.msg)
+        emit.writeln(frame, f"# {msg}")
+
+        return ()

test/cirq_utils/test_cirq_to_squin.py

@@ -402,15 +402,6 @@ def multi_arg(n: int, p: float):
     print(circuit)
 
 
-if __name__ == "__main__":
-    test_kernel_with_args()
-
-
-@pytest.mark.xfail
-def test_amplitude_damping():
-    test_circuit(amplitude_damping)
-
-
 def test_trotter():
 
     # NOTE: stolen from jonathan's tutorial

test/cirq_utils/test_clifford_to_cirq.py

@@ -9,7 +9,7 @@
 
 from bloqade import squin
 from bloqade.pyqrack import Measurement, StackMemorySimulator
-from bloqade.cirq_utils import emit, emit_circuit
+from bloqade.cirq_utils import emit_circuit
 
 
 def test_pauli():
@@ -211,30 +211,6 @@ def main():
     print(circuit)
 
 
-@pytest.mark.xfail
-def test_invoke_cache():
-    @squin.kernel
-    def sub_kernel(q_: squin.qubit.Qubit):
-        squin.h(q_)
-
-    @squin.kernel
-    def main():
-        q = squin.qalloc(2)
-        q0 = q[0]
-        sub_kernel(q0)
-        sub_kernel(q[1])
-        sub_kernel(q0)
-
-    target = emit.base.EmitCirq(main.dialects)
-
-    circuit = target.run(main, ())
-
-    print(circuit)
-
-    # caches as well as squin.h and squin.broadcast.h with the different qubits
-    assert len(target._cached_invokes) == 6
-
-
 def test_rot():
     @squin.kernel
     def main():

test/pyqrack/squin/test_kernel.py

@@ -186,7 +186,6 @@ def broadcast_adjoint():
     assert result == ilist.IList([0, 0, 0])
 
 
-@pytest.mark.xfail
 def test_reset():
     @squin.kernel
     def main():