cirq-core 1.6.0.dev20250520231246__py3-none-any.whl → 1.6.0.dev20250521011052__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.6.0.dev20250520231246"
+__version__ = "1.6.0.dev20250521011052"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version() -> None:
-    assert cirq.__version__ == "1.6.0.dev20250520231246"
+    assert cirq.__version__ == "1.6.0.dev20250521011052"

cirq/ops/controlled_gate.py

@@ -146,6 +146,17 @@ class ControlledGate(raw_types.Gate):
         self, qubits: tuple[cirq.Qid, ...], context: cirq.DecompositionContext | None = None
     ) -> None | NotImplementedType | cirq.OP_TREE:
         control_qubits = list(qubits[: self.num_controls()])
+        controlled_sub_gate = self.sub_gate.controlled(
+            self.num_controls(), self.control_values, self.control_qid_shape
+        )
+        # Prefer the subgate controlled version if available
+        if self != controlled_sub_gate:
+            # Prevent 2-cycle from appearing in the recursive decomposition
+            # TODO: Remove after #7241 is resolved
+            if not isinstance(controlled_sub_gate, ControlledGate) or not isinstance(
+                controlled_sub_gate.sub_gate, common_gates.CZPowGate
+            ):
+                return controlled_sub_gate.on(*qubits)
         if (
             protocols.has_unitary(self.sub_gate)
             and protocols.num_qubits(self.sub_gate) == 1

cirq/ops/controlled_gate_test.py

@@ -496,6 +496,40 @@ def _test_controlled_gate_is_consistent(
         np.testing.assert_allclose(cirq.unitary(cgate), cirq.unitary(circuit), atol=1e-13)
 
 
+@pytest.mark.parametrize(
+    'sub_gate, expected_decomposition',
+    [
+        (cirq.X, [cirq.CX]),
+        (cirq.CX, [cirq.CCX]),
+        (cirq.XPowGate(), [cirq.CXPowGate()]),
+        (cirq.CXPowGate(), [cirq.CCXPowGate()]),
+        (cirq.Z, [cirq.CZ]),
+        (cirq.CZ, [cirq.CCZ]),
+        (cirq.ZPowGate(), [cirq.CZPowGate()]),
+        (cirq.CZPowGate(), [cirq.CCZPowGate()]),
+    ],
+)
+def test_controlled_gate_decomposition_uses_canonical_version(
+    sub_gate: cirq.Gate, expected_decomposition: list[cirq.Gate]
+):
+    cgate = cirq.ControlledGate(sub_gate, num_controls=1)
+    qubits = cirq.LineQubit.range(1 + sub_gate.num_qubits())
+    dec = cirq.decompose_once(cgate.on(*qubits))
+    assert dec == [gate.on(*qubits) for gate in expected_decomposition]
+
+
+@pytest.mark.parametrize(
+    'sub_gate, expected_decomposition', [(cirq.Z, [cirq.CZ]), (cirq.ZPowGate(), [cirq.CZPowGate()])]
+)
+def test_controlled_gate_full_decomposition(
+    sub_gate: cirq.Gate, expected_decomposition: list[cirq.Gate]
+):
+    cgate = cirq.ControlledGate(sub_gate, num_controls=1)
+    qubits = cirq.LineQubit.range(1 + sub_gate.num_qubits())
+    dec = cirq.decompose(cgate.on(*qubits))
+    assert dec == [gate.on(*qubits) for gate in expected_decomposition]
+
+
 def test_pow_inverse():
     assert cirq.inverse(CRestricted, None) is None
     assert cirq.pow(CRestricted, 1.5, None) is None

{cirq_core-1.6.0.dev20250520231246.dist-info → cirq_core-1.6.0.dev20250521011052.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cirq-core
-Version: 1.6.0.dev20250520231246
+Version: 1.6.0.dev20250521011052
 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.6.0.dev20250520231246.dist-info → cirq_core-1.6.0.dev20250521011052.dist-info}/RECORD

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=ZSmenkbqEfRJpGsvutmV8vgIlfZCWj8GAVgi3t5YRso,34635
 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=F_zNYYfbEI2zjnyFTxHFFrdMY10yUHp_FcGQF9b441U,1206
-cirq/_version_test.py,sha256=GU1UbKl0AW0YzXtwCvt54PTStiCR-HkyIjHcAltW4bs,155
+cirq/_version.py,sha256=_uNO2BKllGN5pj9qTvaRaW19sPwuvLQ3g5yjVb3uYzM,1206
+cirq/_version_test.py,sha256=TAGxxTypArmXct7YiRlGNLy6AhURrqf2z0ilQ_-IlZo,155
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=S-zUVI4D_XnAxyR6z7WHDImCVmB_awJp6EStD1-CNPU,13621
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -287,8 +287,8 @@ cirq/ops/common_gates.py,sha256=swHOtGrUEfwwQEJhSortO_5-PiaZr0f9dTkMYk0YMno,5789
 cirq/ops/common_gates_test.py,sha256=0q09MBVhYuLpfi1xejTrmzgyP4QaeCS-oW_aHOLKje8,46909
 cirq/ops/control_values.py,sha256=GrNi8YJZSZDCl8Su6Ocimvd1R1SejFJjVu2thcJ8VLI,13346
 cirq/ops/control_values_test.py,sha256=JYaFLJSIqZSaQ94y0kyWRRVzcQ9mgc6-s1ws2q4EiAg,12943
-cirq/ops/controlled_gate.py,sha256=SconRAuvWq4DM_hZtmEhvyIUz3Nv5hOw1qgXDQXNOvY,15036
-cirq/ops/controlled_gate_test.py,sha256=bBYBMiylGkD3885JmX0ytoSrAxpqVHSRJUfL5p2TewU,25532
+cirq/ops/controlled_gate.py,sha256=YzHEkJdR0lFQPJee8ITcQQtRMmRv3I8tjHCtzEtsKSA,15632
+cirq/ops/controlled_gate_test.py,sha256=j-W7ZUO_5JA3xFwiaUV664AFte51QhIw2oLOSgNwdDM,26777
 cirq/ops/controlled_operation.py,sha256=l0pjUfru39HBuAbBkRCqJmrJDxah0JOFxXXILcUt0v8,13978
 cirq/ops/controlled_operation_test.py,sha256=RTGRBGbobrUUB6Z_lFp6M2m7XN-b5A294rySWXVqXzc,16558
 cirq/ops/dense_pauli_string.py,sha256=1TijNu1D2HIbbnwLbT_f546R2L4OCQtm1bKjqhno1Kg,24234
@@ -1220,8 +1220,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.6.0.dev20250520231246.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.6.0.dev20250520231246.dist-info/METADATA,sha256=_bjHe8YX1xQ07gOUPWPWCnnf3TpujsVlJQwQfoEwV94,4857
-cirq_core-1.6.0.dev20250520231246.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-cirq_core-1.6.0.dev20250520231246.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.6.0.dev20250520231246.dist-info/RECORD,,
+cirq_core-1.6.0.dev20250521011052.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.6.0.dev20250521011052.dist-info/METADATA,sha256=VpBNgk_ex3upszTEojRmyekBT7XD0AyTBi62Ajw7_I4,4857
+cirq_core-1.6.0.dev20250521011052.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+cirq_core-1.6.0.dev20250521011052.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.6.0.dev20250521011052.dist-info/RECORD,,