cirq-core 1.7.0.dev20250825174419__py3-none-any.whl → 1.7.0.dev20251203004401__py3-none-any.whl

cirq/sim/density_matrix_utils.py

@@ -16,7 +16,8 @@
 
 from __future__ import annotations
 
-from typing import Sequence, TYPE_CHECKING
+from collections.abc import Sequence
+from typing import TYPE_CHECKING
 
 import numpy as np
 

cirq/sim/density_matrix_utils_test.py

@@ -216,7 +216,7 @@ def test_measure_density_matrix_partial_indices_all_orders() -> None:
             assert bits == [bool(1 & (x >> (2 - p))) for p in perm]
 
 
-def matrix_000_plus_010():
+def matrix_000_plus_010() -> np.ndarray:
     state = np.zeros(8, dtype=np.complex64)
     state[0] = 1 / np.sqrt(2)
     state[2] = 1j / np.sqrt(2)

cirq/sim/mux.py

@@ -19,12 +19,14 @@ Filename is a reference to multiplexing.
 
 from __future__ import annotations
 
-from typing import Sequence, TYPE_CHECKING
+from collections.abc import Sequence
+from typing import TYPE_CHECKING
 
 import numpy as np
 
 from cirq import circuits, devices, ops, protocols, study, value
 from cirq._doc import document
+from cirq.linalg import transformations
 from cirq.sim import density_matrix_simulator, sparse_simulator
 from cirq.sim.clifford import clifford_simulator
 from cirq.transformers import measurement_transformers
@@ -291,16 +293,41 @@ def final_density_matrix(
         return sparse_result.density_matrix_of()
     else:
         # noisy case: use DensityMatrixSimulator with dephasing
+        has_classical_control = circuit_like != measurement_transformers.defer_measurements(
+            circuit_like
+        )
+        handling_classical_control = ignore_measurement_results and has_classical_control
+
+        if handling_classical_control:
+            # case 1: classical control
+            noise_applied = circuit_like.with_noise(noise) if noise is not None else circuit_like
+            defered = measurement_transformers.defer_measurements(noise_applied)
+            dephased = measurement_transformers.dephase_measurements(defered)
+            program = dephased
+        elif ignore_measurement_results:
+            # case 2: no classical control, only terminal measurement
+            program = measurement_transformers.dephase_measurements(circuit_like)
+        else:
+            # case 3: no measurement
+            program = circuit_like
+
         density_result = density_matrix_simulator.DensityMatrixSimulator(
-            dtype=dtype, noise=noise, seed=seed
+            dtype=dtype, noise=None if handling_classical_control else noise, seed=seed
         ).simulate(
-            program=(
-                measurement_transformers.dephase_measurements(circuit_like)
-                if ignore_measurement_results
-                else circuit_like
-            ),
+            program,
             initial_state=initial_state,
             qubit_order=qubit_order,
             param_resolver=param_resolver,
         )
-        return density_result.final_density_matrix
+        result = density_result.final_density_matrix
+
+        if handling_classical_control:
+            # assuming that the ancilla qubits from the transformations are at the end
+            keep = list(range(protocols.num_qubits(circuit_like)))
+            dephased_qid_shape = protocols.qid_shape(dephased)
+            tensor_form = np.reshape(result, dephased_qid_shape + dephased_qid_shape)
+            reduced_form = transformations.partial_trace(tensor_form, keep)
+            width = np.prod(protocols.qid_shape(circuit_like))
+            result = np.reshape(reduced_form, (width, width))
+
+        return result

cirq/sim/mux_test.py

@@ -23,10 +23,9 @@ import pytest
 import sympy
 
 import cirq
-import cirq.testing
 
 
-def test_sample():
+def test_sample() -> None:
     q = cirq.NamedQubit('q')
 
     with pytest.raises(ValueError, match="no measurements"):
@@ -49,7 +48,7 @@ def test_sample():
     assert results.histogram(key=q) == collections.Counter({0: 1})
 
 
-def test_sample_seed_unitary():
+def test_sample_seed_unitary() -> None:
     q = cirq.NamedQubit('q')
     circuit = cirq.Circuit(cirq.X(q) ** 0.2, cirq.measure(q))
     result = cirq.sample(circuit, repetitions=10, seed=1234)
@@ -60,7 +59,7 @@ def test_sample_seed_unitary():
     )
 
 
-def test_sample_seed_non_unitary():
+def test_sample_seed_non_unitary() -> None:
     q = cirq.NamedQubit('q')
     circuit = cirq.Circuit(cirq.depolarize(0.5).on(q), cirq.measure(q))
     result = cirq.sample(circuit, repetitions=10, seed=1234)
@@ -70,7 +69,7 @@ def test_sample_seed_non_unitary():
     )
 
 
-def test_sample_sweep():
+def test_sample_sweep() -> None:
     q = cirq.NamedQubit('q')
     c = cirq.Circuit(cirq.X(q), cirq.Y(q) ** sympy.Symbol('t'), cirq.measure(q))
 
@@ -102,7 +101,7 @@ def test_sample_sweep():
     assert results[1].histogram(key=q) == collections.Counter({0: 3})
 
 
-def test_sample_sweep_seed():
+def test_sample_sweep_seed() -> None:
     q = cirq.NamedQubit('q')
     circuit = cirq.Circuit(cirq.X(q) ** sympy.Symbol('t'), cirq.measure(q))
 
@@ -124,7 +123,7 @@ def test_sample_sweep_seed():
     assert np.all(results[2].measurements['q'] == [[True], [False]])
 
 
-def test_final_state_vector_different_program_types():
+def test_final_state_vector_different_program_types() -> None:
     a, b = cirq.LineQubit.range(2)
 
     np.testing.assert_allclose(cirq.final_state_vector(cirq.X), [0, 1], atol=1e-8)
@@ -140,7 +139,7 @@ def test_final_state_vector_different_program_types():
     )
 
 
-def test_final_state_vector_initial_state():
+def test_final_state_vector_initial_state() -> None:
     np.testing.assert_allclose(cirq.final_state_vector(cirq.X, initial_state=0), [0, 1], atol=1e-8)
 
     np.testing.assert_allclose(cirq.final_state_vector(cirq.X, initial_state=1), [1, 0], atol=1e-8)
@@ -152,7 +151,7 @@ def test_final_state_vector_initial_state():
     )
 
 
-def test_final_state_vector_dtype_insensitive_to_initial_state():
+def test_final_state_vector_dtype_insensitive_to_initial_state() -> None:
     assert cirq.final_state_vector(cirq.X).dtype == np.complex64
 
     assert cirq.final_state_vector(cirq.X, initial_state=0).dtype == np.complex64
@@ -181,7 +180,7 @@ def test_final_state_vector_dtype_insensitive_to_initial_state():
         )
 
 
-def test_final_state_vector_param_resolver():
+def test_final_state_vector_param_resolver() -> None:
     s = sympy.Symbol('s')
 
     with pytest.raises(ValueError, match='not unitary'):
@@ -192,7 +191,7 @@ def test_final_state_vector_param_resolver():
     )
 
 
-def test_final_state_vector_qubit_order():
+def test_final_state_vector_qubit_order() -> None:
     a, b = cirq.LineQubit.range(2)
 
     np.testing.assert_allclose(
@@ -206,7 +205,7 @@ def test_final_state_vector_qubit_order():
     )
 
 
-def test_final_state_vector_ignore_terminal_measurement():
+def test_final_state_vector_ignore_terminal_measurement() -> None:
     a, b = cirq.LineQubit.range(2)
 
     np.testing.assert_allclose(
@@ -226,7 +225,7 @@ def test_final_state_vector_ignore_terminal_measurement():
 
 
 @pytest.mark.parametrize('repetitions', (0, 1, 100))
-def test_repetitions(repetitions):
+def test_repetitions(repetitions) -> None:
     a = cirq.LineQubit(0)
     c = cirq.Circuit(cirq.H(a), cirq.measure(a, key='m'))
     r = cirq.sample(c, repetitions=repetitions)
@@ -235,7 +234,7 @@ def test_repetitions(repetitions):
     assert np.issubdtype(samples.dtype, np.integer)
 
 
-def test_final_density_matrix_different_program_types():
+def test_final_density_matrix_different_program_types() -> None:
     a, b = cirq.LineQubit.range(2)
 
     np.testing.assert_allclose(cirq.final_density_matrix(cirq.X), [[0, 0], [0, 1]], atol=1e-8)
@@ -244,12 +243,12 @@ def test_final_density_matrix_different_program_types():
 
     np.testing.assert_allclose(
         cirq.final_density_matrix(cirq.Circuit(ops)),
-        [[0.5, 0, 0, 0.5], [0, 0, 0, 0], [0, 0, 0, 0], [0.5, 0, 0, 0.5]],
+        np.asarray([[0.5, 0, 0, 0.5], [0, 0, 0, 0], [0, 0, 0, 0], [0.5, 0, 0, 0.5]]),
         atol=1e-8,
     )
 
 
-def test_final_density_matrix_initial_state():
+def test_final_density_matrix_initial_state() -> None:
     np.testing.assert_allclose(
         cirq.final_density_matrix(cirq.X, initial_state=0), [[0, 0], [0, 1]], atol=1e-8
     )
@@ -265,7 +264,7 @@ def test_final_density_matrix_initial_state():
     )
 
 
-def test_final_density_matrix_dtype_insensitive_to_initial_state():
+def test_final_density_matrix_dtype_insensitive_to_initial_state() -> None:
     assert cirq.final_density_matrix(cirq.X).dtype == np.complex64
 
     assert cirq.final_density_matrix(cirq.X, initial_state=0).dtype == np.complex64
@@ -296,7 +295,7 @@ def test_final_density_matrix_dtype_insensitive_to_initial_state():
         )
 
 
-def test_final_density_matrix_param_resolver():
+def test_final_density_matrix_param_resolver() -> None:
     s = sympy.Symbol('s')
 
     with pytest.raises(ValueError, match='not specified in parameter sweep'):
@@ -308,17 +307,17 @@ def test_final_density_matrix_param_resolver():
     )
 
 
-def test_final_density_matrix_qubit_order():
+def test_final_density_matrix_qubit_order() -> None:
     a, b = cirq.LineQubit.range(2)
 
     np.testing.assert_allclose(
         cirq.final_density_matrix([cirq.X(a), cirq.X(b) ** 0.5], qubit_order=[a, b]),
-        [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0.5, 0.5j], [0, 0, -0.5j, 0.5]],
+        np.asarray([[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0.5, 0.5j], [0, 0, -0.5j, 0.5]]),
     )
 
     np.testing.assert_allclose(
         cirq.final_density_matrix([cirq.X(a), cirq.X(b) ** 0.5], qubit_order=[b, a]),
-        [[0, 0, 0, 0], [0, 0.5, 0, 0.5j], [0, 0, 0, 0], [0, -0.5j, 0, 0.5]],
+        np.asarray([[0, 0, 0, 0], [0, 0.5, 0, 0.5j], [0, 0, 0, 0], [0, -0.5j, 0, 0.5]]),
     )
 
     np.testing.assert_allclose(
@@ -331,7 +330,7 @@ def test_final_density_matrix_qubit_order():
     )
 
 
-def test_final_density_matrix_seed_with_dephasing():
+def test_final_density_matrix_seed_with_dephasing() -> None:
     a = cirq.LineQubit(0)
     np.testing.assert_allclose(
         cirq.final_density_matrix([cirq.X(a) ** 0.5, cirq.measure(a)], seed=123),
@@ -345,7 +344,7 @@ def test_final_density_matrix_seed_with_dephasing():
     )
 
 
-def test_final_density_matrix_seed_with_collapsing():
+def test_final_density_matrix_seed_with_collapsing() -> None:
     a = cirq.LineQubit(0)
     np.testing.assert_allclose(
         cirq.final_density_matrix(
@@ -363,7 +362,7 @@ def test_final_density_matrix_seed_with_collapsing():
     )
 
 
-def test_final_density_matrix_noise():
+def test_final_density_matrix_noise() -> None:
     a = cirq.LineQubit(0)
     np.testing.assert_allclose(
         cirq.final_density_matrix([cirq.H(a), cirq.Z(a), cirq.H(a), cirq.measure(a)]),
@@ -380,7 +379,21 @@ def test_final_density_matrix_noise():
     )
 
 
-def test_ps_initial_state_wfn():
+def test_final_density_matrix_classical_control() -> None:
+    q0, q1 = cirq.LineQubit.range(2)
+    circuit = cirq.Circuit(
+        cirq.H(q0),
+        cirq.measure(q0, key='a'),
+        cirq.H(q1).with_classical_controls('a'),
+        cirq.measure(q1, key='b'),
+    )
+    np.testing.assert_allclose(
+        cirq.final_density_matrix(circuit),
+        np.diag(np.array([0.5, 0.0, 0.25, 0.25], dtype=np.complex64)),
+    )
+
+
+def test_ps_initial_state_wfn() -> None:
     q0, q1 = cirq.LineQubit.range(2)
     s00 = cirq.KET_ZERO(q0) * cirq.KET_ZERO(q1)
     sp0 = cirq.KET_PLUS(q0) * cirq.KET_ZERO(q1)
@@ -396,7 +409,7 @@ def test_ps_initial_state_wfn():
     )
 
 
-def test_ps_initial_state_dmat():
+def test_ps_initial_state_dmat() -> None:
     q0, q1 = cirq.LineQubit.range(2)
     s00 = cirq.KET_ZERO(q0) * cirq.KET_ZERO(q1)
     sp0 = cirq.KET_PLUS(q0) * cirq.KET_ZERO(q1)

cirq/sim/simulation_product_state.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 from collections import abc
-from typing import Any, Generic, Iterator, Mapping, Sequence, TYPE_CHECKING
+from collections.abc import Iterator, Mapping, Sequence
+from typing import Any, Generic, TYPE_CHECKING
 
 import numpy as np
 

cirq/sim/simulation_product_state_test.py

@@ -14,29 +14,30 @@
 
 from __future__ import annotations
 
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any, Self
 
 import cirq
 
 
 class EmptyQuantumState(cirq.QuantumStateRepresentation):
-    def copy(self, deep_copy_buffers=True):
+    def copy(self, deep_copy_buffers=True) -> Self:
         return self
 
-    def measure(self, axes, seed=None):
+    def measure(self, axes, seed=None) -> list[int]:
         return [0] * len(axes)
 
     @property
-    def supports_factor(self):
+    def supports_factor(self) -> bool:
         return True
 
-    def kron(self, other):
+    def kron(self, other) -> Self:
         return self
 
-    def factor(self, axes, *, validate=True, atol=1e-07):
+    def factor(self, axes, *, validate=True, atol=1e-07) -> tuple[Self, Self]:
         return self, self
 
-    def reindex(self, axes):
+    def reindex(self, axes) -> Self:
         return self
 
 

cirq/sim/simulation_state.py

@@ -18,7 +18,8 @@ from __future__ import annotations
 
 import abc
 import copy
-from typing import Any, cast, Generic, Iterator, Self, Sequence, TYPE_CHECKING, TypeVar
+from collections.abc import Iterator, Sequence
+from typing import Any, cast, Generic, Self, TYPE_CHECKING, TypeVar
 
 import numpy as np
 
@@ -73,7 +74,7 @@ class SimulationState(SimulationStateBase, Generic[TState], metaclass=abc.ABCMet
         key: str,
         invert_mask: Sequence[bool],
         confusion_map: dict[tuple[int, ...], np.ndarray],
-    ):
+    ) -> None:
         """Measures the qubits and records to `log_of_measurement_results`.
 
         Any bitmasks will be applied to the measurement record.
@@ -209,7 +210,7 @@ class SimulationState(SimulationStateBase, Generic[TState], metaclass=abc.ABCMet
         return extracted, remainder
 
     @property
-    def allows_factoring(self):
+    def allows_factoring(self) -> bool:
         """Subclasses that allow factorization should override this."""
         return self._state.supports_factor if self._state is not None else False
 
@@ -238,7 +239,7 @@ class SimulationState(SimulationStateBase, Generic[TState], metaclass=abc.ABCMet
     def qubits(self) -> tuple[cirq.Qid, ...]:
         return self._qubits
 
-    def swap(self, q1: cirq.Qid, q2: cirq.Qid, *, inplace=False):
+    def swap(self, q1: cirq.Qid, q2: cirq.Qid, *, inplace=False) -> Self:
         """Swaps two qubits.
 
         This only affects the index, and does not modify the underlying
@@ -269,7 +270,7 @@ class SimulationState(SimulationStateBase, Generic[TState], metaclass=abc.ABCMet
         args._set_qubits(qubits)
         return args
 
-    def rename(self, q1: cirq.Qid, q2: cirq.Qid, *, inplace=False):
+    def rename(self, q1: cirq.Qid, q2: cirq.Qid, *, inplace=False) -> Self:
         """Renames `q1` to `q2`.
 
         Args:

cirq/sim/simulation_state_base.py

@@ -17,8 +17,9 @@
 from __future__ import annotations
 
 import abc
+from collections.abc import Iterator, Mapping, Sequence
 from types import NotImplementedType
-from typing import Any, Generic, Iterator, Mapping, Self, Sequence, TYPE_CHECKING, TypeVar
+from typing import Any, Generic, Self, TYPE_CHECKING, TypeVar
 
 from cirq import protocols, value
 
@@ -81,7 +82,7 @@ class SimulationStateBase(Generic[TSimulationState], metaclass=abc.ABCMeta):
         Returns:
             True if the fallback applies, else NotImplemented."""
 
-    def apply_operation(self, op: cirq.Operation):
+    def apply_operation(self, op: cirq.Operation) -> None:
         protocols.act_on(op, self)
 
     @abc.abstractmethod

cirq/sim/simulation_state_test.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 import numpy as np
 import pytest
@@ -25,13 +26,13 @@ from cirq.testing import PhaseUsingCleanAncilla, PhaseUsingDirtyAncilla
 
 
 class ExampleQuantumState(cirq.QuantumStateRepresentation):
-    def copy(self, deep_copy_buffers=True):
-        pass
+    def copy(self, deep_copy_buffers=True) -> ExampleQuantumState:
+        raise NotImplementedError()
 
-    def measure(self, axes, seed=None):
+    def measure(self, axes, seed=None) -> list[int]:
         return [5, 3]
 
-    def reindex(self, axes):
+    def reindex(self, axes) -> ExampleQuantumState:
         return self
 
 
@@ -44,7 +45,7 @@ class ExampleSimulationState(cirq.SimulationState):
     ) -> bool:
         return True
 
-    def add_qubits(self, qubits):
+    def add_qubits(self, qubits) -> ExampleSimulationState:
         super().add_qubits(qubits)
         return self
 

cirq/sim/simulation_utils.py

@@ -13,7 +13,8 @@
 # limitations under the License.
 from __future__ import annotations
 
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 import numpy as np
 

cirq/sim/simulator.py

@@ -31,7 +31,8 @@ from __future__ import annotations
 
 import abc
 import collections
-from typing import Any, Callable, cast, Generic, Iterator, Mapping, Sequence, TYPE_CHECKING, TypeVar
+from collections.abc import Callable, Iterator, Mapping, Sequence
+from typing import Any, cast, Generic, TYPE_CHECKING, TypeVar
 
 import numpy as np
 
@@ -217,7 +218,7 @@ class SimulatesAmplitudes(metaclass=value.ABCMetaImplementAnyOneOf):
     def sample_from_amplitudes(
         self,
         circuit: cirq.AbstractCircuit,
-        param_resolver: cirq.ParamResolver,
+        param_resolver: cirq.ParamResolverOrSimilarType,
         seed: cirq.RANDOM_STATE_OR_SEED_LIKE,
         repetitions: int = 1,
         qubit_order: cirq.QubitOrderOrList = ops.QubitOrder.DEFAULT,
@@ -938,7 +939,7 @@ def _qubit_map_to_shape(qubit_map: Mapping[cirq.Qid, int]) -> tuple[int, ...]:
     return tuple(qid_shape)
 
 
-def check_all_resolved(circuit):
+def check_all_resolved(circuit) -> None:
     """Raises if the circuit contains unresolved symbols."""
     if protocols.is_parameterized(circuit):
         unresolved = [op for moment in circuit for op in moment if protocols.is_parameterized(op)]

cirq/sim/simulator_base.py

@@ -18,7 +18,8 @@ from __future__ import annotations
 
 import abc
 import collections
-from typing import Any, cast, Generic, Iterator, Sequence, TYPE_CHECKING, TypeVar
+from collections.abc import Iterator, Sequence
+from typing import Any, cast, Generic, TYPE_CHECKING, TypeVar
 
 import numpy as np