cirq-core 1.6.0.dev20250623211210__py3-none-any.whl → 1.6.0.dev20250624211923__py3-none-any.whl

cirq/__init__.py

@@ -380,6 +380,7 @@ from cirq.transformers import (
     merge_operations_to_circuit_op as merge_operations_to_circuit_op,
     merge_single_qubit_gates_to_phased_x_and_z as merge_single_qubit_gates_to_phased_x_and_z,
     merge_single_qubit_gates_to_phxz as merge_single_qubit_gates_to_phxz,
+    merge_single_qubit_gates_to_phxz_symbolized as merge_single_qubit_gates_to_phxz_symbolized,
     merge_single_qubit_moments_to_phxz as merge_single_qubit_moments_to_phxz,
     optimize_for_target_gateset as optimize_for_target_gateset,
     parameterized_2q_op_to_sqrt_iswap_operations as parameterized_2q_op_to_sqrt_iswap_operations,

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.dev20250623211210"
+__version__ = "1.6.0.dev20250624211923"

cirq/_version_test.py

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

cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation.py

@@ -28,7 +28,9 @@ from cirq.contrib.shuffle_circuits import run_shuffled_with_readout_benchmarking
 from cirq.experiments.readout_confusion_matrix import TensoredConfusionMatrices
 
 if TYPE_CHECKING:
-    from cirq.experiments import SingleQubitReadoutCalibrationResult
+    from cirq.experiments.single_qubit_readout_calibration import (
+        SingleQubitReadoutCalibrationResult,
+    )
     from cirq.study import ResultDict
 
 
@@ -217,6 +219,11 @@ def _normalize_input_paulis(
     return cast(dict[circuits.FrozenCircuit, list[list[ops.PauliString]]], circuits_to_pauli)
 
 
+def _extract_readout_qubits(pauli_strings: list[ops.PauliString]) -> list[ops.Qid]:
+    """Extracts unique qubits from a list of QWC Pauli strings."""
+    return sorted(set(q for ps in pauli_strings for q in ps.qubits))
+
+
 def _pauli_strings_to_basis_change_ops(
     pauli_strings: list[ops.PauliString], qid_list: list[ops.Qid]
 ):
@@ -315,16 +322,38 @@ def _process_pauli_measurement_results(
     for pauli_group_index, circuit_result in enumerate(circuit_results):
         measurement_results = circuit_result.measurements["m"]
         pauli_strs = pauli_string_groups[pauli_group_index]
+        pauli_readout_qubits = _extract_readout_qubits(pauli_strs)
+
+        calibration_result = (
+            calibration_results[tuple(pauli_readout_qubits)]
+            if disable_readout_mitigation is False
+            else None
+        )
 
         for pauli_str in pauli_strs:
             qubits_sorted = sorted(pauli_str.qubits)
             qubit_indices = [qubits.index(q) for q in qubits_sorted]
 
-            confusion_matrices = (
-                _build_many_one_qubits_confusion_matrix(calibration_results[tuple(qubits_sorted)])
-                if disable_readout_mitigation is False
-                else _build_many_one_qubits_empty_confusion_matrix(len(qubits_sorted))
-            )
+            if disable_readout_mitigation:
+                pauli_str_calibration_result = None
+                confusion_matrices = _build_many_one_qubits_empty_confusion_matrix(
+                    len(qubits_sorted)
+                )
+            else:
+                if calibration_result is None:
+                    # This case should be logically impossible if mitigation is on,
+                    # so we raise an error.
+                    raise ValueError(
+                        f"Readout mitigation is enabled, but no calibration result was "
+                        f"found for qubits {pauli_readout_qubits}."
+                    )
+                pauli_str_calibration_result = calibration_result.readout_result_for_qubits(
+                    qubits_sorted
+                )
+                confusion_matrices = _build_many_one_qubits_confusion_matrix(
+                    pauli_str_calibration_result
+                )
+
             tensored_cm = TensoredConfusionMatrices(
                 confusion_matrices,
                 [[q] for q in qubits_sorted],
@@ -356,11 +385,7 @@ def _process_pauli_measurement_results(
                     mitigated_stddev=d_m_with_coefficient,
                     unmitigated_expectation=unmitigated_value_with_coefficient,
                     unmitigated_stddev=d_unmit_with_coefficient,
-                    calibration_result=(
-                        calibration_results[tuple(qubits_sorted)]
-                        if disable_readout_mitigation is False
-                        else None
-                    ),
+                    calibration_result=pauli_str_calibration_result,
                 )
             )
 
@@ -428,8 +453,7 @@ def measure_pauli_strings(
     unique_qubit_tuples = set()
     for pauli_string_groups in normalized_circuits_to_pauli.values():
         for pauli_strings in pauli_string_groups:
-            for pauli_string in pauli_strings:
-                unique_qubit_tuples.add(tuple(sorted(pauli_string.qubits)))
+            unique_qubit_tuples.add(tuple(_extract_readout_qubits(pauli_strings)))
     # qubits_list is a list of qubit tuples
     qubits_list = sorted(unique_qubit_tuples)
 

cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation_test.py

@@ -23,7 +23,10 @@ import pytest
 
 import cirq
 from cirq.contrib.paulistring import measure_pauli_strings
-from cirq.experiments import SingleQubitReadoutCalibrationResult
+from cirq.contrib.paulistring.pauli_string_measurement_with_readout_mitigation import (
+    _process_pauli_measurement_results,
+)
+from cirq.experiments.single_qubit_readout_calibration import SingleQubitReadoutCalibrationResult
 from cirq.experiments.single_qubit_readout_calibration_test import NoisySingleQubitReadoutSampler
 
 
@@ -867,3 +870,37 @@ def test_group_paulis_type_mismatch() -> None:
         measure_pauli_strings(
             circuits_to_pauli, cirq.Simulator(), 1000, 1000, 1000, np.random.default_rng()
         )
+
+
+def test_process_pauli_measurement_results_raises_error_on_missing_calibration() -> None:
+    """Test that the function raises an error if the calibration result is missing."""
+    qubits: list[cirq.Qid] = [q for q in cirq.LineQubit.range(5)]
+
+    measurement_op = cirq.measure(*qubits, key='m')
+    test_circuits = list[cirq.Circuit]()
+    for _ in range(3):
+        circuit_list = []
+
+        circuit = _create_ghz(5, qubits) + measurement_op
+        circuit_list.append(circuit)
+    test_circuits.extend(circuit_list)
+
+    pauli_strings = [_generate_random_pauli_string(qubits, True) for _ in range(3)]
+    sampler = cirq.Simulator()
+
+    circuit_results = sampler.run_batch(test_circuits, repetitions=1000)
+
+    empty_calibration_result_dict = {tuple(qubits): None}
+
+    with pytest.raises(
+        ValueError,
+        match="Readout mitigation is enabled, but no calibration result was found for qubits",
+    ):
+        _process_pauli_measurement_results(
+            qubits,
+            [pauli_strings],
+            circuit_results[0],  # type: ignore[arg-type]
+            empty_calibration_result_dict,  # type: ignore[arg-type]
+            1000,
+            1.0,
+        )

cirq/experiments/single_qubit_readout_calibration.py

@@ -179,6 +179,17 @@ class SingleQubitReadoutCalibrationResult:
         ax.set_ylabel('Percentile')
         return ax
 
+    def readout_result_for_qubits(
+        self, readout_qubits: list[ops.Qid]
+    ) -> SingleQubitReadoutCalibrationResult:
+        """Builds a calibration result for the specific readout qubits."""
+        return SingleQubitReadoutCalibrationResult(
+            zero_state_errors={qubit: self.zero_state_errors[qubit] for qubit in readout_qubits},
+            one_state_errors={qubit: self.one_state_errors[qubit] for qubit in readout_qubits},
+            timestamp=self.timestamp,
+            repetitions=self.repetitions,
+        )
+
     @classmethod
     def _from_json_dict_(
         cls, zero_state_errors, one_state_errors, repetitions, timestamp, **kwargs

cirq/transformers/__init__.py

@@ -100,6 +100,7 @@ from cirq.transformers.merge_single_qubit_gates import (
     merge_single_qubit_gates_to_phased_x_and_z as merge_single_qubit_gates_to_phased_x_and_z,
     merge_single_qubit_gates_to_phxz as merge_single_qubit_gates_to_phxz,
     merge_single_qubit_moments_to_phxz as merge_single_qubit_moments_to_phxz,
+    merge_single_qubit_gates_to_phxz_symbolized as merge_single_qubit_gates_to_phxz_symbolized,
 )
 
 from cirq.transformers.qubit_management_transformers import (

cirq/transformers/merge_single_qubit_gates.py

@@ -16,13 +16,24 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import Callable, cast, Hashable, TYPE_CHECKING
 
 from cirq import circuits, ops, protocols
-from cirq.transformers import merge_k_qubit_gates, transformer_api, transformer_primitives
+from cirq.study.resolver import ParamResolver
+from cirq.study.sweeps import dict_to_zip_sweep, ListSweep, ProductOrZipSweepLike, Sweep, Zip
+from cirq.transformers import (
+    align,
+    merge_k_qubit_gates,
+    symbolize,
+    tag_transformers,
+    transformer_api,
+    transformer_primitives,
+)
 from cirq.transformers.analytical_decompositions import single_qubit_decompositions
 
 if TYPE_CHECKING:
+    import sympy
+
     import cirq
 
 
@@ -67,6 +78,7 @@ def merge_single_qubit_gates_to_phxz(
     circuit: cirq.AbstractCircuit,
     *,
     context: cirq.TransformerContext | None = None,
+    merge_tags_fn: Callable[[cirq.CircuitOperation], list[Hashable]] | None = None,
     atol: float = 1e-8,
 ) -> cirq.Circuit:
     """Replaces runs of single qubit rotations with a single optional `cirq.PhasedXZGate`.
@@ -77,6 +89,7 @@ def merge_single_qubit_gates_to_phxz(
     Args:
         circuit: Input circuit to transform. It will not be modified.
         context: `cirq.TransformerContext` storing common configurable options for transformers.
+        merge_tags_fn: A callable returns the tags to be added to the merged operation.
         atol: Absolute tolerance to angle error. Larger values allow more negligible gates to be
             dropped, smaller values increase accuracy.
 
@@ -84,12 +97,13 @@ def merge_single_qubit_gates_to_phxz(
         Copy of the transformed input circuit.
     """
 
-    def rewriter(op: cirq.CircuitOperation) -> cirq.OP_TREE:
-        u = protocols.unitary(op)
-        if protocols.num_qubits(op) == 0:
+    def rewriter(circuit_op: cirq.CircuitOperation) -> cirq.OP_TREE:
+        u = protocols.unitary(circuit_op)
+        if protocols.num_qubits(circuit_op) == 0:
             return ops.GlobalPhaseGate(u[0, 0]).on()
-        gate = single_qubit_decompositions.single_qubit_matrix_to_phxz(u, atol)
-        return gate(op.qubits[0]) if gate else []
+        gate = single_qubit_decompositions.single_qubit_matrix_to_phxz(u, atol) or ops.I
+        phxz_op = gate.on(circuit_op.qubits[0])
+        return phxz_op.with_tags(*merge_tags_fn(circuit_op)) if merge_tags_fn else phxz_op
 
     return merge_k_qubit_gates.merge_k_qubit_unitaries(
         circuit, k=1, context=context, rewriter=rewriter
@@ -158,3 +172,160 @@ def merge_single_qubit_moments_to_phxz(
         deep=context.deep if context else False,
         tags_to_ignore=tuple(tags_to_ignore),
     ).unfreeze(copy=False)
+
+
+def _sweep_on_symbols(sweep: Sweep, symbols: set[sympy.Symbol]) -> Sweep:
+    new_resolvers: list[cirq.ParamResolver] = []
+    for resolver in sweep:
+        param_dict: cirq.ParamMappingType = {s: resolver.value_of(s) for s in symbols}
+        new_resolvers.append(ParamResolver(param_dict))
+    return ListSweep(new_resolvers)
+
+
+def _calc_phxz_sweeps(
+    symbolized_circuit: cirq.Circuit, resolved_circuits: list[cirq.Circuit]
+) -> Sweep:
+    """Return the phxz sweep of the symbolized_circuit on resolved_circuits.
+
+    Raises:
+        ValueError: Structural mismatch: A `resolved_circuit` contains an unexpected gate type.
+            Expected a `PhasedXZGate` or `IdentityGate` at a position corresponding to a
+            symbolic `PhasedXZGate` in the `symbolized_circuit`.
+    """
+
+    def _extract_axz(op: ops.Operation | None) -> tuple[float, float, float]:
+        if not op or not op.gate or not isinstance(op.gate, ops.IdentityGate | ops.PhasedXZGate):
+            raise ValueError(f"Expect a PhasedXZGate or IdentityGate on op {op}.")
+        if isinstance(op.gate, ops.IdentityGate):
+            return 0.0, 0.0, 0.0  # Identity gate's a, x, z in PhasedXZ
+        return op.gate.axis_phase_exponent, op.gate.x_exponent, op.gate.z_exponent
+
+    values_by_params: dict[sympy.Symbol, tuple[float, ...]] = {}
+    for mid, moment in enumerate(symbolized_circuit):
+        for op in moment.operations:
+            if op.gate and isinstance(op.gate, ops.PhasedXZGate) and protocols.is_parameterized(op):
+                sa, sx, sz = op.gate.axis_phase_exponent, op.gate.x_exponent, op.gate.z_exponent
+                values_by_params[sa], values_by_params[sx], values_by_params[sz] = zip(
+                    *[_extract_axz(c[mid].operation_at(op.qubits[0])) for c in resolved_circuits]
+                )
+
+    return dict_to_zip_sweep(cast(ProductOrZipSweepLike, values_by_params))
+
+
+def merge_single_qubit_gates_to_phxz_symbolized(
+    circuit: cirq.AbstractCircuit,
+    *,
+    context: cirq.TransformerContext | None = None,
+    sweep: Sweep,
+    atol: float = 1e-8,
+) -> tuple[cirq.Circuit, Sweep]:
+    """Merges consecutive single qubit gates as PhasedXZ Gates. Symbolizes if any of
+      the consecutive gates is symbolized.
+
+    Example:
+        >>> q0, q1 = cirq.LineQubit.range(2)
+        >>> c = cirq.Circuit(\
+                    cirq.X(q0),\
+                    cirq.CZ(q0,q1)**sympy.Symbol("cz_exp"),\
+                    cirq.Y(q0)**sympy.Symbol("y_exp"),\
+                    cirq.X(q0))
+        >>> print(c)
+        0: ───X───@──────────Y^y_exp───X───
+                  │
+        1: ───────@^cz_exp─────────────────
+        >>> new_circuit, new_sweep = cirq.merge_single_qubit_gates_to_phxz_symbolized(\
+                c, sweep=cirq.Zip(cirq.Points(key="cz_exp", points=[0, 1]),\
+                                  cirq.Points(key="y_exp",  points=[0, 1])))
+        >>> print(new_circuit)
+        0: ───PhXZ(a=-1,x=1,z=0)───@──────────PhXZ(a=a0,x=x0,z=z0)───
+                                   │
+        1: ────────────────────────@^cz_exp──────────────────────────
+        >>> assert new_sweep[0] == cirq.ParamResolver({'a0': -1, 'x0': 1, 'z0': 0, 'cz_exp': 0})
+        >>> assert new_sweep[1] == cirq.ParamResolver({'a0': -0.5, 'x0': 0, 'z0': -1, 'cz_exp': 1})
+
+    Args:
+        circuit: Input circuit to transform. It will not be modified.
+        context: `cirq.TransformerContext` storing common configurable options for transformers.
+        sweep: Sweep of the symbols in the input circuit, updated Sweep will be returned
+            based on the transformation.
+        atol: Absolute tolerance to angle error. Larger values allow more negligible gates to be
+            dropped, smaller values increase accuracy.
+
+    Returns:
+        Copy of the transformed input circuit.
+    """
+    deep = context.deep if context else False
+
+    # Tag symbolized single-qubit op.
+    symbolized_single_tag = "_tmp_symbolize_tag"
+
+    circuit_tagged = transformer_primitives.map_operations(
+        circuit,
+        lambda op, _: (
+            op.with_tags(symbolized_single_tag)
+            if protocols.is_parameterized(op) and len(op.qubits) == 1
+            else op
+        ),
+        deep=deep,
+    )
+
+    # Step 0, isolate single qubit symbols and resolve the circuit on them.
+    single_qubit_gate_symbols: set[sympy.Symbol] = set().union(
+        *[
+            protocols.parameter_symbols(op) if symbolized_single_tag in op.tags else set()
+            for op in circuit_tagged.all_operations()
+        ]
+    )
+    # Remaining symbols, e.g., 2 qubit gates' symbols. Sweep of those symbols keeps unchanged.
+    remaining_symbols: set[sympy.Symbol] = set(
+        protocols.parameter_symbols(circuit) - single_qubit_gate_symbols
+    )
+    # If all single qubit gates are not parameterized, call the nonparamerized version of
+    # the transformer.
+    if not single_qubit_gate_symbols:
+        return (merge_single_qubit_gates_to_phxz(circuit, context=context, atol=atol), sweep)
+    sweep_of_single: Sweep = _sweep_on_symbols(sweep, single_qubit_gate_symbols)
+    # Get all resolved circuits from all sets of resolvers in sweep_of_single.
+    resolved_circuits = [
+        protocols.resolve_parameters(circuit_tagged, resolver) for resolver in sweep_of_single
+    ]
+
+    # Step 1, merge single qubit gates per resolved circuit, preserving
+    #  the symbolized_single_tag to indicate the operator is a merged one.
+    merged_circuits: list[cirq.Circuit] = [
+        merge_single_qubit_gates_to_phxz(
+            c,
+            context=context,
+            merge_tags_fn=lambda circuit_op: (
+                [symbolized_single_tag]
+                if any(
+                    symbolized_single_tag in set(op.tags)
+                    for op in circuit_op.circuit.all_operations()
+                )
+                else []
+            ),
+            atol=atol,
+        )
+        for c in resolved_circuits
+    ]
+
+    # Step 2, get the new symbolized circuit by symbolizing on indexed symbolized_single_tag.
+    new_circuit = tag_transformers.remove_tags(  # remove the temp tags used to track merges
+        symbolize.symbolize_single_qubit_gates_by_indexed_tags(
+            tag_transformers.index_tags(  # index all 1-qubit-ops merged from ops with symbols
+                merged_circuits[0],
+                context=transformer_api.TransformerContext(deep=deep),
+                target_tags={symbolized_single_tag},
+            ),
+            symbolize_tag=symbolize.SymbolizeTag(prefix=symbolized_single_tag),
+        ),
+        remove_if=lambda tag: str(tag).startswith(symbolized_single_tag),
+    )
+
+    # Step 3, get N sets of parameterizations as new_sweep.
+    new_sweep = Zip(
+        _calc_phxz_sweeps(new_circuit, merged_circuits),  # phxz sweeps
+        _sweep_on_symbols(sweep, remaining_symbols),  # remaining sweeps
+    )
+
+    return align.align_right(new_circuit), new_sweep

cirq/transformers/merge_single_qubit_gates_test.py

@@ -12,7 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import annotations
+from unittest import TestCase
+from unittest.mock import Mock, patch
+
+import pytest
+import sympy
 
 import cirq
 
@@ -81,7 +85,7 @@ def test_merge_single_qubit_gates_to_phased_x_and_z_deep():
     cirq.testing.assert_same_circuits(c_new, c_expected)
 
 
-def _phxz(a: float, x: float, z: float):
+def _phxz(a: float | sympy.Symbol, x: float | sympy.Symbol, z: float | sympy.Symbol):
     return cirq.PhasedXZGate(axis_phase_exponent=a, x_exponent=x, z_exponent=z)
 
 
@@ -233,6 +237,142 @@ def test_merge_single_qubit_gates_to_phased_x_and_z_global_phase():
     assert c == c2
 
 
+class TestMergeSingleQubitGatesSymbolized(TestCase):
+    """Test suite for merge_single_qubit_gates_to_phxz_symbolized."""
+
+    def test_case1(self):
+        """Test case diagram.
+        Input circuit:
+        0: ───X─────────@────────H[ignore]─H──X──PhXZ(a=a0,x=x0,z=z0)──X──PhXZ(a=a1,x=x1,z=z1)───
+                        │
+        1: ───H^h_exp───@^cz_exp─────────────────────────────────────────────────────────────────
+        Expected output:
+        0: ───PhXZ(a=-1,x=1,z=0)─────@──────────H[ignore]───PhXZ(a=a1,x=x1,z=z1)───
+                                     │
+        1: ───PhXZ(a=a0,x=x0,z=z0)───@^cz_exp──────────────────────────────────────
+        """
+        a, b = cirq.LineQubit.range(2)
+        sa0, sa1 = [sympy.Symbol(a) for a in ["a0", "a1"]]
+        sx0, sx1 = [sympy.Symbol(x) for x in ["x0", "x1"]]
+        sz0, sz1 = [sympy.Symbol(z) for z in ["z0", "z1"]]
+        input_circuit = cirq.Circuit(
+            cirq.Moment(cirq.X(a), cirq.H(b) ** sympy.Symbol("h_exp")),
+            cirq.Moment(cirq.CZ(a, b) ** sympy.Symbol("cz_exp")),
+            cirq.Moment(cirq.H(a).with_tags("ignore")),
+            cirq.Moment(cirq.H(a)),
+            cirq.Moment(cirq.X(a)),
+            cirq.Moment(_phxz(sa0, sx0, sz0).on(a)),
+            cirq.Moment(cirq.X(a)),
+            cirq.Moment(_phxz(sa1, sx1, sz1).on(a)),
+        )
+        context = cirq.TransformerContext(tags_to_ignore=["ignore"])
+        sweep = cirq.Zip(
+            cirq.Points(key="h_exp", points=[0, 1]),
+            cirq.Points(key="cz_exp", points=[0, 1]),
+            cirq.Points(key="a0", points=[0, 1]),
+            cirq.Points(key="x0", points=[0, 1]),
+            cirq.Points(key="z0", points=[0, 1]),
+            cirq.Points(key="a1", points=[0, 1]),
+            cirq.Points(key="x1", points=[0, 1]),
+            cirq.Points(key="z1", points=[0, 1]),
+        )
+        output_circuit, new_sweep = cirq.merge_single_qubit_gates_to_phxz_symbolized(
+            input_circuit, context=context, sweep=sweep
+        )
+        expected = cirq.Circuit(
+            cirq.Moment(_phxz(-1, 1, 0).on(a), _phxz(sa0, sx0, sz0).on(b)),
+            cirq.Moment(cirq.CZ(a, b) ** sympy.Symbol("cz_exp")),
+            cirq.Moment(cirq.H(a).with_tags("ignore")),
+            cirq.Moment(_phxz(sa1, sx1, sz1).on(a)),
+        )
+        assert_optimizes(output_circuit, expected)
+
+        # Check the unitaries are preserved for each set of sweep paramerization.
+        for old_resolver, new_resolver in zip(sweep, new_sweep):
+            cirq.testing.assert_circuits_have_same_unitary_given_final_permutation(
+                cirq.resolve_parameters(input_circuit, old_resolver),
+                cirq.resolve_parameters(output_circuit, new_resolver),
+                {q: q for q in input_circuit.all_qubits()},
+            )
+
+    def test_with_gauge_compiling_as_sweep_success(self):
+        qubits = cirq.LineQubit.range(7)
+        c = cirq.Circuit(
+            cirq.Moment(cirq.H(qubits[0]), cirq.H(qubits[3])),
+            cirq.Moment(cirq.CZ(qubits[0], qubits[2]), cirq.CZ(qubits[3], qubits[5])),
+            cirq.Moment(cirq.CZ(qubits[0], qubits[1]), cirq.CZ(qubits[3], qubits[4])),
+            cirq.Moment(cirq.CZ(qubits[1], qubits[3]), cirq.CZ(qubits[4], qubits[6])),
+            cirq.Moment(cirq.M(*qubits, key='m')),
+        )
+        old_circuit, old_sweep = cirq.transformers.gauge_compiling.CZGaugeTransformer.as_sweep(
+            c, N=50
+        )
+        new_circuit, new_sweep = cirq.merge_single_qubit_gates_to_phxz_symbolized(
+            old_circuit, sweep=old_sweep
+        )
+        # Check the unitaries are preserved for each set of sweep paramerization.
+        for old_resolver, new_resolver in zip(old_sweep, new_sweep):
+            cirq.testing.assert_circuits_have_same_unitary_given_final_permutation(
+                cirq.resolve_parameters(old_circuit[0:-1], old_resolver),
+                cirq.resolve_parameters(new_circuit[0:-1], new_resolver),
+                {q: q for q in qubits},
+            )
+
+    def test_case_non_parameterized_singles(self):
+        """Test merge_single_qubit_gates_to_phxz_symbolized when all single qubit gates are not
+        parameterized."""
+
+        a, b = cirq.LineQubit.range(2)
+        input_circuit = cirq.Circuit(cirq.H(a), cirq.H(a), cirq.CZ(a, b) ** sympy.Symbol("exp"))
+        expected_circuit = cirq.merge_single_qubit_gates_to_phxz(input_circuit)
+        output_circuit, _ = cirq.merge_single_qubit_gates_to_phxz_symbolized(
+            input_circuit, sweep=cirq.Points(key="exp", points=[0.1, 0.2, 0.5])
+        )
+        assert_optimizes(output_circuit, expected_circuit)
+
+    def test_fail_different_structures_error(self):
+        """Tests that the function raises a ValueError if merged structures of the circuit differ
+        for different parameterizations."""
+        q0, q1 = cirq.LineQubit.range(2)
+        circuit = cirq.Circuit(cirq.H(q0) ** sympy.Symbol("exp"))
+        sweep = cirq.Points(key="exp", points=[0.1, 0.2])
+
+        with patch(
+            "cirq.protocols.resolve_parameters",
+            side_effect=[  # Mock the return values of resolve_parameters
+                cirq.Circuit(cirq.I(q0).with_tags("_tmp_symbolize_tag")),
+                cirq.Circuit(cirq.CZ(q0, q1)),
+            ],
+        ):
+            with pytest.raises(ValueError, match="Expect a PhasedXZGate or IdentityGate.*"):
+                cirq.merge_single_qubit_gates_to_phxz_symbolized(circuit, sweep=sweep)
+
+    def test_fail_unexpected_gate_error(self):
+        """Tests that the function raises a RuntimeError of unexpected gate."""
+        a, b = cirq.LineQubit.range(2)
+        circuit = cirq.Circuit(
+            cirq.H(a) ** sympy.Symbol("exp1"),
+            cirq.X(a),
+            cirq.CZ(a, b),
+            cirq.Y(a),
+            cirq.H(a) ** sympy.Symbol("exp2"),
+        )
+        sweep = cirq.Points(key="exp1", points=[0.1, 0.2]) * cirq.Points(
+            key="exp2", points=[0.1, 0.2]
+        )
+
+        mock_iter = Mock()
+        mock_iter.__next__ = Mock(return_value=2)
+
+        with patch(
+            "cirq.transformers.analytical_decompositions"
+            ".single_qubit_decompositions.single_qubit_matrix_to_phxz",
+            return_value=cirq.H,
+        ):
+            with pytest.raises(ValueError, match="Expect a PhasedXZGate or IdentityGate.*"):
+                cirq.merge_single_qubit_gates_to_phxz_symbolized(circuit, sweep=sweep)
+
+
 def test_merge_single_qubit_moments_to_phxz_with_global_phase_in_first_moment():
     q0 = cirq.LineQubit(0)
     c_orig = cirq.Circuit(

{cirq_core-1.6.0.dev20250623211210.dist-info → cirq_core-1.6.0.dev20250624211923.dist-info}/METADATA

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

@@ -1,11 +1,11 @@
-cirq/__init__.py,sha256=wyFgv68HcbpDyWoZb4fuX2rVvK1N_ZolWosyoktPyXs,28219
+cirq/__init__.py,sha256=n670ZaGq1Yuj88GYz87JeuXoFH91-FZLH7RbJ2-vAho,28315
 cirq/_compat.py,sha256=BCAAJx19-5UXHv3HpCzewinx-b9eDs_C1GHPXPfKLIY,29478
 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=G90gnyEVX9JtDLcpB4PPEGwM3AoV34GHtuCPBs-1o_M,1206
-cirq/_version_test.py,sha256=meBCITA69x1ZUiBJi5gdRAf3wVjZQh2Fc51TH0ldfgo,155
+cirq/_version.py,sha256=beAG5kxHUOa0_7Sv3GQyzdxwJVncHrXB1gsYHaYzHr8,1206
+cirq/_version_test.py,sha256=8GL4xyx-wxFn7dLr_3cgE_87WnnBlE4CHyc16tLcZ-I,155
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=hYyG53VJeV61X0oukK5ndZYega8lkL2FyaL1m0j6h5M,13556
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -96,8 +96,8 @@ cirq/contrib/paulistring/optimize.py,sha256=F02c_9nuc8a41XNsA9bzTGaW2kR3hZw-MdaQ
 cirq/contrib/paulistring/optimize_test.py,sha256=FsmwyYFIGyyiO115oYgmCfaSV3De55Azd0_rzsi_xnU,3618
 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=Tz69rtet_u69CpOxERkGjaC0Ty13OTd6THP8tl097No,20057
-cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation_test.py,sha256=fo-bNK2T-f8eTfIaPh_2sszYg-v-Epn0EBOEoC8QcCk,35495
+cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation.py,sha256=tjN3R_aq5xwixlO8pCHaiWX4LsXXJHQxAEZgUHSgQac,21021
+cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation_test.py,sha256=PLFPOfhoIepk-UhgEBcfvFnFtd0qpqLSPtvrcCaKpd0,36842
 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
@@ -193,7 +193,7 @@ cirq/experiments/random_quantum_circuit_generation.py,sha256=pV6ubukLLdfPXLvJD2t
 cirq/experiments/random_quantum_circuit_generation_test.py,sha256=4GSfUK2hw2r90JAO7R2zSBqjtwWi8vXuAhw-iK6quwY,16512
 cirq/experiments/readout_confusion_matrix.py,sha256=ro3miCMr8K-EDW918PHKL_QcqrDUT-_uTXUvJ1PPzEI,20666
 cirq/experiments/readout_confusion_matrix_test.py,sha256=DNapm_kLa0Mn9vW_KejWKrmM4yqJ8Q-7gqxNjFkOFQU,10668
-cirq/experiments/single_qubit_readout_calibration.py,sha256=-sC8QhSxRWQnPcdwserzDa7E0VyrUzwGdmGaPcNumQw,14706
+cirq/experiments/single_qubit_readout_calibration.py,sha256=0vnmKBtcjS8kCbJj_iJ0BWW23W6UCc4X2Ig9N_UUs0s,15243
 cirq/experiments/single_qubit_readout_calibration_test.py,sha256=HQE29SxyL2mUhvNZnV9F_vOaAIJteox7volmDfZQy8g,7751
 cirq/experiments/t1_decay_experiment.py,sha256=ojtmkQ5mgiQ-cK389YrvlRXotzHon83HNG_8sae-JdE,7099
 cirq/experiments/t1_decay_experiment_test.py,sha256=vjm-zV0a2yrFrFhzq03GOMBy5U_XnvX1Ga3NN4FiT3k,9262
@@ -1050,7 +1050,7 @@ cirq/testing/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 cirq/testing/test_data/test_module_missing_json_test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cirq/testing/test_data/test_module_missing_testspec/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cirq/testing/test_data/test_module_missing_testspec/json_test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cirq/transformers/__init__.py,sha256=uBx8lSOJSlY2m5QeOTr0E6HaMaqTRwTUu1binpXyaow,7189
+cirq/transformers/__init__.py,sha256=B4ijV7PR4bN_QBswNqpAehIWTjXuaRMeyccrWz4Gw4w,7285
 cirq/transformers/align.py,sha256=2uLjN5B4wNC661IGbwG5NKb-GSAW93pFCtPxuJkc6fs,3339
 cirq/transformers/align_test.py,sha256=X4ysJuemqqOeKix2rO9SlwF4CBQzEYbgiqgZmlMxbsQ,7722
 cirq/transformers/drop_empty_moments.py,sha256=uZJG9FpUNyA1Mi0xLDuVuhj_siZhPZ1_s08Ry9xQ-1M,1535
@@ -1071,8 +1071,8 @@ cirq/transformers/measurement_transformers.py,sha256=crAYKGK90drr_3GEh5t8-Z87eSE
 cirq/transformers/measurement_transformers_test.py,sha256=mJKYFqqMwZnD8KXVM1tmF2kcIZXkkZKlfOU9XbGxYpQ,29019
 cirq/transformers/merge_k_qubit_gates.py,sha256=v9vY3f52S9QR7D_Om4APSZ65rwJH6Z7g6Gf3pD_9H3I,4380
 cirq/transformers/merge_k_qubit_gates_test.py,sha256=523FmfCC7mGX_zecGaQ2tgdqBvMGiMinwJMIfKBgG8E,14016
-cirq/transformers/merge_single_qubit_gates.py,sha256=86qjW19JTC5t38TdnTKtS-M8AG2tYUxSZ9w_tM59BsU,5968
-cirq/transformers/merge_single_qubit_gates_test.py,sha256=hj0iTOZVgsMxY8dQJl8EYvuCDICqzzs9Yw62p5Emsrk,11213
+cirq/transformers/merge_single_qubit_gates.py,sha256=jQsO2mTagm4nmLoD0rk-FP4un80D3RJtxBBgAVTyQYg,13664
+cirq/transformers/merge_single_qubit_gates_test.py,sha256=48U_X4fWZ3BZiFI14kZL6T9TPaHSwfVIPrQWnnTABl0,18076
 cirq/transformers/noise_adding.py,sha256=ZBS-015Kc-BnoO-lMXfEGpCXbPu4whVgTXIB-E16ApQ,4476
 cirq/transformers/noise_adding_test.py,sha256=nHOoKUPBBOkWF6A_JhIO6-G0AuFkLKBCxH7e2BOem9M,2171
 cirq/transformers/optimize_for_target_gateset.py,sha256=QThizLtkzvZpUK-LG77ixuZXghDyWGNn6yHkNrzYR3o,7206
@@ -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.dev20250623211210.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.6.0.dev20250623211210.dist-info/METADATA,sha256=IruqpMesSLFKFDyo852-MHqtEd37-Jb2hQtTV1lQgv4,4857
-cirq_core-1.6.0.dev20250623211210.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cirq_core-1.6.0.dev20250623211210.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.6.0.dev20250623211210.dist-info/RECORD,,
+cirq_core-1.6.0.dev20250624211923.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.6.0.dev20250624211923.dist-info/METADATA,sha256=NIRYeYXD3SaMZFqrF4GLXyXVGD4PwQmQKBAUa5yHVno,4857
+cirq_core-1.6.0.dev20250624211923.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cirq_core-1.6.0.dev20250624211923.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.6.0.dev20250624211923.dist-info/RECORD,,