cirq-core 1.7.0.dev20250902054702__py3-none-any.whl → 1.7.0.dev20250902183331__py3-none-any.whl

cirq/_version.py

@@ -28,4 +28,4 @@ if sys.version_info < (3, 11, 0):  # pragma: no cover
         'of Cirq (e.g. "python -m pip install cirq==1.5.0")'
     )
 
-__version__ = "1.7.0.dev20250902054702"
+__version__ = "1.7.0.dev20250902183331"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version() -> None:
-    assert cirq.__version__ == "1.7.0.dev20250902054702"
+    assert cirq.__version__ == "1.7.0.dev20250902183331"

cirq/sim/mux.py

@@ -25,6 +25,7 @@ import numpy as np
 
 from cirq import circuits, devices, ops, protocols, study, value
 from cirq._doc import document
+from cirq.linalg import transformations
 from cirq.sim import density_matrix_simulator, sparse_simulator
 from cirq.sim.clifford import clifford_simulator
 from cirq.transformers import measurement_transformers
@@ -291,16 +292,41 @@ def final_density_matrix(
         return sparse_result.density_matrix_of()
     else:
         # noisy case: use DensityMatrixSimulator with dephasing
+        has_classical_control = circuit_like != measurement_transformers.defer_measurements(
+            circuit_like
+        )
+        handling_classical_control = ignore_measurement_results and has_classical_control
+
+        if handling_classical_control:
+            # case 1: classical control
+            noise_applied = circuit_like.with_noise(noise) if noise is not None else circuit_like
+            defered = measurement_transformers.defer_measurements(noise_applied)
+            dephased = measurement_transformers.dephase_measurements(defered)
+            program = dephased
+        elif ignore_measurement_results:
+            # case 2: no classical control, only terminal measurement
+            program = measurement_transformers.dephase_measurements(circuit_like)
+        else:
+            # case 3: no measurement
+            program = circuit_like
+
         density_result = density_matrix_simulator.DensityMatrixSimulator(
-            dtype=dtype, noise=noise, seed=seed
+            dtype=dtype, noise=None if handling_classical_control else noise, seed=seed
         ).simulate(
-            program=(
-                measurement_transformers.dephase_measurements(circuit_like)
-                if ignore_measurement_results
-                else circuit_like
-            ),
+            program,
             initial_state=initial_state,
             qubit_order=qubit_order,
             param_resolver=param_resolver,
         )
-        return density_result.final_density_matrix
+        result = density_result.final_density_matrix
+
+        if handling_classical_control:
+            # assuming that the ancilla qubits from the transformations are at the end
+            keep = list(range(protocols.num_qubits(circuit_like)))
+            dephased_qid_shape = protocols.qid_shape(dephased)
+            tensor_form = np.reshape(result, dephased_qid_shape + dephased_qid_shape)
+            reduced_form = transformations.partial_trace(tensor_form, keep)
+            width = np.prod(protocols.qid_shape(circuit_like))
+            result = np.reshape(reduced_form, (width, width))
+
+        return result

cirq/sim/mux_test.py

@@ -380,6 +380,20 @@ def test_final_density_matrix_noise():
     )
 
 
+def test_final_density_matrix_classical_control():
+    q0, q1 = cirq.LineQubit.range(2)
+    circuit = cirq.Circuit(
+        cirq.H(q0),
+        cirq.measure(q0, key='a'),
+        cirq.H(q1).with_classical_controls('a'),
+        cirq.measure(q1, key='b'),
+    )
+    np.testing.assert_allclose(
+        cirq.final_density_matrix(circuit),
+        np.diag(np.array([0.5, 0.0, 0.25, 0.25], dtype=np.complex64)),
+    )
+
+
 def test_ps_initial_state_wfn():
     q0, q1 = cirq.LineQubit.range(2)
     s00 = cirq.KET_ZERO(q0) * cirq.KET_ZERO(q1)

{cirq_core-1.7.0.dev20250902054702.dist-info → cirq_core-1.7.0.dev20250902183331.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cirq-core
-Version: 1.7.0.dev20250902054702
+Version: 1.7.0.dev20250902183331
 Summary: A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits.
 Home-page: http://github.com/quantumlib/cirq
 Author: The Cirq Developers

{cirq_core-1.7.0.dev20250902054702.dist-info → cirq_core-1.7.0.dev20250902183331.dist-info}/RECORD

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=emXpdD5ZvwLRlFAoQB8YatmZyU3b4e9jg6FppMTUhkU,33900
 cirq/_doc.py,sha256=BrnoABo1hk5RgB3Cgww4zLHUfiyFny0F1V-tOMCbdaU,2909
 cirq/_import.py,sha256=ixBu4EyGl46Ram2cP3p5eZVEFDW5L2DS-VyTjz4N9iw,8429
 cirq/_import_test.py,sha256=oF4izzOVZLc7NZ0aZHFcGv-r01eiFFt_JORx_x7_D4s,1089
-cirq/_version.py,sha256=6oUgbPwXjDeQEc1bHAKE8wZ3IC8Obw14V-pUQPfj8jE,1206
-cirq/_version_test.py,sha256=LbIsTYtGy-0_xbNkuP5OGTwmhD3u4Xea_NIMKi8QiHc,155
+cirq/_version.py,sha256=116o63psUcVtaywi4BKBuPLc45Oo3zyaatH3ugnLesI,1206
+cirq/_version_test.py,sha256=QhGawTq9k0Q07pvkmh-qomXXBoWdozye2yuxx0O5_qY,155
 cirq/conftest.py,sha256=wSDKNdIQRDfLnXvOCWD3erheOw8JHRhdfQ53EyTUIXg,1239
 cirq/json_resolver_cache.py,sha256=A5DIgFAY1hUNt9vai_C3-gGBv24116CJMzQxMcXOax4,13726
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -940,8 +940,8 @@ cirq/sim/density_matrix_simulator.py,sha256=ZvXfKs0IxBTtu93Eq207WA9hXXv4CUfvxyAz
 cirq/sim/density_matrix_simulator_test.py,sha256=X2BVzl1jZeORA3aiK3X6BKFpt1pcnXhx74NA2cL9sCg,61288
 cirq/sim/density_matrix_utils.py,sha256=W2jUIiuBve3MEECrgxUImTKw4YtaaGiscXxQEzYdViY,10273
 cirq/sim/density_matrix_utils_test.py,sha256=9UQO6pHnWOpTJ0JobeM1vmVJc1EIwS7zmM9y6MKdXg8,14549
-cirq/sim/mux.py,sha256=w7sdSWFtmAEmHHn5nMH4H1qBCCp5oltlteH5vs3C_ik,12451
-cirq/sim/mux_test.py,sha256=VKwMk5r4iX3tNY-Af-pZwhUVF9qxq8yT03YxhV2DmME,13717
+cirq/sim/mux.py,sha256=8Kalgrs_jgRN4VDcIV-6HKF3xRXk2a3Umt88xtq0eg8,13794
+cirq/sim/mux_test.py,sha256=eyg8yquTOJwzeRA5j_wSaZjyX_aMP7eGzs59uatT_QM,14133
 cirq/sim/simulation_product_state.py,sha256=py-gVRPis1EfyavdCW5gLhiULocrqUOTe7ZI7OD-nws,7014
 cirq/sim/simulation_product_state_test.py,sha256=ZZeCC9a_VIehiMzyo9QQPL4PD2G2h8XVZk80IZzD5Ok,9093
 cirq/sim/simulation_state.py,sha256=wwKjntD1XuwyUcXJGFJYwmmolYaPK5pc8_xS05cOsQg,12522
@@ -1234,8 +1234,8 @@ cirq/work/sampler.py,sha256=rxbMWvrhu3gfNSBjZKozw28lLKVvBAS_1EGyPdYe8Xg,19041
 cirq/work/sampler_test.py,sha256=SsMrRvLDYELyOAWLKISjkdEfrBwLYWRsT6D8WrsLM3Q,13533
 cirq/work/zeros_sampler.py,sha256=Fs2JWwq0n9zv7_G5Rm-9vPeHUag7uctcMOHg0JTkZpc,2371
 cirq/work/zeros_sampler_test.py,sha256=lQLgQDGBLtfImryys2HzQ2jOSGxHgc7-koVBUhv8qYk,3345
-cirq_core-1.7.0.dev20250902054702.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.7.0.dev20250902054702.dist-info/METADATA,sha256=CNVwktE9ig9S9OcSsLF3VRN--ngVFm46Ae1qcof9u-w,4758
-cirq_core-1.7.0.dev20250902054702.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cirq_core-1.7.0.dev20250902054702.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.7.0.dev20250902054702.dist-info/RECORD,,
+cirq_core-1.7.0.dev20250902183331.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.7.0.dev20250902183331.dist-info/METADATA,sha256=BzK6Uz_PP6C83UFNepwojQ00HCH5Vmt-VvwWY7RZt-Q,4758
+cirq_core-1.7.0.dev20250902183331.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cirq_core-1.7.0.dev20250902183331.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.7.0.dev20250902183331.dist-info/RECORD,,