Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions cirq-core/cirq/ops/classically_controlled_operation_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,9 @@ def test_subcircuit_key_set(sim):

def test_key_unset_in_subcircuit_outer_scope():
q0, q1 = cirq.LineQubit.range(2)
circuit = cirq.Circuit(cirq.measure(q0, key='a'))
# TODO (daxfohl): This will not need an InsertStrategy after scope PR.
circuit.append(
circuit = cirq.Circuit(
cirq.measure(q0, key='a'),
cirq.CircuitOperation(cirq.FrozenCircuit(cirq.X(q1).with_classical_controls('a'))),
strategy=cirq.InsertStrategy.NEW,
)
circuit.append(cirq.measure(q1, key='b'))
result = cirq.Simulator().run(circuit)
Expand All @@ -342,11 +340,10 @@ def test_key_unset_in_subcircuit_outer_scope():

def test_key_set_in_subcircuit_outer_scope():
q0, q1 = cirq.LineQubit.range(2)
circuit = cirq.Circuit(cirq.X(q0), cirq.measure(q0, key='a'))
# TODO (daxfohl): This will not need an InsertStrategy after scope PR.
circuit.append(
circuit = cirq.Circuit(
cirq.X(q0),
cirq.measure(q0, key='a'),
cirq.CircuitOperation(cirq.FrozenCircuit(cirq.X(q1).with_classical_controls('a'))),
strategy=cirq.InsertStrategy.NEW,
)
circuit.append(cirq.measure(q1, key='b'))
result = cirq.Simulator().run(circuit)
Expand Down
2 changes: 1 addition & 1 deletion cirq-core/cirq/qis/clifford_tableau.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def sample(
for _ in range(repetitions):
state = self.copy()
measurements.append(state.measure(axes, prng))
return np.array(measurements, dtype=bool)
return np.array(measurements, dtype=np.uint8)

def kron(self: TSelf, other: TSelf) -> TSelf:
"""Joins two state spaces together."""
Expand Down