cirq-core 1.7.0.dev20250905003713__py3-none-any.whl → 1.7.0.dev20250906004127__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.dev20250905003713"
+__version__ = "1.7.0.dev20250906004127"

cirq/_version_test.py

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

cirq/circuits/circuit.py

@@ -3002,13 +3002,15 @@ def get_earliest_accommodating_moment_index(
     mop_index = last_conflict + 1
 
     # Update our dicts with data from this `mop` placement. Note `mop_index` will always be greater
-    # than the existing value for all of these, by construction.
+    # than the existing value for qubits and measurement keys, by construction.
     for qubit in mop_qubits:
         qubit_indices[qubit] = mop_index
     for key in mop_mkeys:
         mkey_indices[key] = mop_index
+    # For control keys, keep the maximum moment index seen so far because ops with the same control
+    # keys can commute past each other.
     for key in mop_ckeys:
-        ckey_indices[key] = mop_index
+        ckey_indices[key] = max(mop_index, ckey_indices.get(key, -1))
 
     return mop_index
 

cirq/circuits/circuit_test.py

@@ -208,6 +208,24 @@ def test_append_control_key() -> None:
     assert len(c) == 1
 
 
+def test_append_control_key_before_measure() -> None:
+    c = cirq.Circuit()
+    q1, q2 = cirq.LineQubit.range(2)
+    c.append(cirq.X(q1))
+    c.append(cirq.X(q1))
+    c.append(cirq.X(q1).with_classical_controls('a'))
+    c.append(cirq.X(q2).with_classical_controls('a'))
+    c.append(cirq.measure(q2, key='a'))
+    assert c == cirq.Circuit(
+        [
+            cirq.Moment(cirq.X(q1), cirq.X(q2).with_classical_controls('a')),
+            cirq.Moment(cirq.X(q1)),
+            cirq.Moment(cirq.X(q1).with_classical_controls('a')),
+            cirq.Moment(cirq.measure(q2, key='a')),
+        ]
+    )
+
+
 def test_append_multiple() -> None:
     a = cirq.NamedQubit('a')
     b = cirq.NamedQubit('b')

cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation_test.py

@@ -141,7 +141,7 @@ def test_pauli_string_measurement_errors_no_noise() -> None:
                 _ideal_expectation_based_on_pauli_string(
                     pauli_string_measurement_results.pauli_string, final_state_vector
                 ),
-                atol=max(4 * pauli_string_measurement_results.mitigated_stddev, 0.1),
+                atol=10 * pauli_string_measurement_results.mitigated_stddev,
             )
             assert isinstance(
                 pauli_string_measurement_results.calibration_result,
@@ -189,7 +189,7 @@ def test_pauli_string_measurement_errors_with_coefficient_no_noise() -> None:
                 _ideal_expectation_based_on_pauli_string(
                     pauli_string_measurement_results.pauli_string, final_state_vector
                 ),
-                atol=max(4 * pauli_string_measurement_results.mitigated_stddev, 0.1),
+                atol=10 * pauli_string_measurement_results.mitigated_stddev,
             )
             assert isinstance(
                 pauli_string_measurement_results.calibration_result,
@@ -243,7 +243,7 @@ def test_group_pauli_string_measurement_errors_no_noise_with_coefficient() -> No
                 _ideal_expectation_based_on_pauli_string(
                     pauli_string_measurement_results.pauli_string, final_state_vector
                 ),
-                atol=max(4 * pauli_string_measurement_results.mitigated_stddev, 0.1),
+                atol=10 * pauli_string_measurement_results.mitigated_stddev,
             )
             assert isinstance(
                 pauli_string_measurement_results.calibration_result,
@@ -286,7 +286,7 @@ def test_pauli_string_measurement_errors_with_noise() -> None:
                 _ideal_expectation_based_on_pauli_string(
                     pauli_string_measurement_results.pauli_string, final_state_vector
                 ),
-                atol=max(4 * pauli_string_measurement_results.mitigated_stddev, 0.1),
+                atol=10 * pauli_string_measurement_results.mitigated_stddev,
             )
 
             assert isinstance(
@@ -337,7 +337,7 @@ def test_group_pauli_string_measurement_errors_with_noise() -> None:
                 _ideal_expectation_based_on_pauli_string(
                     pauli_string_measurement_results.pauli_string, final_state_vector
                 ),
-                atol=max(4 * pauli_string_measurement_results.mitigated_stddev, 0.1),
+                atol=10 * pauli_string_measurement_results.mitigated_stddev,
             )
 
             assert isinstance(
@@ -398,7 +398,7 @@ def test_many_circuits_input_measurement_with_noise() -> None:
                 _ideal_expectation_based_on_pauli_string(
                     pauli_string_measurement_results.pauli_string, final_state_vector
                 ),
-                atol=max(4 * pauli_string_measurement_results.mitigated_stddev, 0.1),
+                atol=10 * pauli_string_measurement_results.mitigated_stddev,
             )
             assert isinstance(
                 pauli_string_measurement_results.calibration_result,
@@ -517,7 +517,7 @@ def test_many_circuits_with_coefficient() -> None:
                 _ideal_expectation_based_on_pauli_string(
                     pauli_string_measurement_results.pauli_string, final_state_vector
                 ),
-                atol=max(4 * pauli_string_measurement_results.mitigated_stddev, 0.1),
+                atol=10 * pauli_string_measurement_results.mitigated_stddev,
             )
             assert isinstance(
                 pauli_string_measurement_results.calibration_result,
@@ -588,7 +588,7 @@ def test_many_group_pauli_in_circuits_with_coefficient() -> None:
                 _ideal_expectation_based_on_pauli_string(
                     pauli_string_measurement_results.pauli_string, final_state_vector
                 ),
-                atol=max(4 * pauli_string_measurement_results.mitigated_stddev, 0.1),
+                atol=10 * pauli_string_measurement_results.mitigated_stddev,
             )
             assert isinstance(
                 pauli_string_measurement_results.calibration_result,

{cirq_core-1.7.0.dev20250905003713.dist-info → cirq_core-1.7.0.dev20250906004127.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cirq-core
-Version: 1.7.0.dev20250905003713
+Version: 1.7.0.dev20250906004127
 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.dev20250905003713.dist-info → cirq_core-1.7.0.dev20250906004127.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=2td_SW0o4k_dVeIeehxNpyyQ_b0GOAqZBKa2fPxHExE,1206
-cirq/_version_test.py,sha256=RV9N2nrdM1YFCgzFBLI_PMfN3XHyL9cnWvQE9EpCCdQ,155
+cirq/_version.py,sha256=rHj9OxmoWEpsMNGhEk-7wm2NWOcOLEono0BGaeNBYww,1206
+cirq/_version_test.py,sha256=V7vh-5Kz7DWCXo21ImJrEETtRujanSJSPPq1tc3nfaM,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
@@ -16,10 +16,10 @@ cirq/circuits/_box_drawing_character_data.py,sha256=hExbMJHm9LGORhlhNiUvPiHquv4p
 cirq/circuits/_box_drawing_character_data_test.py,sha256=GyiNQDtiu_drzEe_y8DOXCFRYDKr2k8KetXN5RVDp18,1668
 cirq/circuits/_bucket_priority_queue.py,sha256=U564r2mou4aZsOlpVYiZCgirqS6mVznG3ESyawBt4gE,6749
 cirq/circuits/_bucket_priority_queue_test.py,sha256=MOby-UKYZQMe2n4KhqkfDCPrz-T_3eBbWDEa0_nadJQ,5627
-cirq/circuits/circuit.py,sha256=_5i3X0ICHZInOgPbK98v0usdHDr6YU7ONxgr9DXLGkM,122773
+cirq/circuits/circuit.py,sha256=sBUG4Tm2KXYkwiPPJ_HDYBJM6fkhb_Qxfny93wXANCw,122960
 cirq/circuits/circuit_operation.py,sha256=vvLk30okWhimdJRFhFOpwoHDkyOHzR2I9OIggZaqmVk,36338
 cirq/circuits/circuit_operation_test.py,sha256=ZoYvAIsURx9yPWiLcPeX3--lkCOFJkXLxHafUJaZf1U,50425
-cirq/circuits/circuit_test.py,sha256=Q1ywfvVp6ThmtkAKTk-5bq0cVKctncL0d1qoWxTL_r4,166579
+cirq/circuits/circuit_test.py,sha256=fT08nAEf-aiA5cvboBYnfLPGJHxauGIzJ2_Iw0fWT40,167182
 cirq/circuits/frozen_circuit.py,sha256=UXwABQqBSnSKqSWmRluQPD09xZU0orSW3b3IHvDqxUw,7903
 cirq/circuits/frozen_circuit_test.py,sha256=1Uk3g9St_nJFmu3IJ5hAcXWJjLfWFUXTCKQU1b0JJrE,5321
 cirq/circuits/insert_strategy.py,sha256=3995vK4U6O9RV4BXMoFl9Tf3ekxIiqxv71IuX80JtYo,3237
@@ -109,7 +109,7 @@ cirq/contrib/paulistring/optimize_test.py,sha256=FsmwyYFIGyyiO115oYgmCfaSV3De55A
 cirq/contrib/paulistring/pauli_string_dag.py,sha256=28bUVNsIS9WYKdyYCNIVrkRwqQOKlkpmCacWow6N6D0,1142
 cirq/contrib/paulistring/pauli_string_dag_test.py,sha256=nH_1h5LQobV9rb5gitLmrvpIwWwrcRmNdUGDAhFMZtI,1168
 cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation.py,sha256=xrG4KNJaJjjhCG_0KvnOFdAOTbNRGJhYwyhCSBjWkWw,21288
-cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation_test.py,sha256=6WlAPdgS-iDPIccoZUTvAiikYo1sbIA0hP-L8Ij_TXw,36911
+cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation_test.py,sha256=dMIjWKXxexxIJMn3OXa7dAT4e7PG0BAqTA9f9WspPkk,36839
 cirq/contrib/paulistring/pauli_string_optimize.py,sha256=ejHf7Bo0iUvnNBeZ5IN0bT0SIXF79DSGr1NxoAyVfiQ,2960
 cirq/contrib/paulistring/pauli_string_optimize_test.py,sha256=_14FS9TAvzRsmnTZxJUsMXPNcenv5mb0eD2gGTxvohE,2955
 cirq/contrib/paulistring/recombine.py,sha256=phJ-SY4zdqZpIZca0iSsY0lK6NdXd0M0sOOWnUdGn5U,4353
@@ -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.dev20250905003713.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.7.0.dev20250905003713.dist-info/METADATA,sha256=PDoADT3dkGaaQErbjm8gobHac_uGwoJVyeN8BdUP6fc,4758
-cirq_core-1.7.0.dev20250905003713.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cirq_core-1.7.0.dev20250905003713.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.7.0.dev20250905003713.dist-info/RECORD,,
+cirq_core-1.7.0.dev20250906004127.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.7.0.dev20250906004127.dist-info/METADATA,sha256=dlyQUrjYr5M3XvxunX5uCHK0RCXrCTIe2fCuRVAj3AE,4758
+cirq_core-1.7.0.dev20250906004127.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cirq_core-1.7.0.dev20250906004127.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.7.0.dev20250906004127.dist-info/RECORD,,