Fixing some tests

Author: weinbe58

src/bloqade/cirq_utils/emit/qubit.py

@@ -10,13 +10,12 @@
 class EmitCirqQubitMethods(MethodTable):
     @impl(qubit.New)
     def new(self, emit: EmitCirq, frame: EmitCirqFrame, stmt: qubit.New):
-
+        print("emitting new qubit")
         if frame.qubits is not None:
             cirq_qubit = frame.qubits[frame.qubit_index]
         else:
             cirq_qubit = cirq.LineQubit(frame.qubit_index)
 
-        frame.has_allocations = True
         frame.qubit_index += 1
         return (cirq_qubit,)
 

src/bloqade/cirq_utils/lowering.py

@@ -142,14 +142,19 @@ def main():
         body=body,
     )
 
-    return ir.Method(
+    mt = ir.Method(
         mod=None,
         py_func=None,
         sym_name=kernel_name,
         arg_names=arg_names,
         dialects=dialects,
         code=code,
     )
+    mt.print()
+    assert (run_pass := kernel.run_pass) is not None
+    run_pass(mt, typeinfer=True)
+
+    return mt
 
 
 CirqNode = (
@@ -384,8 +389,16 @@ def bool_op_or(x: bool, y: bool) -> bool:
         # NOTE: remove stmt from parent block
         then_stmt.detach()
         then_body = ir.Block((then_stmt,))
+        then_body.args.append_from(types.Bool, name="cond")
+        then_body.stmts.append(scf.Yield())
+
+        else_body = ir.Block(())
+        else_body.args.append_from(types.Bool, name="cond")
+        else_body.stmts.append(scf.Yield())
 
-        return state.current_frame.push(scf.IfElse(condition, then_body=then_body))
+        return state.current_frame.push(
+            scf.IfElse(condition, then_body=then_body, else_body=else_body)
+        )
 
     def visit_MeasurementGate(
         self, state: lowering.State[cirq.Circuit], node: cirq.GateOperation

src/bloqade/squin/__init__.py

@@ -3,7 +3,6 @@
     noise as noise,
     qubit as qubit,
     analysis as analysis,
-    _typeinfer as _typeinfer,
 )
 from .groups import kernel as kernel
 from .stdlib.qubit import qalloc as qalloc

src/bloqade/squin/stdlib/broadcast/noise.py

@@ -120,8 +120,8 @@ def correlated_qubit_loss(
             represents a group of qubits to which a correlated loss channel is applied.
 
     Example:
-        >>> q1 = squin.qubit.new(3) # First group: qubits 0, 1, 2
-        >>> q2 = squin.qubit.new(3) # Second group: qubits 3, 4, 5
+        >>> q1 = squin.qalloc(3) # First group: qubits 0, 1, 2
+        >>> q2 = squin.qalloc(3) # Second group: qubits 3, 4, 5
         >>> squin.broadcast.correlated_qubit_loss(0.5, [q1, q2])
         # Each group has 50% chance: either all qubits lost or none lost.
         # Group 1 and Group 2 outcomes are independent.

src/bloqade/stim/passes/squin_to_stim.py

@@ -102,7 +102,7 @@ def unsafe_run(self, mt: Method) -> RewriteResult:
         rewrite_result = Walk(PyConstantToStim()).rewrite(mt.code).join(rewrite_result)
 
         # clear up leftover stmts
-        # - remove any squin.qubit.new that's left around
+        # - remove any squin.qalloc that's left around
         rewrite_result = (
             Fixpoint(
                 Walk(

test/analysis/address/test_qubit_analysis.py

@@ -11,8 +11,8 @@ def test_tuple_address():
 
     @squin.kernel
     def test():
-        q1 = squin.qubit.new(5)
-        q2 = squin.qubit.new(10)
+        q1 = squin.qalloc(5)
+        q2 = squin.qalloc(10)
         squin.broadcast.y(q1)
         squin.x(q2[2])  # desugar creates a new ilist here
         # natural to expect two AddressTuple types
@@ -37,7 +37,7 @@ def test_get_item():
 
     @squin.kernel
     def test():
-        q = squin.qubit.new(5)
+        q = squin.qalloc(5)
         squin.broadcast.y(q)
         x = (q[0], q[3])  # -> AddressTuple(AddressQubit, AddressQubit)
         y = q[2]  # getitem on ilist # -> AddressQubit
@@ -66,7 +66,7 @@ def extract_qubits(qubits):
 
     @squin.kernel
     def test():
-        q = squin.qubit.new(5)
+        q = squin.qalloc(5)
         squin.broadcast.y(q)
         return extract_qubits(q)
 
@@ -84,7 +84,7 @@ def test_slice():
 
     @squin.kernel
     def main():
-        q = squin.qubit.new(4)
+        q = squin.qalloc(4)
         # get the middle qubits out and apply to them
         sub_q = q[1:3]
         squin.broadcast.x(sub_q)
@@ -115,7 +115,7 @@ def main():
 def test_for_loop_idx():
     @squin.kernel
     def main():
-        q = squin.qubit.new(3)
+        q = squin.qalloc(3)
         for i in range(3):
             squin.x(q[i])
 

test/analysis/measure_id/test_measure_id.py

@@ -18,8 +18,8 @@ def test_add():
     @squin.kernel
     def test():
 
-        ql1 = squin.qubit.new(5)
-        ql2 = squin.qubit.new(5)
+        ql1 = squin.qalloc(5)
+        ql2 = squin.qalloc(5)
         squin.broadcast.x(ql1)
         squin.broadcast.x(ql2)
         ml1 = squin.qubit.measure(ql1)
@@ -43,7 +43,7 @@ def test_measure_alias():
 
     @squin.kernel
     def test():
-        ql = squin.qubit.new(5)
+        ql = squin.qalloc(5)
         ml = squin.qubit.measure(ql)
         ml_alias = ml
 
@@ -74,7 +74,7 @@ def test_measure_count_at_if_else():
 
     @squin.kernel
     def test():
-        q = squin.qubit.new(5)
+        q = squin.qalloc(5)
         squin.x(q[2])
         ms = squin.qubit.measure(q)
 
@@ -95,7 +95,7 @@ def test():
 def test_scf_cond_true():
     @squin.kernel
     def test():
-        q = squin.qubit.new(1)
+        q = squin.qalloc(1)
         squin.x(q[2])
 
         ms = None
@@ -125,7 +125,7 @@ def test_scf_cond_false():
 
     @squin.kernel
     def test():
-        q = squin.qubit.new(5)
+        q = squin.qalloc(5)
         squin.x(q[2])
 
         ms = None
@@ -152,7 +152,7 @@ def test():
 def test_slice():
     @squin.kernel
     def test():
-        q = squin.qubit.new(6)
+        q = squin.qalloc(6)
         squin.x(q[2])
 
         ms = squin.qubit.measure(q)
@@ -180,7 +180,7 @@ def test():
 def test_getitem_no_hint():
     @squin.kernel
     def test(idx):
-        q = squin.qubit.new(6)
+        q = squin.qalloc(6)
         ms = squin.qubit.measure(q)
 
         return ms[idx]
@@ -195,7 +195,7 @@ def test(idx):
 def test_getitem_invalid_hint():
     @squin.kernel
     def test():
-        q = squin.qubit.new(6)
+        q = squin.qalloc(6)
         ms = squin.qubit.measure(q)
 
         return ms["x"]
@@ -211,7 +211,7 @@ def test_getitem_propagate_invalid_measure():
 
     @squin.kernel
     def test():
-        q = squin.qubit.new(6)
+        q = squin.qalloc(6)
         ms = squin.qubit.measure(q)
         # this will return an InvalidMeasureId
         invalid_ms = ms["x"]

test/cirq_utils/test_cirq_to_squin.py

@@ -344,7 +344,7 @@ def test_ghz_simulation():
     # manually written kernel
     @squin.kernel
     def manual():
-        q = squin.qubit.new(2)
+        q = squin.qalloc(2)
         squin.broadcast.s_adj(q)
         squin.broadcast.rx(math.pi / 2, q)
         squin.broadcast.s(q)
@@ -374,7 +374,7 @@ def test_kernel_with_args():
 
     @squin.kernel
     def main(n: int):
-        q = squin.qubit.new(n)
+        q = squin.qalloc(n)
         for i in range(n):
             squin.x(q[i])
 
@@ -393,7 +393,7 @@ def main(n: int):
 
     @squin.kernel
     def multi_arg(n: int, p: float):
-        q = squin.qubit.new(n)
+        q = squin.qalloc(n)
         squin.h(q[0])
 
         if p > 0:

test/cirq_utils/test_clifford_to_cirq.py

@@ -15,8 +15,8 @@
 def test_pauli():
     @squin.kernel
     def main():
-        q = squin.qubit.new(2)
-        q2 = squin.qubit.new(4)
+        q = squin.qalloc(2)
+        q2 = squin.qalloc(4)
         squin.x(q[0])
         squin.y(q2[0])
         squin.z(q2[3])
@@ -291,7 +291,7 @@ def coinflip():
 def test_qalloc_subroutines():
     @squin.kernel
     def subroutine():
-        q = squin.qubit.new(1)
+        q = squin.qalloc(1)
         squin.h(q[0])
         return q[0]
 
@@ -330,7 +330,7 @@ def reset(qubits: ilist.IList[Qubit, Any]) -> None: ...
 
     @squin.kernel
     def main():
-        q = squin.qubit.new(4)
+        q = squin.qalloc(4)
         squin.broadcast.x(q)
         reset(q)
         return squin.qubit.measure(q)

test/cirq_utils/test_squin_noise_to_cirq.py

@@ -7,7 +7,7 @@
 def test_pauli_channel(run_sim: bool = False):
     @squin.kernel
     def main():
-        q = squin.qubit.new(2)
+        q = squin.qalloc(2)
         squin.h(q[0])
         squin.depolarize(0.1, q[0])
         squin.cx(q[0], q[1])