cirq-core 1.7.0.dev20250911065757__py3-none-any.whl → 1.7.0.dev20250911070206__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.dev20250911065757"
+__version__ = "1.7.0.dev20250911070206"

cirq/_version_test.py

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

cirq/circuits/circuit.py

@@ -1666,8 +1666,14 @@ class AbstractCircuit(abc.ABC):
         )
 
     def _control_keys_(self) -> frozenset[cirq.MeasurementKey]:
-        controls = frozenset(k for op in self.all_operations() for k in protocols.control_keys(op))
-        return controls - protocols.measurement_key_objs(self)
+        measures: set[cirq.MeasurementKey] = set()
+        controls: set[cirq.MeasurementKey] = set()
+        for op in self.all_operations():
+            # Only require keys that haven't already been measured earlier
+            controls.update(k for k in protocols.control_keys(op) if k not in measures)
+            # Record any measurement keys produced by this op
+            measures.update(protocols.measurement_key_objs(op))
+        return frozenset(controls)
 
 
 def _overlap_collision_time(

cirq/circuits/circuit_operation_test.py

@@ -1324,3 +1324,17 @@ def test_has_unitary_protocol_returns_true_if_all_params_resolve() -> None:
     exp = sympy.Symbol('exp')
     op = cirq.CircuitOperation(cirq.FrozenCircuit(cirq.X(q) ** exp), param_resolver={exp: 0.5})
     assert protocols.has_unitary(op)
+
+
+def test_control_keys_respects_internal_measurement_order() -> None:
+    q = cirq.LineQubit(0)
+
+    # Control BEFORE measurement inside the subcircuit: external key required
+    fc_before = cirq.FrozenCircuit(cirq.X(q).with_classical_controls('a'), cirq.measure(q, key='a'))
+    op_before = cirq.CircuitOperation(fc_before)
+    assert cirq.control_keys(op_before) == {cirq.MeasurementKey('a')}
+
+    # Measurement BEFORE control inside the subcircuit: no external key required
+    fc_after = cirq.FrozenCircuit(cirq.measure(q, key='a'), cirq.X(q).with_classical_controls('a'))
+    op_after = cirq.CircuitOperation(fc_after)
+    assert cirq.control_keys(op_after) == set()

cirq/protocols/control_key_protocol.py

@@ -53,6 +53,13 @@ def control_keys(val: Any) -> frozenset[cirq.MeasurementKey]:
     Returns:
         The measurement keys the value is controlled by. If the value is not
         classically controlled, the result is the empty tuple.
+
+    Notes:
+        For composite operations (e.g. CircuitOperation), only control keys that
+        have not already been measured earlier in the subcircuit are returned.
+        Control keys that are satisfied by measurements **after** their use in
+        the subcircuit are still required externally and thus appear in the
+        result.
     """
     getter = getattr(val, '_control_keys_', None)
     result = NotImplemented if getter is None else getter()

{cirq_core-1.7.0.dev20250911065757.dist-info → cirq_core-1.7.0.dev20250911070206.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cirq-core
-Version: 1.7.0.dev20250911065757
+Version: 1.7.0.dev20250911070206
 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.dev20250911065757.dist-info → cirq_core-1.7.0.dev20250911070206.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=zPtfQD35EquRA4kxlb2EC-SfCGx7i76rCpSq_57IEKo,1206
-cirq/_version_test.py,sha256=8OMhOpd1sKUe8_uUh2e6dKVgYrYE6e0EjB_9uExd7jo,155
+cirq/_version.py,sha256=JVq3XyWok9yeOK1H682f3S7y9xBiwyyX--njnMgHF9I,1206
+cirq/_version_test.py,sha256=dzDdyWPBZoNP7e52Fif6y9yqcw-THoOa79zkaT0CzP4,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,9 +16,9 @@ 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=sBUG4Tm2KXYkwiPPJ_HDYBJM6fkhb_Qxfny93wXANCw,122960
+cirq/circuits/circuit.py,sha256=y3QNLrJtgltpEOyBOADaQHayB6F92HeHIzuJDXZsJEM,123264
 cirq/circuits/circuit_operation.py,sha256=vvLk30okWhimdJRFhFOpwoHDkyOHzR2I9OIggZaqmVk,36338
-cirq/circuits/circuit_operation_test.py,sha256=ZoYvAIsURx9yPWiLcPeX3--lkCOFJkXLxHafUJaZf1U,50425
+cirq/circuits/circuit_operation_test.py,sha256=oBecDWETbLYp5Br7aN1BoWA73VbNbhhtlkydDhnk5z8,51098
 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
@@ -409,7 +409,7 @@ cirq/protocols/circuit_diagram_info_protocol.py,sha256=Bj7zAAxFZZ7VhJWk8eLmCWVX-
 cirq/protocols/circuit_diagram_info_protocol_test.py,sha256=r-kNamR6QPdu-Q9to2DKLrDP9J8rWOA7IxfMVvcO0qE,12074
 cirq/protocols/commutes_protocol.py,sha256=DPwB_xKiqj3MW8uxEksjWDd6c163zgNMNMDjE2N9Xbw,7368
 cirq/protocols/commutes_protocol_test.py,sha256=INP3i39_3Xqh8oDTDNdY546fqD3eqnVzW_TO0zUVCeg,5911
-cirq/protocols/control_key_protocol.py,sha256=OhMkglGhP0_Of1Z-pMkEs6pYDTKzmu23pVyZunqyBBk,2591
+cirq/protocols/control_key_protocol.py,sha256=a_yEw9vk7nlfJ-lADHIJPf0RhuxfM7KYcRvuG-prtXg,2934
 cirq/protocols/control_key_protocol_test.py,sha256=fNDDkf4mQpA_tKuhX1e2BJN72v9HdGftgd79sOqREJE,1014
 cirq/protocols/decompose_protocol.py,sha256=73wGRdSf4o_K8MJ0i-DPJIBiNlq6fRGrF9E90NqxhwY,18941
 cirq/protocols/decompose_protocol_test.py,sha256=JJexKMKYdSW1K1S4wkTyR1Wy80Ku_jHslSJx3gJ5REs,18130
@@ -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.dev20250911065757.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.7.0.dev20250911065757.dist-info/METADATA,sha256=LLlO9EvQfJkle_JCjuv0leIAKBPhIn3aqZUTE2bUWCs,4758
-cirq_core-1.7.0.dev20250911065757.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cirq_core-1.7.0.dev20250911065757.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.7.0.dev20250911065757.dist-info/RECORD,,
+cirq_core-1.7.0.dev20250911070206.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.7.0.dev20250911070206.dist-info/METADATA,sha256=UOrxXFQdQJv-z8m05_YpZdWsIRjGTYykdJcH-LO76XE,4758
+cirq_core-1.7.0.dev20250911070206.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cirq_core-1.7.0.dev20250911070206.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.7.0.dev20250911070206.dist-info/RECORD,,