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

cirq/qis/channels_test.py

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

cirq/qis/clifford_tableau.py

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

cirq/qis/entropy.py

@@ -14,10 +14,10 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from concurrent.futures import ThreadPoolExecutor
 from itertools import product
-from typing import Any, cast, Iterator
+from typing import Any, cast
 
 import numpy as np
 import numpy.typing as npt

cirq/qis/quantum_state_representation.py

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

cirq/qis/states.py

@@ -17,7 +17,8 @@
 from __future__ import annotations
 
 import itertools
-from typing import Any, cast, Iterable, Sequence, TYPE_CHECKING, Union
+from collections.abc import Iterable, Sequence
+from typing import Any, cast, TYPE_CHECKING, Union
 
 import numpy as np
 
@@ -1019,7 +1020,11 @@ def validate_density_matrix(
     if not np.isclose(trace, 1.0, atol=atol):
         raise ValueError(f'Density matrix does not have trace 1. Instead, it has trace {trace}.')
     if not np.all(np.linalg.eigvalsh(density_matrix) > -atol):
-        raise ValueError('The density matrix is not positive semidefinite.')
+        raise ValueError(
+            'The density matrix is not positive semidefinite. '
+            'This may happen for simulations using lower-precision `dtype` such as '
+            '`np.complex64`. Try using `np.complex128` in such a case.'
+        )
 
 
 def _qid_shape_from_args(

cirq/sim/classical_simulator.py

@@ -14,8 +14,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Sequence
 from copy import copy, deepcopy
-from typing import Any, Generic, Sequence, TYPE_CHECKING
+from typing import Any, Generic, TYPE_CHECKING
 
 import numpy as np
 

cirq/sim/clifford/clifford_simulator.py

@@ -32,7 +32,8 @@ The quantum state is specified in two forms:
 
 from __future__ import annotations
 
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 import numpy as np
 

cirq/sim/clifford/clifford_simulator_test.py

@@ -470,7 +470,7 @@ def test_swap() -> None:
     assert r["b"][0]
 
     with pytest.raises(TypeError, match="CliffordSimulator doesn't support"):
-        cirq.CliffordSimulator().simulate((cirq.Circuit(cirq.SWAP(a, b) ** 3.5)))
+        cirq.CliffordSimulator().simulate(cirq.Circuit(cirq.SWAP(a, b) ** 3.5))
 
 
 def test_sample_seed() -> None:

cirq/sim/clifford/clifford_tableau_simulation_state.py

@@ -17,7 +17,8 @@ for Clifford Simulator."""
 
 from __future__ import annotations
 
-from typing import Sequence, TYPE_CHECKING
+from collections.abc import Sequence
+from typing import TYPE_CHECKING
 
 from cirq.qis import clifford_tableau
 from cirq.sim.clifford.stabilizer_simulation_state import StabilizerSimulationState

cirq/sim/clifford/stabilizer_ch_form_simulation_state.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Sequence, TYPE_CHECKING
+from collections.abc import Sequence
+from typing import TYPE_CHECKING
 
 from cirq._compat import proper_repr
 from cirq.sim.clifford import stabilizer_state_ch_form

cirq/sim/clifford/stabilizer_sampler.py

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

cirq/sim/clifford/stabilizer_simulation_state.py

@@ -15,8 +15,9 @@
 from __future__ import annotations
 
 import abc
+from collections.abc import Sequence
 from types import NotImplementedType
-from typing import Any, cast, Generic, Sequence, TYPE_CHECKING, TypeVar
+from typing import Any, cast, Generic, TYPE_CHECKING, TypeVar
 
 import sympy
 

cirq/sim/clifford/stabilizer_state_ch_form.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
 
@@ -214,7 +215,7 @@ class StabilizerStateChForm(qis.StabilizerState):
             omega = (1j) ** (delta * int(y))
 
             delta2 = ((-1) ** y * delta) % 4
-            c = bool((delta2 >> 1))
+            c = bool(delta2 >> 1)
             a = bool(delta2 & 1)
             b = True
         else:

cirq/sim/clifford/stabilizer_state_ch_form_test.py

@@ -18,7 +18,6 @@ import numpy as np
 import pytest
 
 import cirq
-import cirq.testing
 
 # TODO: This and clifford tableau need tests.
 # Github issue: https://github.com/quantumlib/Cirq/issues/3021

cirq/sim/density_matrix_simulation_state.py

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

cirq/sim/density_matrix_simulator.py

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

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/mux.py

@@ -19,7 +19,8 @@ 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
 

cirq/sim/mux_test.py

@@ -23,7 +23,6 @@ import pytest
 import sympy
 
 import cirq
-import cirq.testing
 
 
 def test_sample() -> None:

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,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Self, Sequence
+from collections.abc import Sequence
+from typing import Any, Self
 
 import cirq
 

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
 

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
 

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

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
 

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
 

cirq/sim/simulator_base_test.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import math
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 import numpy as np
 import pytest

cirq/sim/simulator_test.py

@@ -17,7 +17,8 @@
 from __future__ import annotations
 
 import abc
-from typing import Any, Generic, Iterator, Sequence
+from collections.abc import Iterator, Sequence
+from typing import Any, Generic
 from unittest import mock
 
 import duet

cirq/sim/sparse_simulator.py

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

cirq/sim/state_vector.py

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

cirq/sim/state_vector_simulation_state.py

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

cirq/sim/state_vector_simulator.py

@@ -18,8 +18,9 @@ from __future__ import annotations
 
 import abc
 import warnings
+from collections.abc import Iterator, Sequence
 from functools import cached_property
-from typing import Any, Generic, Iterator, Sequence, TYPE_CHECKING, TypeVar
+from typing import Any, Generic, TYPE_CHECKING, TypeVar
 
 import numpy as np
 

cirq/sim/state_vector_test.py

@@ -17,14 +17,13 @@
 from __future__ import annotations
 
 import itertools
-from typing import Iterator
+from collections.abc import Iterator
 from unittest import mock
 
 import numpy as np
 import pytest
 
 import cirq
-import cirq.testing
 from cirq import linalg
 
 

cirq/study/__init__.py

@@ -38,6 +38,7 @@ from cirq.study.sweepable import (
 from cirq.study.sweeps import (
     Concat as Concat,
     Linspace as Linspace,
+    list_of_dicts_to_zip as list_of_dicts_to_zip,
     ListSweep as ListSweep,
     Points as Points,
     Product as Product,

cirq/study/flatten_expressions.py

@@ -17,7 +17,8 @@
 from __future__ import annotations
 
 import numbers
-from typing import Any, Callable, TYPE_CHECKING
+from collections.abc import Callable
+from typing import Any, TYPE_CHECKING
 
 import sympy
 

cirq/study/resolver.py

@@ -17,7 +17,8 @@
 from __future__ import annotations
 
 import numbers
-from typing import Any, cast, Iterator, Mapping, TYPE_CHECKING, Union
+from collections.abc import Iterator, Mapping
+from typing import Any, cast, TYPE_CHECKING, Union
 
 import numpy as np
 import sympy
@@ -75,9 +76,20 @@ class ParamResolver:
 
         self._param_hash: int | None = None
         self._param_dict = cast(ParamDictType, {} if param_dict is None else param_dict)
+        self._param_dict_with_str_keys = self._param_dict
+        generate_str_keys = False
         for key in self._param_dict:
-            if isinstance(key, sympy.Expr) and not isinstance(key, sympy.Symbol):
-                raise TypeError(f'ParamResolver keys cannot be (non-symbol) formulas ({key})')
+            if isinstance(key, sympy.Expr):
+                if isinstance(key, sympy.Symbol):
+                    generate_str_keys = True
+                else:
+                    raise TypeError(f'ParamResolver keys cannot be (non-symbol) formulas ({key})')
+        if generate_str_keys:
+            # Remake dictionary with string keys for faster access
+            self._param_dict_with_str_keys = {
+                (key.name if isinstance(key, sympy.Symbol) else key): value
+                for key, value in self._param_dict.items()
+            }
         self._deep_eval_map: ParamDictType = {}
 
     @property
@@ -118,32 +130,33 @@ class ParamResolver:
             sympy.SympifyError: If the resulting value cannot be interpreted.
         """
 
-        # Input is a pass through type, no resolution needed: return early
-        v = _resolve_value(value)
-        if v is not NotImplemented:
-            return v
-
         # Handle string or symbol
-        if isinstance(value, (str, sympy.Symbol)):
-            string = value if isinstance(value, str) else value.name
-            symbol = value if isinstance(value, sympy.Symbol) else sympy.Symbol(value)
-            param_value = self._param_dict.get(string, _NOT_FOUND)
-            if param_value is _NOT_FOUND:
-                param_value = self._param_dict.get(symbol, _NOT_FOUND)
+        original_value = value
+        if isinstance(value, sympy.Symbol):
+            value = value.name
+        if isinstance(value, str):
+            param_value = self._param_dict_with_str_keys.get(value, _NOT_FOUND)
+            if isinstance(param_value, float):
+                return param_value
             if param_value is _NOT_FOUND:
                 # Symbol or string cannot be resolved if not in param dict; return as symbol.
-                return symbol
+                return sympy.Symbol(value)
             v = _resolve_value(param_value)
             if v is not NotImplemented:
                 return v
             if isinstance(param_value, str):
                 param_value = sympy.Symbol(param_value)
             elif not isinstance(param_value, sympy.Basic):
-                return value
+                return original_value
             if recursive:
                 param_value = self._value_of_recursive(value)
             return param_value
 
+        # Input is a pass through type, no resolution needed: return early
+        v = _resolve_value(value)
+        if v is not NotImplemented:
+            return v
+
         if not isinstance(value, sympy.Basic):
             # No known way to resolve this variable, return unchanged.
             return value
@@ -210,7 +223,7 @@ class ParamResolver:
         self._deep_eval_map[value] = _RECURSION_FLAG
 
         v = self.value_of(value, recursive=False)
-        if v == value:
+        if v == value or (isinstance(v, sympy.Symbol) and v.name == value):
             self._deep_eval_map[value] = v
         else:
             self._deep_eval_map[value] = self.value_of(v, recursive=True)
@@ -278,7 +291,7 @@ class ParamResolver:
 
 
 def _resolve_value(val: Any) -> Any:
-    if val is None:
+    if isinstance(val, float) or val is None:
         return val
     if isinstance(val, numbers.Number) and not isinstance(val, sympy.Basic):
         return val

cirq/study/resolver_test.py

@@ -31,7 +31,7 @@ import cirq
         None,
         3.2,
         np.float32(3.2),
-        int(1),
+        1,
         np.int32(45),
         np.float64(6.3),
         np.int32(2),

cirq/study/result.py

@@ -19,7 +19,8 @@ from __future__ import annotations
 import abc
 import collections
 import io
-from typing import Any, Callable, cast, Iterable, Mapping, Sequence, TYPE_CHECKING, TypeVar, Union
+from collections.abc import Callable, Iterable, Mapping, Sequence
+from typing import Any, cast, TYPE_CHECKING, TypeVar, Union
 
 import numpy as np
 import pandas as pd

cirq/study/sweepable.py

@@ -17,7 +17,8 @@
 from __future__ import annotations
 
 import warnings
-from typing import cast, Iterable, Iterator, Protocol, Sequence
+from collections.abc import Iterable, Iterator, Sequence
+from typing import cast, Protocol
 
 from cirq._doc import document
 from cirq.study.resolver import ParamResolver, ParamResolverOrSimilarType

cirq/study/sweeps.py

@@ -17,7 +17,8 @@ from __future__ import annotations
 import abc
 import collections
 import itertools
-from typing import Any, cast, Iterable, Iterator, overload, Sequence, TYPE_CHECKING, Union
+from collections.abc import Iterable, Iterator, Mapping, Sequence
+from typing import Any, cast, overload, TYPE_CHECKING, Union
 
 import sympy
 
@@ -653,3 +654,27 @@ def dict_to_zip_sweep(factor_dict: ProductOrZipSweepLike) -> Zip:
             for k, v in factor_dict.items()
         )
     )
+
+
+def list_of_dicts_to_zip(params: Sequence[Mapping[str, float]]) -> cirq.Zip:
+    """Converts a list of dictionaries into a cirq.Zip of cirq.Points.
+
+    This will convert lists of dictionaries into a more compact
+    Sweep format.   For large sweeps, this can vastly improve performance.
+
+    This will change [{'a': 1.0, 'b': 2.0}, {'a': 3.0, 'b': 4.0}]
+    into cirq.Zip(cirq.Points('a', [1.0, 3.0]), cirq.Points('b', [2.0, 4.0])_)
+
+    Raises:
+        ValueError if the keys in any of the list items are not the same.
+    """
+    param_keys: dict[str, list[float]] = collections.defaultdict(list)
+    if len(params) < 1:
+        raise ValueError("Input dictionary to convert is empty.")
+    sweep_keys = params[0].keys()
+    for sweep_point in params:
+        if set(sweep_point.keys()) != sweep_keys:
+            raise ValueError("Keys must be the same in each sweep point.")
+        for key, value in sweep_point.items():
+            param_keys[key].append(value)
+    return Zip(*(Points(key, points) for key, points in param_keys.items()))

cirq/study/sweeps_test.py

@@ -529,3 +529,27 @@ def test_concat_different_keys_raises() -> None:
 def test_concat_empty_sweep_raises() -> None:
     with pytest.raises(ValueError, match="Concat requires at least one sweep."):
         _ = cirq.Concat()
+
+
+def test_list_of_dicts_to_zip_empty() -> None:
+    with pytest.raises(ValueError, match="empty"):
+        cirq.list_of_dicts_to_zip([])
+
+
+def test_list_of_dicts_to_zip_mismatched_keys() -> None:
+    with pytest.raises(ValueError, match="Keys must be the same"):
+        cirq.list_of_dicts_to_zip([{'a': 4.0}, {'a': 2.0, 'b': 1.0}])
+
+
+def test_list_of_dicts_to_zip() -> None:
+    param_dict = [
+        {'a': 1.0, 'b': 2.0, 'c': 10.0},
+        {'a': 2.0, 'b': 4.0, 'c': 9.0},
+        {'a': 3.0, 'b': 8.0, 'c': 8.0},
+    ]
+    param_zip = cirq.Zip(
+        cirq.Points('a', [1.0, 2.0, 3.0]),
+        cirq.Points('b', [2.0, 4.0, 8.0]),
+        cirq.Points('c', [10.0, 9.0, 8.0]),
+    )
+    assert cirq.list_of_dicts_to_zip(param_dict) == param_zip

cirq/testing/_compat_test_data/__init__.py

@@ -64,11 +64,11 @@ _compat.deprecated_submodule(
 
 # simulates a move of child module to a top level module.
 # this will be the case with cirq.google -> cirq_google
-# fake_freezegun -> freezegun
+# fake_numpy -> numpy
 _compat.deprecated_submodule(
-    new_module_name="freezegun",
+    new_module_name="numpy",
     old_parent=__name__,
-    old_child="fake_freezegun",
+    old_child="fake_numpy",
     deadline="v0.20",
     create_attribute=False,
 )

cirq/testing/circuit_compare.py

@@ -17,7 +17,8 @@ from __future__ import annotations
 import itertools
 import random
 from collections import defaultdict
-from typing import Any, Iterable, Sequence
+from collections.abc import Iterable, Sequence
+from typing import Any
 
 import numpy as np
 import sympy

cirq/testing/consistent_act_on_test.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Sequence
+from collections.abc import Sequence
 
 import numpy as np
 import pytest