Skip to content

Fix density matrix simulator when subcircuits exist #3745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 8, 2021
Merged

Fix density matrix simulator when subcircuits exist #3745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1561204
Avoid run_sweep_sample when subcircuits exist
daxfohl Feb 3, 2021
392b519
Merge branch 'master' into dms
daxfohl Feb 4, 2021
487f8fd
Merge branch 'master' into dms
daxfohl Feb 6, 2021
cf9481a
Merge branch 'master' into dms
daxfohl Feb 8, 2021
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
4 changes: 3 additions & 1 deletion cirq/sim/density_matrix_simulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ def _run(
resolved_circuit = protocols.resolve_parameters(circuit, param_resolver)
check_all_resolved(resolved_circuit)

if circuit.are_all_measurements_terminal():
if circuit.are_all_measurements_terminal() and not any(
circuit.findall_operations(lambda op: isinstance(op, circuits.CircuitOperation))
):
return self._run_sweep_sample(resolved_circuit, repetitions)
return self._run_sweep_repeat(resolved_circuit, repetitions)

Expand Down
12 changes: 12 additions & 0 deletions cirq/sim/density_matrix_simulator_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,6 +1275,18 @@ def test_simulate_noise_with_terminal_measurements():
assert result1 == result2


def test_simulate_noise_with_subcircuit_measurements():
q = cirq.LineQubit(0)
circuit1 = cirq.Circuit(cirq.measure(q))
circuit2 = cirq.Circuit(cirq.CircuitOperation(cirq.Circuit(cirq.measure(q)).freeze()))

simulator = cirq.DensityMatrixSimulator(noise=cirq.X)
result1 = simulator.run(circuit1, repetitions=10)
result2 = simulator.run(circuit2, repetitions=10)

assert result1 == result2


def test_density_matrix_copy():
sim = cirq.DensityMatrixSimulator()

Expand Down