cirq-core 1.7.0.dev20250728175235__py3-none-any.whl → 1.7.0.dev20250801200422__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.dev20250728175235"
+__version__ = "1.7.0.dev20250801200422"

cirq/_version_test.py

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

cirq/transformers/dynamical_decoupling.py

@@ -149,26 +149,6 @@ def _merge_single_qubit_ops_to_phxz(
     return gate.on(q)
 
 
-def _try_merge_single_qubit_ops_of_two_moments(m1: Moment, m2: Moment) -> tuple[Moment, ...]:
-    """Merge single qubit ops of 2 moments if possible, returns 2 moments otherwise."""
-    for q in m1.qubits & m2.qubits:
-        op1 = m1.operation_at(q)
-        op2 = m2.operation_at(q)
-        if any(
-            not (_is_single_qubit_operation(op) and has_unitary(op))
-            for op in [op1, op2]
-            if op is not None
-        ):
-            return (m1, m2)
-    merged_ops: set[ops.Operation] = set()
-    # Merge all operators on q to a single op.
-    for q in m1.qubits | m2.qubits:
-        # ops_on_q may contain 1 op or 2 ops.
-        ops_on_q = [op for op in [m.operation_at(q) for m in [m1, m2]] if op is not None]
-        merged_ops.add(_merge_single_qubit_ops_to_phxz(q, tuple(ops_on_q)))
-    return (Moment(merged_ops),)
-
-
 def _calc_pulled_through(moment: Moment, input_pauli_ops: ops.PauliString) -> ops.PauliString:
     """Calculates the pulled_through such that circuit(input_pauli_ops, moment.clifford_ops) is
     equivalent to circuit(moment.clifford_ops, pulled_through).
@@ -251,7 +231,7 @@ def add_dynamical_decoupling(
     #  (pulled_through, moment) -> (new_moment, updated_moment, updated_pulled_through)
     # Moments structure changes are split into 3 steps:
     #   1, (..., last_moment, pulled_through1, moment, ...)
-    #        -> (..., try_merge(last_moment, new_moment or None), pulled_through2, moment, ...)
+    #        -> (..., last_moment, new_moment or None, pulled_through2, moment, ...)
     #   2, (..., pulled_through2, moment, ...)  -> (..., pulled_through3, updated_moment, ...)
     #   3, (..., pulled_through3, updated_moment, ...)
     #        -> (..., updated_moment, pulled_through4, ...)
@@ -261,7 +241,7 @@ def add_dynamical_decoupling(
         # unitary representation (e.g., measure gates). If there are remaining pulled through ops,
         # insert into a new moment before current moment.
         stop_pulling_through_qubits: set[ops.Qid] = _get_stop_qubits(moment)
-        new_moment_ops = []
+        new_moment_ops: list[ops.Operation] = []
         for q in stop_pulling_through_qubits:
             # Insert the remaining pulled_through
             remaining_pulled_through_gate = pulled_through.get(q)
@@ -271,24 +251,11 @@ def add_dynamical_decoupling(
             dd_iter_by_qubits[q] = cycle(base_dd_sequence)
         # Need to insert a new moment before current moment
         if new_moment_ops:
-            moments_to_be_appended = _try_merge_single_qubit_ops_of_two_moments(
-                transformed_moments[-1], Moment(new_moment_ops)
-            )
-            if len(moments_to_be_appended) == 1:
-                transformed_moments.pop()
-                transformed_moments.append(moments_to_be_appended[0])
-            else:  # Fill insertable idle moments in the new moment using dd sequence
-                for q in orig_circuit.all_qubits() - stop_pulling_through_qubits:
-                    if (
-                        busy_moment_range_by_qubit[q][0]
-                        < moment_id
-                        <= busy_moment_range_by_qubit[q][1]
-                    ):
-                        new_moment_ops.append(_update_pulled_through(q, next(dd_iter_by_qubits[q])))
-                moments_to_be_appended = _try_merge_single_qubit_ops_of_two_moments(
-                    transformed_moments.pop(), Moment(new_moment_ops)
-                )
-                transformed_moments.extend(moments_to_be_appended)
+            # Fill insertable idle moments in the new moment using dd sequence
+            for q in orig_circuit.all_qubits() - stop_pulling_through_qubits:
+                if busy_moment_range_by_qubit[q][0] < moment_id <= busy_moment_range_by_qubit[q][1]:
+                    new_moment_ops.append(_update_pulled_through(q, next(dd_iter_by_qubits[q])))
+            transformed_moments.append(Moment(new_moment_ops))
 
         # Step 2, calc updated_moment with insertions / merges.
         updated_moment_ops: set[cirq.Operation] = set()
@@ -332,10 +299,6 @@ def add_dynamical_decoupling(
     for affected_q, combined_op_in_pauli in pulled_through.items():
         ending_moment_ops.append(combined_op_in_pauli.on(affected_q))
     if ending_moment_ops:
-        transformed_moments.extend(
-            _try_merge_single_qubit_ops_of_two_moments(
-                transformed_moments.pop(), Moment(ending_moment_ops)
-            )
-        )
+        transformed_moments.append(Moment(ending_moment_ops))
 
     return Circuit.from_moments(*transformed_moments)

cirq/transformers/dynamical_decoupling_test.py

@@ -533,9 +533,9 @@ def test_multiple_clifford_pieces_case1():
                           │
     b: ───H───H───H───H───@^0.5───H───H───H───H───
     Output:
-    a: ───H───X───H───PhXZ(a=0.5,x=0,z=-1)───@───────X───H───X───PhXZ(a=0.5,x=0.5,z=-1)───
-                                             │
-    b: ───H───H───H───H──────────────────────@^0.5───H───H───H───H────────────────────────
+    a: ───H───X───H───X───Y───@───────X───H───X───PhXZ(a=0.5,x=0.5,z=-1)───
+                              │
+    b: ───H───H───H───H───────@^0.5───H───H───H───H────────────────────────
     """
     a = cirq.NamedQubit('a')
     b = cirq.NamedQubit('b')
@@ -551,22 +551,11 @@ def test_multiple_clifford_pieces_case1():
             cirq.Moment(H(b)),
             cirq.Moment(H(a), H(b)),
         ),
-        expected_circuit=cirq.Circuit(
-            cirq.Moment(H(a), H(b)),
-            cirq.Moment(H(b), X(a)),
-            cirq.Moment(H(a), H(b)),
-            cirq.Moment(
-                H(b), cirq.PhasedXZGate(axis_phase_exponent=0.5, x_exponent=0, z_exponent=-1).on(a)
-            ),
-            cirq.Moment(CZPowGate(exponent=0.5).on(a, b)),
-            cirq.Moment(H(b), X(a)),
-            cirq.Moment(H(a), H(b)),
-            cirq.Moment(H(b), X(a)),
-            cirq.Moment(
-                H(b),
-                cirq.PhasedXZGate(axis_phase_exponent=0.5, x_exponent=0.5, z_exponent=-1).on(a),
-            ),
-        ),
+        expected_circuit="""
+a: ───H───X───H───X───Y───@───────X───H───X───PhXZ(a=0.5,x=0.5,z=-1)───
+                          │
+b: ───H───H───H───H───────@^0.5───H───H───H───H────────────────────────
+""",
         schema="XX_PAIR",
     )
 
@@ -658,14 +647,6 @@ def test_with_non_clifford_measurements():
     2: ───H───@───H───@───────M───
                       │
     3: ───────────H───@───H───M───
-    Output:
-    0: ───────────H───@───PhXZ(a=0.5,x=0.5,z=0)───M───
-                      │
-    1: ───H───@───X───@───X───────────────────────M───
-              │
-    2: ───H───@───H───@───I───────────────────────M───
-                      │
-    3: ───────────H───@───H───────────────────────M───
     """
     qubits = cirq.LineQubit.range(4)
     assert_dd(
@@ -677,21 +658,15 @@ def test_with_non_clifford_measurements():
             cirq.Moment([H(qubits[i]) for i in [0, 3]]),
             cirq.Moment([cirq.M(qubits[i]) for i in [0, 1, 2, 3]]),
         ),
-        expected_circuit=cirq.Circuit(
-            cirq.Moment([H(qubits[i]) for i in [1, 2]]),
-            cirq.Moment(CZ(*qubits[1:3])),
-            cirq.Moment([H(qubits[i]) for i in [0, 2, 3]] + [X(qubits[1])]),
-            cirq.Moment(CZ(*qubits[0:2]), CZ(*qubits[2:])),
-            cirq.Moment(
-                H(qubits[3]),
-                cirq.I(qubits[2]),
-                X(qubits[1]),
-                cirq.PhasedXZGate(axis_phase_exponent=0.5, x_exponent=0.5, z_exponent=0).on(
-                    qubits[0]
-                ),
-            ),
-            cirq.Moment([cirq.M(qubits[i]) for i in [0, 1, 2, 3]]),
-        ),
+        expected_circuit="""
+0: ───────────H───@───H───X───M───
+                  │
+1: ───H───@───X───@───X───────M───
+          │
+2: ───H───@───H───@───X───X───M───
+                  │
+3: ───────────H───@───H───────M───
+""",
         schema="XX_PAIR",
         single_qubit_gate_moments_only=True,
     )
@@ -844,11 +819,58 @@ def test_merge_before_non_cliffords():
     assert_dd(
         input_circuit=input_circuit,
         expected_circuit="""
-0: ───X───X───X──────────────────────────────────────────M───
+0: ───X───X───X───────────────────────X──────────────────────X───M───
 
-1: ───X───X───PhXZ(a=-1.25,x=1,z=0)───FSim(0, 0.0637π)───M───
-                                      │
-2: ───X───X───S───────────────────────FSim(0, 0.0637π)───M───
+1: ───X───X───PhXZ(a=-1,x=0,z=-0.5)───Y───FSim(0, 0.0637π)───────M───
+                                          │
+2: ───X───X───S───────────────────────────FSim(0, 0.0637π)───────M───
 """,
         schema="XX_PAIR",
     )
+
+
+@pytest.mark.parametrize(
+    'single_qubit_gate_moments_only, expected_diagram',
+    [
+        (
+            True,
+            # With single_qubit_gate_moments_only=True, the second DD gate on q2
+            # is inserted in a new moment after the CZ gate.
+            """
+0: ───X───X───@───────M───
+              │
+1: ───X───X───@───────M───
+
+2: ───X───X───────X───M───
+""",
+        ),
+        (
+            False,
+            # With single_qubit_gate_moments_only=False, the second DD gate on q2
+            # is inserted in the same moment as the CZ gate.
+            """
+0: ───X───X───@───M───
+              │
+1: ───X───X───@───M───
+
+2: ───X───X───X───M───
+""",
+        ),
+    ],
+)
+def test_single_qubit_gate_moments_only_true_vs_false(
+    single_qubit_gate_moments_only, expected_diagram
+):
+    q0, q1, q2 = cirq.LineQubit.range(3)
+    input_circuit = cirq.Circuit(
+        cirq.Moment([X(q) for q in [q0, q1, q2]]),
+        cirq.Moment([X(q) for q in [q0, q1]]),
+        cirq.Moment(CZ(q0, q1)),
+        cirq.Moment([cirq.M(q) for q in [q0, q1, q2]]),
+    )
+    assert_dd(
+        input_circuit=input_circuit,
+        expected_circuit=expected_diagram,
+        schema="XX_PAIR",
+        single_qubit_gate_moments_only=single_qubit_gate_moments_only,
+    )

{cirq_core-1.7.0.dev20250728175235.dist-info → cirq_core-1.7.0.dev20250801200422.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cirq-core
-Version: 1.7.0.dev20250728175235
+Version: 1.7.0.dev20250801200422
 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.dev20250728175235.dist-info → cirq_core-1.7.0.dev20250801200422.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=I_S1bB_PHLgM_CH4kMZYOu01GZZOGyBco0NSX3TZlr4,1206
-cirq/_version_test.py,sha256=nOFIu0FF_llExC4HIgNmN4Z5yRwyhyojVhwofjo1caA,155
+cirq/_version.py,sha256=ibA6P6gdwCzcYx8w4AaL0dJEeQv4umpZVhJUZkqcig8,1206
+cirq/_version_test.py,sha256=YwxQ2h-MPRHFOrjoqPcmHyoLuTfdMIokuMzX_miqIzo,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
@@ -1071,8 +1071,8 @@ cirq/transformers/drop_empty_moments.py,sha256=uZJG9FpUNyA1Mi0xLDuVuhj_siZhPZ1_s
 cirq/transformers/drop_empty_moments_test.py,sha256=h6Pji0z0o9KOB7fnSHseWpIAhzvxWurF_flg9XWm_YI,1959
 cirq/transformers/drop_negligible_operations.py,sha256=eP2dP_n0BYlr8aZ1wnD8YWsqCtwN0l0O6p45RbXEpfM,2097
 cirq/transformers/drop_negligible_operations_test.py,sha256=32mS4QQ8tiH3wBAAgbUU8LgwWDmvreRVEDZML_kgxyo,3859
-cirq/transformers/dynamical_decoupling.py,sha256=nVYH0vNIflfnB-gp8awMb0xv8lo_FYkeMJNBoBtCUQg,15053
-cirq/transformers/dynamical_decoupling_test.py,sha256=UXYBxc_8lnq-pqMBgj5qhPEXnYv6bccMjiIBtEMTGTQ,44728
+cirq/transformers/dynamical_decoupling.py,sha256=LP0Hrp7XqfVRmSy_wQX85GKPgK1Vy2_HCt8OyySFL2s,13484
+cirq/transformers/dynamical_decoupling_test.py,sha256=wQUCw99ODghLmluox9-3rg-w_A1vEVa96dFmKXWC2m0,45171
 cirq/transformers/eject_phased_paulis.py,sha256=ZeVEh614OihWZtHyaBBtgpWj_dUxQGXDzf4NmBlzbeM,14725
 cirq/transformers/eject_phased_paulis_test.py,sha256=AOMmOq3fWFGm2_qDyocjtF9fK7GAhC0kF550mkjtPx4,15791
 cirq/transformers/eject_z.py,sha256=3u0Q0WGGAxmZuPnyiU4q04gJMnY--0nvhF4eotnSl9k,5803
@@ -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.dev20250728175235.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.7.0.dev20250728175235.dist-info/METADATA,sha256=6JzgwsUb8VKPdZ43YMoxL2EuuhtOxlRkUxSlxL4Qcag,4857
-cirq_core-1.7.0.dev20250728175235.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cirq_core-1.7.0.dev20250728175235.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.7.0.dev20250728175235.dist-info/RECORD,,
+cirq_core-1.7.0.dev20250801200422.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.7.0.dev20250801200422.dist-info/METADATA,sha256=KgX6fyUEzYknpgDtCLaNMgyYiAWbJSbJmFCqaVBVBkw,4857
+cirq_core-1.7.0.dev20250801200422.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cirq_core-1.7.0.dev20250801200422.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.7.0.dev20250801200422.dist-info/RECORD,,