merge main and fix annotation upgrade to 0.21

kaihsin · kaihsin · commit 8970ee5cdabb · 2025-11-07T14:20:26.000-05:00
diff --git a/test/stim/passes/stim_reference_programs/annotate/broadcast_with_alias.stim b/test/stim/passes/stim_reference_programs/annotate/broadcast_with_alias.stim
@@ -1,2 +1 @@
-
 X 0 1
diff --git a/test/stim/passes/stim_reference_programs/annotate/clean_surface_code.stim b/test/stim/passes/stim_reference_programs/annotate/clean_surface_code.stim
@@ -1,4 +1,3 @@
-
 RZ 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
 H 13 14 15 16
 CX 13 14 16 1 3 7 0 2 4 10 11 12
diff --git a/test/stim/passes/stim_reference_programs/annotate/detector_coords_as_args.stim b/test/stim/passes/stim_reference_programs/annotate/detector_coords_as_args.stim
@@ -1,4 +1,3 @@
-
 MZ(0.00000000) 0 1
 DETECTOR(0, 1) rec[-2] rec[-1]
 DETECTOR(3, 4) rec[-2] rec[-1]
diff --git a/test/stim/passes/stim_reference_programs/annotate/kernel_base_op.stim b/test/stim/passes/stim_reference_programs/annotate/kernel_base_op.stim
@@ -1,4 +1,3 @@
-
 H 1 3 2
 MZ(0.00000000) 1 3 2
 DETECTOR(0, 0) rec[-3]
diff --git a/test/stim/passes/stim_reference_programs/annotate/linear_program_rewrite.stim b/test/stim/passes/stim_reference_programs/annotate/linear_program_rewrite.stim
@@ -1,4 +1,3 @@
-
 X 0
 Y 1
 Z 2
diff --git a/test/stim/passes/stim_reference_programs/annotate/measure_desugar.stim b/test/stim/passes/stim_reference_programs/annotate/measure_desugar.stim
@@ -1,4 +1,3 @@
-
 MZ(0.00000000) 0
 MZ(0.00000000) 0
 MZ(0.00000000) 0
diff --git a/test/stim/passes/stim_reference_programs/annotate/nested_for.stim b/test/stim/passes/stim_reference_programs/annotate/nested_for.stim
@@ -1,4 +1,3 @@
-
 MZ(0.00000000) 0 1
 DETECTOR(0, 0) rec[-2]
 DETECTOR(0, 0) rec[-1]
diff --git a/test/stim/passes/stim_reference_programs/annotate/no_kernel_base_op.stim b/test/stim/passes/stim_reference_programs/annotate/no_kernel_base_op.stim
@@ -1,4 +1,3 @@
-
 X 0 2 1
 MZ(0.00000000) 0 2 1
 DETECTOR(0, 0) rec[-3]
diff --git a/test/stim/passes/stim_reference_programs/annotate/rep_code.stim b/test/stim/passes/stim_reference_programs/annotate/rep_code.stim
@@ -1,4 +1,3 @@
-
 RZ 0 1 2 3 4
 CX 0 1 2 3
 CX 2 1 4 3
diff --git a/test/stim/passes/stim_reference_programs/annotate/set_detector_with_alias.stim b/test/stim/passes/stim_reference_programs/annotate/set_detector_with_alias.stim
@@ -1,3 +1,2 @@
-
 MZ(0.00000000) 0 1
 DETECTOR(0, 0) rec[-2] rec[-1]
diff --git a/test/stim/passes/stim_reference_programs/annotate/simple_if_rewrite.stim b/test/stim/passes/stim_reference_programs/annotate/simple_if_rewrite.stim
@@ -1,4 +1,3 @@
-
 MZ(0.00000000) 0 1 2 3
 CZ rec[-4] 0
 CX rec[-4] 1 rec[-4] 2 rec[-4] 3
diff --git a/test/stim/passes/test_annotation_to_stim.py b/test/stim/passes/test_annotation_to_stim.py
@@ -1,19 +1,21 @@
+import io
 import os
 
 from kirin import ir
 from kirin.dialects import scf, ilist
 
-from bloqade import squin
+from bloqade import stim, squin
 from bloqade.stim.emit import EmitStimMain
 from bloqade.stim.passes import SquinToStimPass
 
 
 def codegen(mt: ir.Method):
     # method should not have any arguments!
-    emit = EmitStimMain()
+    buf = io.StringIO()
+    emit = EmitStimMain(dialects=stim.main, io=buf)
     emit.initialize()
-    emit.run(mt=mt, args=())
-    return emit.get_output()
+    emit.run(mt)
+    return buf.getvalue().strip()
 
 
 def load_reference_program(filename):
diff --git a/test/stim/passes/test_code_basic_operations.py b/test/stim/passes/test_code_basic_operations.py
@@ -10,13 +10,14 @@
 PhysicalAndSquinToStim pass and are included here
 """
 
+import io
 import os
 from typing import Any
 
 from kirin import ir
 from kirin.dialects import ilist
 
-from bloqade import squin
+from bloqade import stim, squin
 from bloqade.types import Qubit
 from bloqade.stim.emit import EmitStimMain
 from bloqade.stim.passes import SquinToStimPass
@@ -32,10 +33,11 @@ def load_stim_reference(filename):
 
 def codegen(mt: ir.Method):
     # method should not have any arguments!
-    emit = EmitStimMain()
+    buf = io.StringIO()
+    emit = EmitStimMain(dialects=stim.main, io=buf)
     emit.initialize()
-    emit.run(mt=mt, args=())
-    return emit.get_output()
+    emit.run(mt)
+    return buf.getvalue().strip()
 
 
 def test_no_kernel_base_op():
diff --git a/test/test_annotate.py b/test/test_annotate.py
@@ -1,16 +1,19 @@
+import io
+
 from kirin import ir
 
-from bloqade import squin
+from bloqade import stim, squin
 from bloqade.stim.emit import EmitStimMain
 from bloqade.stim.passes import SquinToStimPass
 
 
 def codegen(mt: ir.Method):
     # method should not have any arguments!
-    emit = EmitStimMain()
+    buf = io.StringIO()
+    emit = EmitStimMain(dialects=stim.main, io=buf)
     emit.initialize()
-    emit.run(mt=mt, args=())
-    return emit.get_output()
+    emit.run(mt)
+    return buf.getvalue().strip()
 
 
 def test_annotate():
@@ -25,7 +28,7 @@ def test():
     SquinToStimPass(dialects=test.dialects)(test)
     codegen_output = codegen(test)
     expected_output = (
-        "\nMZ(0.00000000) 0 1 2 3\n"
+        "MZ(0.00000000) 0 1 2 3\n"
         "DETECTOR(0, 0) rec[-4] rec[-3] rec[-2]\n"
         "OBSERVABLE_INCLUDE(0) rec[-1]"
     )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`RZ 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16`
`3`	`2`	`H 13 14 15 16`
`4`	`3`	`CX 13 14 16 1 3 7 0 2 4 10 11 12`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`MZ(0.00000000) 0 1`
`3`	`2`	`DETECTOR(0, 1) rec[-2] rec[-1]`
`4`	`3`	`DETECTOR(3, 4) rec[-2] rec[-1]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`H 1 3 2`
`3`	`2`	`MZ(0.00000000) 1 3 2`
`4`	`3`	`DETECTOR(0, 0) rec[-3]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`MZ(0.00000000) 0`
`3`	`2`	`MZ(0.00000000) 0`
`4`	`3`	`MZ(0.00000000) 0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`MZ(0.00000000) 0 1`
`3`	`2`	`DETECTOR(0, 0) rec[-2]`
`4`	`3`	`DETECTOR(0, 0) rec[-1]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`X 0 2 1`
`3`	`2`	`MZ(0.00000000) 0 2 1`
`4`	`3`	`DETECTOR(0, 0) rec[-3]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`RZ 0 1 2 3 4`
`3`	`2`	`CX 0 1 2 3`
`4`	`3`	`CX 2 1 4 3`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`-`
`2`	`1`	`MZ(0.00000000) 0 1`
`3`	`2`	`DETECTOR(0, 0) rec[-2] rec[-1]`