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

cirq/contrib/acquaintance/optimizers.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import cast, Sequence, TYPE_CHECKING
+from collections.abc import Sequence
+from typing import cast, TYPE_CHECKING
 
 from cirq import circuits
 from cirq.contrib.acquaintance.executor import AcquaintanceOperation

cirq/contrib/acquaintance/permutation.py

@@ -15,8 +15,9 @@
 from __future__ import annotations
 
 import abc
+from collections.abc import Iterable, Iterator, Sequence
 from types import NotImplementedType
-from typing import Any, cast, Iterable, Iterator, Sequence, TYPE_CHECKING, TypeVar
+from typing import Any, cast, TYPE_CHECKING, TypeVar
 
 from cirq import circuits, ops, protocols, transformers, value
 

cirq/contrib/acquaintance/permutation_test.py

@@ -15,7 +15,7 @@
 from __future__ import annotations
 
 import random
-from typing import Iterator
+from collections.abc import Iterator
 
 import pytest
 

cirq/contrib/acquaintance/shift.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import itertools
-from typing import Any, Iterator, Sequence, TYPE_CHECKING
+from collections.abc import Iterator, Sequence
+from typing import Any, TYPE_CHECKING
 
 from cirq import ops, value
 from cirq.contrib.acquaintance.permutation import PermutationGate, SwapPermutationGate

cirq/contrib/acquaintance/shift_swap_network.py

@@ -16,7 +16,8 @@ from __future__ import annotations
 
 import functools
 import itertools
-from typing import Iterable, Iterator, Sequence, TYPE_CHECKING
+from collections.abc import Iterable, Iterator, Sequence
+from typing import TYPE_CHECKING
 
 from cirq import ops
 from cirq.contrib.acquaintance.gates import acquaint

cirq/contrib/acquaintance/strategies/complete.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 import circuits, ops
 from cirq.contrib.acquaintance.gates import acquaint
@@ -54,7 +55,7 @@ def complete_acquaintance_strategy(
     if acquaintance_size == len(qubit_order):
         return circuits.Circuit(acquaint(*qubit_order))
 
-    strategy = circuits.Circuit((acquaint(q) for q in qubit_order))
+    strategy = circuits.Circuit(acquaint(q) for q in qubit_order)
     for size_to_acquaint in range(2, acquaintance_size + 1):
         expose_acquaintance_gates(strategy)
         replace_acquaintance_with_swap_network(strategy, qubit_order, size_to_acquaint, swap_gate)

cirq/contrib/acquaintance/strategies/cubic.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import itertools
-from typing import Iterable, Sequence, TYPE_CHECKING, TypeVar
+from collections.abc import Iterable, Sequence
+from typing import TYPE_CHECKING, TypeVar
 
 from cirq import circuits, ops
 from cirq.contrib.acquaintance.gates import acquaint

cirq/contrib/acquaintance/strategies/quartic_paired.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import cast, Iterable, Sequence, TYPE_CHECKING
+from collections.abc import Iterable, Sequence
+from typing import cast, TYPE_CHECKING
 
 from cirq import circuits
 from cirq.contrib.acquaintance.gates import acquaint, SwapNetworkGate

cirq/contrib/acquaintance/strategies/quartic_paired_test.py

@@ -16,7 +16,7 @@ from __future__ import annotations
 
 import itertools
 import random
-from typing import Iterable
+from collections.abc import Iterable
 
 import pytest
 

cirq/contrib/acquaintance/testing.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import cast, Sequence, TYPE_CHECKING
+from collections.abc import Sequence
+from typing import cast, TYPE_CHECKING
 
 from cirq import devices, ops, protocols
 from cirq.contrib.acquaintance.permutation import PermutationGate, update_mapping

cirq/contrib/acquaintance/topological_sort.py

@@ -16,7 +16,8 @@ from __future__ import annotations
 
 import operator
 import random
-from typing import Any, Callable, cast, Iterable, TYPE_CHECKING
+from collections.abc import Callable, Iterable
+from typing import Any, cast, TYPE_CHECKING
 
 from cirq import ops
 

cirq/contrib/bayesian_network/bayesian_network_gate.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import math
-from typing import Any, cast, Iterator, Sequence, TYPE_CHECKING
+from collections.abc import Iterator, Sequence
+from typing import Any, cast, TYPE_CHECKING
 
 from sympy.combinatorics import GrayCode
 
@@ -70,7 +71,7 @@ def _generate_got_set_for_init_prob(qubit, init_prob):
         yield common_gates.ry(_prob_to_angle(init_prob)).on(qubit)
 
 
-@value.value_equality
+@value.value_equality(unhashable=True)
 class BayesianNetworkGate(raw_types.Gate):
     """A gate that represents a Bayesian network.
 

cirq/contrib/circuitdag/circuit_dag.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import functools
-from typing import Any, Callable, cast, Generic, Iterator, TypeVar
+from collections.abc import Callable, Iterator
+from typing import Any, cast, Generic, TypeVar
 
 import networkx
 
@@ -72,8 +73,9 @@ class CircuitDag(networkx.DiGraph):
 
     def __init__(
         self,
-        can_reorder: Callable[[cirq.Operation, cirq.Operation], bool] = _disjoint_qubits,
         incoming_graph_data: Any = None,
+        *,
+        can_reorder: Callable[[cirq.Operation, cirq.Operation], bool] = _disjoint_qubits,
     ) -> None:
         """Initializes a CircuitDag.
 

cirq/contrib/custom_simulators/custom_state_simulator.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Generic, Sequence, TYPE_CHECKING
+from collections.abc import Sequence
+from typing import Any, Generic, TYPE_CHECKING
 
 from cirq import sim
 from cirq.sim.simulation_state import TSimulationState

cirq/contrib/custom_simulators/custom_state_simulator_test.py

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

cirq/contrib/graph_device/graph_device.py

@@ -16,7 +16,8 @@ from __future__ import annotations
 
 import abc
 import itertools
-from typing import Any, cast, Hashable, Iterable, NoReturn, TYPE_CHECKING
+from collections.abc import Hashable, Iterable
+from typing import Any, cast, NoReturn, TYPE_CHECKING
 
 from cirq import devices, ops, value
 from cirq.contrib.graph_device.hypergraph import UndirectedHypergraph

cirq/contrib/graph_device/graph_device_test.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Hashable, Iterable
+from collections.abc import Hashable, Iterable
+from typing import Any
 
 import pytest
 

cirq/contrib/graph_device/hypergraph.py

@@ -16,7 +16,8 @@ from __future__ import annotations
 
 import itertools
 import random
-from typing import Any, Hashable, Iterable, Mapping
+from collections.abc import Hashable, Iterable, Mapping
+from typing import Any
 
 AdjacencyList = set[frozenset[Hashable]]
 

cirq/contrib/graph_device/uniform_graph_device.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Hashable, Iterable, Mapping
+from collections.abc import Hashable, Iterable, Mapping
+from typing import Any
 
 from cirq import devices, ops
 from cirq.contrib.graph_device.graph_device import UndirectedGraphDevice, UndirectedGraphDeviceEdge

cirq/contrib/json.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 
 import functools
 
+from cirq import _compat
 from cirq.protocols.json_serialization import _register_resolver, DEFAULT_RESOLVERS, ObjectFactory
 
 
@@ -39,6 +40,17 @@ def _class_resolver_dictionary() -> dict[str, ObjectFactory]:
     return {cls.__name__: cls for cls in classes}
 
 
-DEFAULT_CONTRIB_RESOLVERS = [contrib_class_resolver] + DEFAULT_RESOLVERS
-
 _register_resolver(_class_resolver_dictionary)
+
+DEFAULT_CONTRIB_RESOLVERS = [contrib_class_resolver, *DEFAULT_RESOLVERS]
+
+_compat.deprecate_attributes(
+    __name__,
+    {
+        'DEFAULT_CONTRIB_RESOLVERS': (
+            'v1.8',
+            'DEFAULT_CONTRIB_RESOLVERS is no longer necessary as contrib classes are now '
+            'automatically recognized and resolved with an import of cirq.contrib.',
+        )
+    },
+)

cirq/contrib/json_test_data/BayesianNetworkGate.json

@@ -0,0 +1,10 @@
+{
+  "cirq_type": "BayesianNetworkGate",
+  "init_probs": [
+    ["q0", 0.125],
+    ["q1", null]
+  ],
+  "arc_probs": [
+    ["q1", ["q0"], [0.25, 0.5]]
+  ]
+}

cirq/contrib/json_test_data/BayesianNetworkGate.repr

@@ -0,0 +1,3 @@
+cirq.contrib.bayesian_network.BayesianNetworkGate(
+    init_probs=[('q0', 0.125), ('q1', None)], arc_probs=[('q1', ('q0',), [0.25, 0.5])]
+)

cirq/contrib/json_test_data/QuantumVolumeResult.json

@@ -0,0 +1,169 @@
+{
+  "cirq_type": "QuantumVolumeResult",
+  "model_circuit": {
+    "cirq_type": "Circuit",
+    "moments": [
+      {
+        "cirq_type": "Moment",
+        "operations": [
+          {
+            "cirq_type": "GateOperation",
+            "gate": {
+              "cirq_type": "HPowGate",
+              "exponent": 1.0,
+              "global_shift": 0.0
+            },
+            "qubits": [
+              {
+                "cirq_type": "LineQubit",
+                "x": 0
+              }
+            ]
+          },
+          {
+            "cirq_type": "GateOperation",
+            "gate": {
+              "cirq_type": "HPowGate",
+              "exponent": 1.0,
+              "global_shift": 0.0
+            },
+            "qubits": [
+              {
+                "cirq_type": "LineQubit",
+                "x": 1
+              }
+            ]
+          },
+          {
+            "cirq_type": "GateOperation",
+            "gate": {
+              "cirq_type": "HPowGate",
+              "exponent": 1.0,
+              "global_shift": 0.0
+            },
+            "qubits": [
+              {
+                "cirq_type": "LineQubit",
+                "x": 2
+              }
+            ]
+          },
+          {
+            "cirq_type": "GateOperation",
+            "gate": {
+              "cirq_type": "HPowGate",
+              "exponent": 1.0,
+              "global_shift": 0.0
+            },
+            "qubits": [
+              {
+                "cirq_type": "LineQubit",
+                "x": 3
+              }
+            ]
+          },
+          {
+            "cirq_type": "GateOperation",
+            "gate": {
+              "cirq_type": "HPowGate",
+              "exponent": 1.0,
+              "global_shift": 0.0
+            },
+            "qubits": [
+              {
+                "cirq_type": "LineQubit",
+                "x": 4
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "heavy_set": [
+    1,
+    2,
+    3
+  ],
+  "compiled_circuit": {
+    "cirq_type": "Circuit",
+    "moments": [
+      {
+        "cirq_type": "Moment",
+        "operations": [
+          {
+            "cirq_type": "GateOperation",
+            "gate": {
+              "cirq_type": "HPowGate",
+              "exponent": 1.0,
+              "global_shift": 0.0
+            },
+            "qubits": [
+              {
+                "cirq_type": "LineQubit",
+                "x": 0
+              }
+            ]
+          },
+          {
+            "cirq_type": "GateOperation",
+            "gate": {
+              "cirq_type": "HPowGate",
+              "exponent": 1.0,
+              "global_shift": 0.0
+            },
+            "qubits": [
+              {
+                "cirq_type": "LineQubit",
+                "x": 1
+              }
+            ]
+          },
+          {
+            "cirq_type": "GateOperation",
+            "gate": {
+              "cirq_type": "HPowGate",
+              "exponent": 1.0,
+              "global_shift": 0.0
+            },
+            "qubits": [
+              {
+                "cirq_type": "LineQubit",
+                "x": 2
+              }
+            ]
+          },
+          {
+            "cirq_type": "GateOperation",
+            "gate": {
+              "cirq_type": "HPowGate",
+              "exponent": 1.0,
+              "global_shift": 0.0
+            },
+            "qubits": [
+              {
+                "cirq_type": "LineQubit",
+                "x": 3
+              }
+            ]
+          },
+          {
+            "cirq_type": "GateOperation",
+            "gate": {
+              "cirq_type": "HPowGate",
+              "exponent": 1.0,
+              "global_shift": 0.0
+            },
+            "qubits": [
+              {
+                "cirq_type": "LineQubit",
+                "x": 4
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "sampler_result": 0.1
+}

cirq/contrib/json_test_data/QuantumVolumeResult.repr

@@ -0,0 +1,22 @@
+cirq.contrib.quantum_volume.QuantumVolumeResult(
+    model_circuit=cirq.Circuit(
+        cirq.Moment(
+            cirq.H(cirq.LineQubit(0)),
+            cirq.H(cirq.LineQubit(1)),
+            cirq.H(cirq.LineQubit(2)),
+            cirq.H(cirq.LineQubit(3)),
+            cirq.H(cirq.LineQubit(4)),
+        )
+    ),
+    heavy_set=[1, 2, 3],
+    compiled_circuit=cirq.Circuit(
+        cirq.Moment(
+            cirq.H(cirq.LineQubit(0)),
+            cirq.H(cirq.LineQubit(1)),
+            cirq.H(cirq.LineQubit(2)),
+            cirq.H(cirq.LineQubit(3)),
+            cirq.H(cirq.LineQubit(4)),
+        )
+    ),
+    sampler_result=0.1,
+)

cirq/contrib/json_test_data/SwapPermutationGate.json

@@ -0,0 +1,3 @@
+{
+  "cirq_type": "SwapPermutationGate"
+}

cirq/contrib/json_test_data/SwapPermutationGate.repr

@@ -0,0 +1 @@
+cirq.contrib.acquaintance.SwapPermutationGate(swap_gate=cirq.SWAP)

cirq/contrib/json_test_data/spec.py

@@ -27,6 +27,4 @@ TestSpec = ModuleJsonTestSpec(
     should_not_be_serialized=["Unique", "CircuitDag"],
     resolver_cache=_class_resolver_dictionary(),
     deprecated={},
-    # TODO: #7520 - create .json and .repr for these so they can be tested here
-    tested_elsewhere=["QuantumVolumeResult", "SwapPermutationGate", "BayesianNetworkGate"],
 )

cirq/contrib/noise_models/noise_models.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 import circuits, devices, ops, value
 from cirq.devices.noise_model import validate_all_measurements

cirq/contrib/paulistring/clifford_optimize.py

@@ -21,8 +21,26 @@ from cirq.contrib.paulistring.clifford_target_gateset import CliffordTargetGates
 
 
 def clifford_optimized_circuit(circuit: circuits.Circuit, atol: float = 1e-8) -> circuits.Circuit:
-    # Convert to a circuit with SingleQubitCliffordGates,
-    # CZs and other ignored gates
+    """Optimizes a circuit composed of Clifford and CZ gates.
+
+    This function attempts to simplify a circuit by finding local optimizations.
+    It works in two stages:
+    1.  It converts the circuit to a target gateset consisting of
+        `cirq.SingleQubitCliffordGate` and `cirq.CZPowGate` gates.
+    2.  It then iterates through the circuit, applying the following rules:
+        -   Merges adjacent single-qubit Clifford gates.
+        -   Commutes single-qubit Clifford gates past CZ gates, attempting to
+            merge them with other single-qubit Clifford gates.
+        -   Cancels pairs of identical CZ gates.
+
+    Args:
+        circuit: The circuit to optimize.
+        atol: A limit on the amount of absolute error introduced by the decomposition.
+
+    Returns:
+        The optimized circuit.
+    """
+    # Convert to a circuit with SingleQubitCliffordGates, CZs and other ignored gates.
     c_cliff = transformers.optimize_for_target_gateset(
         circuit, gateset=CliffordTargetGateset(atol=atol)
     )

cirq/contrib/paulistring/optimize.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Callable
+from collections.abc import Callable
 
 from cirq import circuits, ops, transformers
 from cirq.contrib.paulistring.clifford_optimize import clifford_optimized_circuit