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

cirq/ops/gateset.py

@@ -16,7 +16,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, cast, Hashable, Iterable, TYPE_CHECKING
+from collections.abc import Callable, Hashable, Iterable
+from typing import Any, cast, TYPE_CHECKING
 
 from cirq import protocols, value
 from cirq.ops import global_phase_op, op_tree, raw_types
@@ -340,6 +341,7 @@ class Gateset:
         self._unroll_circuit_op = unroll_circuit_op
         self._instance_gate_families: dict[raw_types.Gate, GateFamily] = {}
         self._type_gate_families: dict[type[raw_types.Gate], GateFamily] = {}
+        self._gate_families_with_tags: list[GateFamily] = []
         self._gates_repr_str = ", ".join([_gate_str(g, repr) for g in gates])
         unique_gate_list: list[GateFamily] = list(
             dict.fromkeys(g if isinstance(g, GateFamily) else GateFamily(gate=g) for g in gates)
@@ -351,6 +353,12 @@ class Gateset:
                     self._instance_gate_families[g.gate] = g
                 else:
                     self._type_gate_families[g.gate] = g
+            else:
+                if isinstance(g.gate, raw_types.Gate):
+                    self._gate_families_with_tags.append(g)
+                else:
+                    # Instance checks are faster, so test them first.
+                    self._gate_families_with_tags.insert(0, g)
         self._unique_gate_list = unique_gate_list
         self._gates = frozenset(unique_gate_list)
 
@@ -422,6 +430,7 @@ class Gateset:
         g = item if isinstance(item, raw_types.Gate) else item.gate
         assert g is not None, f'`item`: {item} must be a gate or have a valid `item.gate`'
 
+        # Check "type" based GateFamily since isinstance is fast
         for gate_mro_type in type(g).mro():
             if gate_mro_type in self._type_gate_families:
                 assert item in self._type_gate_families[gate_mro_type], (
@@ -430,6 +439,7 @@ class Gateset:
                 )
                 return True
 
+        # Check exact instance equality next
         if g in self._instance_gate_families:
             assert item in self._instance_gate_families[g], (
                 f"{item} instance matches {self._instance_gate_families[g]} but "
@@ -437,7 +447,17 @@ class Gateset:
             )
             return True
 
-        return any(item in gate_family for gate_family in self._gates)
+        # Check other GateFamilies next
+        if any(item in gate_family for gate_family in self._gate_families_with_tags):
+            return True
+
+        # Lastly, do a final exhaustive check to make sure this is not equivalent
+        # to another type of gate. This will catch things like:
+        # cirq.XPowGate(exponent=0) in cirq.GateFamily(cirq.I)
+        return any(
+            item in gate_family
+            for gate_family in self._gates.difference(self._gate_families_with_tags)
+        )
 
     def validate(self, circuit_or_optree: cirq.AbstractCircuit | op_tree.OP_TREE) -> bool:
         """Validates gates forming `circuit_or_optree` should be contained in Gateset.

cirq/ops/global_phase_op.py

@@ -15,8 +15,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Collection, Sequence, Set
 from types import NotImplementedType
-from typing import AbstractSet, Any, cast, Collection, Sequence
+from typing import Any, cast
 
 import numpy as np
 import sympy
@@ -83,7 +84,7 @@ class GlobalPhaseGate(raw_types.Gate):
     def _is_parameterized_(self) -> bool:
         return protocols.is_parameterized(self.coefficient)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self.coefficient)
 
     def _resolve_parameters_(

cirq/ops/greedy_qubit_manager.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Iterable, TYPE_CHECKING
+from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from cirq.ops import named_qubit, qid_util, qubit_manager
 

cirq/ops/identity.py

@@ -16,8 +16,9 @@
 from __future__ import annotations
 
 import numbers
+from collections.abc import Sequence
 from types import NotImplementedType
-from typing import Any, Sequence, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 import sympy

cirq/ops/kraus_channel.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterable, Mapping, TYPE_CHECKING
+from collections.abc import Iterable, Mapping
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 

cirq/ops/linear_combinations.py

@@ -16,7 +16,8 @@ from __future__ import annotations
 
 import numbers
 from collections import defaultdict
-from typing import AbstractSet, Any, Iterable, Mapping, TYPE_CHECKING, Union
+from collections.abc import Iterable, Mapping, Set
+from typing import Any, TYPE_CHECKING, Union
 
 import numpy as np
 import sympy
@@ -136,7 +137,7 @@ class LinearCombinationOfGates(value.LinearDict[raw_types.Gate]):
     def _is_parameterized_(self) -> bool:
         return any(protocols.is_parameterized(item) for item in self.items())
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return {name for item in self.items() for name in protocols.parameter_names(item)}
 
     def _resolve_parameters_(
@@ -253,7 +254,7 @@ class LinearCombinationOfOperations(value.LinearDict[raw_types.Operation]):
     def _is_parameterized_(self) -> bool:
         return any(protocols.is_parameterized(item) for item in self.items())
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return {name for item in self.items() for name in protocols.parameter_names(item)}
 
     def _resolve_parameters_(
@@ -742,6 +743,8 @@ class PauliSum:
         return len(self._linear_dict)
 
     def __iadd__(self, other):
+        if isinstance(other, raw_types.Operation):
+            other = pauli_string._try_interpret_as_pauli_string(other)
         if isinstance(other, numbers.Complex):
             other = PauliSum.from_pauli_strings([PauliString(coefficient=other)])
         elif isinstance(other, PauliString):
@@ -766,6 +769,8 @@ class PauliSum:
         return -self.__sub__(other)
 
     def __isub__(self, other):
+        if isinstance(other, raw_types.Operation):
+            other = pauli_string._try_interpret_as_pauli_string(other)
         if isinstance(other, numbers.Complex):
             other = PauliSum.from_pauli_strings([PauliString(coefficient=other)])
         elif isinstance(other, PauliString):

cirq/ops/linear_combinations_test.py

@@ -975,10 +975,16 @@ def test_paulisum_validation() -> None:
     ps += cirq.I(cirq.LineQubit(0))
     assert ps == cirq.PauliSum(cirq.LinearDict({frozenset(): complex(1)}))
 
+    ps = cirq.I(cirq.LineQubit(0)) + cirq.PauliSum()
+    assert ps == cirq.PauliSum(cirq.LinearDict({frozenset(): complex(1)}))
+
     ps = cirq.PauliSum()
     ps -= cirq.I(cirq.LineQubit(0))
     assert ps == cirq.PauliSum(cirq.LinearDict({frozenset(): complex(-1)}))
 
+    ps = cirq.I(cirq.LineQubit(0)) - cirq.PauliSum()
+    assert ps == cirq.PauliSum(cirq.LinearDict({frozenset(): complex(1)}))
+
 
 def test_add_number_paulisum() -> None:
     q = cirq.LineQubit.range(2)
@@ -1008,6 +1014,22 @@ def test_add_number_paulistring() -> None:
         == cirq.PauliSum.from_pauli_strings([cirq.PauliString() * 2, cirq.PauliString({a: cirq.X})])
     )
 
+    assert (
+        cirq.X(a) - 2
+        == -2 + cirq.X(a)
+        == cirq.PauliSum.from_pauli_strings(
+            [cirq.PauliString() * -2, cirq.PauliString({a: cirq.X})]
+        )
+    )
+
+    assert (
+        2 - cirq.X(a)
+        == 2 + -cirq.X(a)
+        == cirq.PauliSum.from_pauli_strings(
+            [cirq.PauliString() * 2, -cirq.PauliString({a: cirq.X})]
+        )
+    )
+
 
 def test_pauli_sum_formatting() -> None:
     q = cirq.LineQubit.range(2)
@@ -1430,7 +1452,7 @@ def test_expectation_from_density_matrix_invalid_input() -> None:
     with pytest.raises(ValueError, match='shape'):
         psum.expectation_from_density_matrix(rho.reshape((8, 8, 1)), q_map)
     with pytest.raises(ValueError, match='shape'):
-        psum.expectation_from_density_matrix(rho.reshape((-1)), q_map)
+        psum.expectation_from_density_matrix(rho.reshape((-1,)), q_map)
 
 
 def test_expectation_from_density_matrix_check_preconditions() -> None:

cirq/ops/matrix_gates.py

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

cirq/ops/measure_util.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Callable, cast, Iterable, overload, TYPE_CHECKING
+from collections.abc import Callable, Iterable
+from typing import cast, overload, TYPE_CHECKING
 
 import numpy as np
 

cirq/ops/measurement_gate.py

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

cirq/ops/mixed_unitary_channel.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterable, Mapping, TYPE_CHECKING
+from collections.abc import Iterable, Mapping
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 

cirq/ops/named_qubit.py

@@ -148,7 +148,7 @@ class NamedQid(_BaseNamedQid):
 
     @staticmethod
     def range(*args, prefix: str, dimension: int) -> list[NamedQid]:
-        """Returns a range of ``NamedQid``\\s.
+        """Returns a range of ``NamedQid``s.
 
         The range returned starts with the prefix, and followed by a qid for
         each number in the range, e.g.:
@@ -166,7 +166,7 @@ class NamedQid(_BaseNamedQid):
             dimension: The dimension of the qid's Hilbert space, i.e.
                 the number of quantum levels.
         Returns:
-            A list of ``NamedQid``\\s.
+            A list of ``NamedQid``s.
         """
         return [NamedQid(f"{prefix}{i}", dimension=dimension) for i in range(*args)]
 

cirq/ops/op_tree.py

@@ -16,7 +16,8 @@
 
 from __future__ import annotations
 
-from typing import Callable, Iterable, Iterator, NoReturn, TYPE_CHECKING
+from collections.abc import Callable, Iterable, Iterator
+from typing import NoReturn, TYPE_CHECKING
 
 from cirq._doc import document
 from cirq._import import LazyLoader

cirq/ops/parallel_gate.py

@@ -14,8 +14,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Set
 from types import NotImplementedType
-from typing import AbstractSet, Any, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 
@@ -90,7 +91,7 @@ class ParallelGate(raw_types.Gate):
     def _is_parameterized_(self) -> bool:
         return protocols.is_parameterized(self.sub_gate)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self.sub_gate)
 
     def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> ParallelGate:

cirq/ops/parity_gates.py

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

cirq/ops/pauli_interaction_gate.py

@@ -14,7 +14,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/ops/pauli_measurement_gate.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, cast, Iterable, Iterator, Mapping, Sequence, TYPE_CHECKING
+from collections.abc import Iterable, Iterator, Mapping, Sequence
+from typing import Any, cast, TYPE_CHECKING
 
 from cirq import protocols, value
 from cirq.ops import (

cirq/ops/pauli_string.py

@@ -17,25 +17,19 @@ from __future__ import annotations
 import cmath
 import math
 import numbers
-from types import NotImplementedType
-from typing import (
-    AbstractSet,
-    Any,
+from collections.abc import (
     Callable,
-    cast,
-    Generic,
     ItemsView,
     Iterable,
     Iterator,
     KeysView,
     Mapping,
-    overload,
     Sequence,
-    TYPE_CHECKING,
-    TypeVar,
-    Union,
+    Set,
     ValuesView,
 )
+from types import NotImplementedType
+from typing import Any, cast, Generic, overload, TYPE_CHECKING, TypeVar, Union
 
 import numpy as np
 import sympy
@@ -1040,7 +1034,7 @@ class PauliString(raw_types.Operation, Generic[TKey]):
     def _is_parameterized_(self) -> bool:
         return protocols.is_parameterized(self.coefficient)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self.coefficient)
 
     def _resolve_parameters_(
@@ -1233,7 +1227,7 @@ class MutablePauliString(Generic[TKey]):
             return sign
         return -sign
 
-    def keys(self) -> AbstractSet[TKey]:
+    def keys(self) -> Set[TKey]:
         """Returns the sequence of qubits on which this pauli string acts."""
         return self.pauli_int_dict.keys()
 

cirq/ops/pauli_string_phasor.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import numbers
-from typing import AbstractSet, cast, Iterable, Iterator, Sequence, TYPE_CHECKING
+from collections.abc import Iterable, Iterator, Sequence, Set
+from typing import cast, TYPE_CHECKING
 
 from cirq import protocols, value
 from cirq._compat import deprecated, proper_repr
@@ -388,7 +389,7 @@ class PauliStringPhasorGate(raw_types.Gate):
             self.exponent_pos
         )
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self.exponent_neg) | protocols.parameter_names(
             self.exponent_pos
         )

cirq/ops/pauli_string_raw_types.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import abc
-from typing import Any, Self, Sequence, TYPE_CHECKING
+from collections.abc import Sequence
+from typing import Any, Self, TYPE_CHECKING
 
 from cirq import protocols
 from cirq.ops import pauli_string as ps, raw_types

cirq/ops/pauli_string_test.py

@@ -16,7 +16,7 @@ from __future__ import annotations
 
 import itertools
 import math
-from typing import Iterator
+from collections.abc import Iterator
 
 import numpy as np
 import pytest
@@ -1191,7 +1191,7 @@ def test_expectation_from_density_matrix_invalid_input() -> None:
     with pytest.raises(ValueError, match='shape'):
         ps.expectation_from_density_matrix(rho.reshape((4, 4, 1)), q_map_2)
     with pytest.raises(ValueError, match='shape'):
-        ps.expectation_from_density_matrix(rho.reshape((-1)), q_map_2)
+        ps.expectation_from_density_matrix(rho.reshape((-1,)), q_map_2)
 
     # Correctly shaped state_vectors.
     with pytest.raises(ValueError, match='shape'):

cirq/ops/pauli_sum_exponential.py

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

cirq/ops/permutation_gate.py

@@ -14,7 +14,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
 
 from cirq import protocols, value
 from cirq.ops import raw_types, swap_gates

cirq/ops/phased_iswap_gate.py

@@ -15,7 +15,8 @@
 
 from __future__ import annotations
 
-from typing import AbstractSet, Any, cast, Iterator, Sequence
+from collections.abc import Iterator, Sequence, Set
+from typing import Any, cast
 
 import numpy as np
 import sympy
@@ -108,7 +109,7 @@ class PhasedISwapPowGate(eigen_gate.EigenGate):
             self._phase_exponent
         )
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self._iswap) | protocols.parameter_names(
             self._phase_exponent
         )

cirq/ops/phased_x_gate.py

@@ -18,8 +18,9 @@ from __future__ import annotations
 
 import math
 import numbers
+from collections.abc import Sequence, Set
 from types import NotImplementedType
-from typing import AbstractSet, Any, cast, Sequence
+from typing import Any, cast
 
 import numpy as np
 import sympy
@@ -166,7 +167,7 @@ class PhasedXPowGate(raw_types.Gate):
             self._phase_exponent
         )
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         """See `cirq.SupportsParameterization`."""
         return protocols.parameter_names(self._exponent) | protocols.parameter_names(
             self._phase_exponent
@@ -176,12 +177,12 @@ class PhasedXPowGate(raw_types.Gate):
         """See `cirq.SupportsParameterization`."""
         phase_exponent = resolver.value_of(self._phase_exponent, recursive)
         exponent = resolver.value_of(self._exponent, recursive)
-        if isinstance(phase_exponent, numbers.Complex):
+        if not isinstance(phase_exponent, float) and isinstance(phase_exponent, numbers.Complex):
             if isinstance(phase_exponent, numbers.Real):
                 phase_exponent = float(phase_exponent)
             else:
                 raise ValueError(f'PhasedXPowGate does not support complex value {phase_exponent}')
-        if isinstance(exponent, numbers.Complex):
+        if not isinstance(exponent, float) and isinstance(exponent, numbers.Complex):
             if isinstance(exponent, numbers.Real):
                 exponent = float(exponent)
             else:

cirq/ops/phased_x_z_gate.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import numbers
-from typing import AbstractSet, Any, Iterator, Sequence, TYPE_CHECKING
+from collections.abc import Iterator, Sequence, Set
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 import sympy
@@ -140,6 +141,10 @@ class PhasedXZGate(raw_types.Gate):
         return self._axis_phase_exponent
 
     def _value_equality_values_(self):
+        if self._is_parameterized_():
+            # If this is parameterized, do not try to calculate the canonical exponents
+            # as this results in some slow sympy operations.
+            return (self._x_exponent, self._z_exponent, self._axis_phase_exponent)
         c = self._canonical()
         return (
             value.PeriodicValue(c._x_exponent, 2),
@@ -216,7 +221,7 @@ class PhasedXZGate(raw_types.Gate):
             or protocols.is_parameterized(self._axis_phase_exponent)
         )
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         """See `cirq.SupportsParameterization`."""
         return (
             protocols.parameter_names(self._x_exponent)
@@ -231,17 +236,19 @@ class PhasedXZGate(raw_types.Gate):
         z_exponent = resolver.value_of(self._z_exponent, recursive)
         x_exponent = resolver.value_of(self._x_exponent, recursive)
         axis_phase_exponent = resolver.value_of(self._axis_phase_exponent, recursive)
-        if isinstance(z_exponent, numbers.Complex):
+        if not isinstance(z_exponent, float) and isinstance(z_exponent, numbers.Complex):
             if isinstance(z_exponent, numbers.Real):
                 z_exponent = float(z_exponent)
             else:
                 raise ValueError(f'Complex exponent {z_exponent} not allowed in cirq.PhasedXZGate')
-        if isinstance(x_exponent, numbers.Complex):
+        if not isinstance(x_exponent, float) and isinstance(x_exponent, numbers.Complex):
             if isinstance(x_exponent, numbers.Real):
                 x_exponent = float(x_exponent)
             else:
                 raise ValueError(f'Complex exponent {x_exponent} not allowed in cirq.PhasedXZGate')
-        if isinstance(axis_phase_exponent, numbers.Complex):
+        if not isinstance(axis_phase_exponent, float) and isinstance(
+            axis_phase_exponent, numbers.Complex
+        ):
             if isinstance(axis_phase_exponent, numbers.Real):
                 axis_phase_exponent = float(axis_phase_exponent)
             else:

cirq/ops/projector.py

@@ -4,7 +4,8 @@ from __future__ import annotations
 
 import itertools
 import math
-from typing import Any, Iterable, Mapping, TYPE_CHECKING
+from collections.abc import Iterable, Mapping
+from typing import Any, TYPE_CHECKING
 
 import numpy as np
 from scipy.sparse import csr_matrix

cirq/ops/qubit_manager.py

@@ -16,7 +16,8 @@ from __future__ import annotations
 
 import abc
 import dataclasses
-from typing import Iterable, TYPE_CHECKING
+from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from cirq.ops import raw_types
 

cirq/ops/qubit_order.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, Iterable, TYPE_CHECKING, TypeVar
+from collections.abc import Callable, Iterable
+from typing import Any, TYPE_CHECKING, TypeVar
 
 if TYPE_CHECKING:
     import cirq

cirq/ops/qubit_order_or_list.py

@@ -20,7 +20,7 @@ mypy.
 
 from __future__ import annotations
 
-from typing import Iterable
+from collections.abc import Iterable
 
 from cirq._doc import document
 from cirq.ops import qubit_order, raw_types

cirq/ops/random_gate_channel.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import numbers
-from typing import AbstractSet, Any, cast, SupportsFloat, TYPE_CHECKING
+from collections.abc import Set
+from typing import Any, cast, SupportsFloat, TYPE_CHECKING
 
 import numpy as np
 
@@ -74,7 +75,7 @@ class RandomGateChannel(raw_types.Gate):
             self.sub_gate
         )
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self.probability) | protocols.parameter_names(
             self.sub_gate
         )