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

cirq/transformers/transformer_primitives_test.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Iterator
+from collections.abc import Iterator
 
 import pytest
 
@@ -877,3 +877,187 @@ def test_merge_operations_does_not_merge_measurements_behind_ccos():
     cirq.testing.assert_same_circuits(
         cirq.align_left(cirq.merge_operations(circuit, merge_func)), expected_circuit
     )
+
+
+def test_merge_3q_unitaries_to_circuit_op_3q_gate_absorbs_overlapping_2q_gates():
+    q = cirq.LineQubit.range(3)
+    c_orig = cirq.Circuit(
+        cirq.Moment(
+            cirq.H(q[0]).with_tags("ignore"),
+            cirq.H(q[1]).with_tags("ignore"),
+            cirq.H(q[2]).with_tags("ignore"),
+        ),
+        cirq.Moment(cirq.CNOT(q[0], q[2]), cirq.X(q[1]).with_tags("ignore")),
+        cirq.CNOT(q[0], q[1]),
+        cirq.CNOT(q[1], q[2]),
+        cirq.CCZ(*q),
+        strategy=cirq.InsertStrategy.NEW,
+    )
+    cirq.testing.assert_has_diagram(
+        c_orig,
+        '''
+                  ┌──────────┐
+0: ───H[ignore]────@─────────────@───────@───
+                   │             │       │
+1: ───H[ignore]────┼X[ignore]────X───@───@───
+                   │                 │   │
+2: ───H[ignore]────X─────────────────X───@───
+                  └──────────┘
+''',
+    )
+
+    c_new = cirq.merge_k_qubit_unitaries_to_circuit_op(
+        c_orig, k=3, merged_circuit_op_tag="merged", tags_to_ignore=["ignore"]
+    )
+    cirq.testing.assert_has_diagram(
+        cirq.drop_empty_moments(c_new),
+        '''
+                              [ 0: ───@───@───────@─── ]
+                              [       │   │       │    ]
+0: ───H[ignore]───────────────[ 1: ───┼───X───@───@─── ]───────────
+                              [       │       │   │    ]
+                              [ 2: ───X───────X───@─── ][merged]
+                              │
+1: ───H[ignore]───X[ignore]───#2───────────────────────────────────
+                              │
+2: ───H[ignore]───────────────#3───────────────────────────────────
+''',
+    )
+
+
+def test_merge_3q_unitaries_to_circuit_op_3q_gate_absorbs_disjoint_gates():
+    q = cirq.LineQubit.range(3)
+    c_orig = cirq.Circuit(
+        cirq.Moment(cirq.CNOT(q[0], q[1]), cirq.X(q[2])),
+        cirq.CCZ(*q),
+        strategy=cirq.InsertStrategy.NEW,
+    )
+    cirq.testing.assert_has_diagram(
+        c_orig,
+        '''
+0: ───@───@───
+      │   │
+1: ───X───@───
+          │
+2: ───X───@───
+''',
+    )
+
+    c_new = cirq.merge_k_qubit_unitaries_to_circuit_op(
+        c_orig, k=3, merged_circuit_op_tag="merged", tags_to_ignore=["ignore"]
+    )
+    cirq.testing.assert_has_diagram(
+        cirq.drop_empty_moments(c_new),
+        '''
+      [ 0: ───@───@─── ]
+      [       │   │    ]
+0: ───[ 1: ───X───@─── ]───────────
+      [           │    ]
+      [ 2: ───X───@─── ][merged]
+      │
+1: ───#2───────────────────────────
+      │
+2: ───#3───────────────────────────
+''',
+    )
+
+
+def test_merge_3q_unitaries_to_circuit_op_3q_gate_doesnt_absorb_unmergeable_gate():
+    q = cirq.LineQubit.range(3)
+    c_orig = cirq.Circuit(
+        cirq.CCZ(*q),
+        cirq.Moment(cirq.CNOT(q[0], q[1]), cirq.X(q[2]).with_tags("ignore")),
+        cirq.CCZ(*q),
+        strategy=cirq.InsertStrategy.NEW,
+    )
+    cirq.testing.assert_has_diagram(
+        c_orig,
+        '''
+0: ───@───@───────────@───
+      │   │           │
+1: ───@───X───────────@───
+      │               │
+2: ───@───X[ignore]───@───
+''',
+    )
+
+    c_new = cirq.merge_k_qubit_unitaries_to_circuit_op(
+        c_orig, k=3, merged_circuit_op_tag="merged", tags_to_ignore=["ignore"]
+    )
+    cirq.testing.assert_has_diagram(
+        cirq.drop_empty_moments(c_new),
+        '''
+      [ 0: ───@───@─── ]
+      [       │   │    ]
+0: ───[ 1: ───@───X─── ]───────────────────────@───
+      [       │        ]                       │
+      [ 2: ───@─────── ][merged]               │
+      │                                        │
+1: ───#2───────────────────────────────────────@───
+      │                                        │
+2: ───#3───────────────────────────X[ignore]───@───
+''',
+    )
+
+
+def test_merge_3q_unitaries_to_circuit_op_prefer_to_merge_into_earlier_op():
+    q = cirq.LineQubit.range(6)
+    c_orig = cirq.Circuit(
+        cirq.Moment(
+            cirq.CCZ(*q[0:3]), cirq.X(q[3]), cirq.H(q[4]), cirq.H(q[5]).with_tags("ignore")
+        ),
+        cirq.Moment(cirq.CNOT(q[0], q[1]), cirq.X(q[2]).with_tags("ignore"), cirq.CCZ(*q[3:6])),
+        cirq.Moment(
+            cirq.X(q[0]),
+            cirq.X(q[1]),
+            cirq.X(q[2]),
+            cirq.X(q[3]).with_tags("ignore"),
+            cirq.CNOT(*q[4:6]),
+        ),
+        cirq.Moment(cirq.CCZ(*q[0:3]), cirq.CCZ(*q[3:6])),
+        strategy=cirq.InsertStrategy.NEW,
+    )
+    cirq.testing.assert_has_diagram(
+        c_orig,
+        '''
+0: ───@───────────@───────────X───────────@───
+      │           │                       │
+1: ───@───────────X───────────X───────────@───
+      │                                   │
+2: ───@───────────X[ignore]───X───────────@───
+
+3: ───X───────────@───────────X[ignore]───@───
+                  │                       │
+4: ───H───────────@───────────@───────────@───
+                  │           │           │
+5: ───H[ignore]───@───────────X───────────@───
+''',
+    )
+
+    c_new = cirq.merge_k_qubit_unitaries_to_circuit_op(
+        c_orig, k=3, merged_circuit_op_tag="merged", tags_to_ignore=["ignore"]
+    )
+    cirq.testing.assert_has_diagram(
+        cirq.drop_empty_moments(c_new),
+        '''
+      [ 0: ───@───@───X─── ]                                                        [ 0: ───────@─── ]
+      [       │   │        ]                                                        [           │    ]
+0: ───[ 1: ───@───X───X─── ]────────────────────────────────────────────────────────[ 1: ───────@─── ]───────────
+      [       │            ]                                                        [           │    ]
+      [ 2: ───@─────────── ][merged]                                                [ 2: ───X───@─── ][merged]
+      │                                                                             │
+1: ───#2────────────────────────────────────────────────────────────────────────────#2───────────────────────────
+      │                                                                             │
+2: ───#3───────────────────────────────X[ignore]────────────────────────────────────#3───────────────────────────
+
+                                       [ 3: ───X───@─────── ]
+                                       [           │        ]
+3: ────────────────────────────────────[ 4: ───H───@───@─── ]───────────X[ignore]───@────────────────────────────
+                                       [           │   │    ]                       │
+                                       [ 5: ───────@───X─── ][merged]               │
+                                       │                                            │
+4: ────────────────────────────────────#2───────────────────────────────────────────@────────────────────────────
+                                       │                                            │
+5: ───H[ignore]────────────────────────#3───────────────────────────────────────────@────────────────────────────
+''',  # noqa: E501
+    )

cirq/value/abc_alt.py

@@ -18,7 +18,8 @@ from __future__ import annotations
 
 import abc
 import functools
-from typing import Callable, cast, TypeVar
+from collections.abc import Callable
+from typing import cast, TypeVar
 
 T = TypeVar('T')
 

cirq/value/classical_data.py

@@ -16,7 +16,8 @@ from __future__ import annotations
 
 import abc
 import enum
-from typing import Mapping, Self, Sequence, TYPE_CHECKING
+from collections.abc import Mapping, Sequence
+from typing import Self, TYPE_CHECKING
 
 from cirq.value import digits, value_equality_attr
 

cirq/value/condition.py

@@ -16,7 +16,8 @@ from __future__ import annotations
 
 import abc
 import dataclasses
-from typing import Any, Mapping, TYPE_CHECKING
+from collections.abc import Mapping
+from typing import Any, TYPE_CHECKING
 
 import attrs
 import sympy

cirq/value/digits.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterable, overload
+from collections.abc import Iterable
+from typing import Any, overload
 
 
 def big_endian_bits_to_int(bits: Iterable[Any]) -> int:
@@ -168,6 +169,11 @@ def big_endian_int_to_digits(
         >>> cirq.big_endian_int_to_digits(11, base=[2, 3, 4])
         [0, 2, 3]
     """
+    if digit_count and base == 2:
+        binary_chars = bin(val).removeprefix('0b')
+        zeros_count = digit_count - len(binary_chars)
+        if zeros_count >= 0:
+            return [0] * zeros_count + [1 if c == "1" else 0 for c in binary_chars]
     if isinstance(base, int):
         if digit_count is None:
             raise ValueError('No digit count. Provide `digit_count` when base is an int.')
@@ -192,4 +198,5 @@ def big_endian_int_to_digits(
             f'left behind {val!r} instead of 0.'
         )
 
-    return result[::-1]
+    result.reverse()
+    return result

cirq/value/duration.py

@@ -17,7 +17,8 @@
 from __future__ import annotations
 
 import datetime
-from typing import AbstractSet, Any, TYPE_CHECKING, TypeAlias, Union
+from collections.abc import Set
+from typing import Any, TYPE_CHECKING, TypeAlias, Union
 
 import numpy as np
 import sympy
@@ -84,21 +85,21 @@ class Duration:
         """
         self._time_vals: list[_NUMERIC_INPUT_TYPE] = [0, 0, 0, 0]
         self._multipliers = [1, 1000, 1000_000, 1000_000_000]
-        if value is not None and value != 0:
+        if value is not None:
             if isinstance(value, datetime.timedelta):
                 # timedelta has microsecond resolution.
                 self._time_vals[2] = int(value / datetime.timedelta(microseconds=1))
             elif isinstance(value, Duration):
                 self._time_vals = value._time_vals
-            else:
+            elif value != 0:
                 raise TypeError(f'Not a `cirq.DURATION_LIKE`: {repr(value)}.')
         input_vals = [picos, nanos, micros, millis]
         self._time_vals = _add_time_vals(self._time_vals, input_vals)
 
     def _is_parameterized_(self) -> bool:
-        return protocols.is_parameterized(self._time_vals)
+        return any(isinstance(val, sympy.Basic) for val in self._time_vals)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return protocols.parameter_names(self._time_vals)
 
     def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> Duration:

cirq/value/linear_dict.py

@@ -16,23 +16,18 @@
 
 from __future__ import annotations
 
-from typing import (
-    AbstractSet,
-    Any,
+from collections.abc import (
     Callable,
-    Generic,
     ItemsView,
     Iterable,
     Iterator,
     KeysView,
     Mapping,
     MutableMapping,
-    overload,
-    Self,
-    TYPE_CHECKING,
-    TypeVar,
+    Set,
     ValuesView,
 )
+from typing import Any, Generic, overload, Self, TYPE_CHECKING, TypeVar
 
 import numpy as np
 import sympy
@@ -344,7 +339,7 @@ class LinearDict(Generic[TVector], MutableMapping[TVector, 'cirq.TParamValComple
     def _is_parameterized_(self) -> bool:
         return any(protocols.is_parameterized(v) for v in self._terms.values())
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         return set(name for v in self._terms.values() for name in protocols.parameter_names(v))
 
     def _resolve_parameters_(self, resolver: cirq.ParamResolver, recursive: bool) -> LinearDict:

cirq/value/measurement_key.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Any, Mapping
+from collections.abc import Mapping
+from typing import Any
 
 MEASUREMENT_KEY_SEPARATOR = ':'
 

cirq/value/periodic_value.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import AbstractSet, Any, TYPE_CHECKING
+from collections.abc import Set
+from typing import Any, TYPE_CHECKING
 
 import sympy
 
@@ -95,7 +96,7 @@ class PeriodicValue:
 
         return is_parameterized(self.value) or is_parameterized(self.period)
 
-    def _parameter_names_(self) -> AbstractSet[str]:
+    def _parameter_names_(self) -> Set[str]:
         # HACK: Avoids circular dependencies.
         from cirq.protocols import parameter_names
 

cirq/value/product_state.py

@@ -15,8 +15,9 @@
 from __future__ import annotations
 
 import abc
+from collections.abc import Iterator, Sequence
 from dataclasses import dataclass
-from typing import Iterator, Sequence, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 import numpy as np
 

cirq/value/value_equality_attr.py

@@ -16,7 +16,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, overload, Protocol
+from collections.abc import Callable
+from typing import Any, overload, Protocol
 
 from cirq import _compat, protocols
 

cirq/vis/density_matrix.py

@@ -84,7 +84,7 @@ def plot_density_matrix(
     show_text: bool = False,
     title: str | None = None,
 ) -> plt.Axes:
-    """Generates a plot for a given density matrix.
+    r"""Generates a plot for a given density matrix.
 
     1. Each entry of the density matrix, a complex number, is plotted as an
     Argand Diagram where the partially filled red circle represents the magnitude

cirq/vis/heatmap.py

@@ -15,8 +15,9 @@
 from __future__ import annotations
 
 import copy
+from collections.abc import Mapping, Sequence
 from dataclasses import astuple, dataclass
-from typing import Any, cast, Mapping, overload, Sequence, SupportsFloat
+from typing import Any, cast, overload, SupportsFloat
 
 import matplotlib as mpl
 import matplotlib.collections as mpl_collections

cirq/vis/histogram.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Mapping, Sequence, SupportsFloat
+from collections.abc import Mapping, Sequence
+from typing import Any, SupportsFloat
 
 import numpy as np
 from matplotlib import pyplot as plt

cirq/vis/state_histogram.py

@@ -17,7 +17,8 @@
 from __future__ import annotations
 
 import collections
-from typing import Sequence, SupportsFloat
+from collections.abc import Sequence
+from typing import SupportsFloat
 
 import matplotlib.pyplot as plt
 import numpy as np

cirq/work/collector.py

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

cirq/work/observable_grouping.py

@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Callable, cast, Iterable
+from collections.abc import Callable, Iterable
+from typing import cast
 
 from cirq import ops, value
 from cirq.work.observable_settings import _max_weight_observable, _max_weight_state, InitObsSetting

cirq/work/observable_measurement.py

@@ -20,7 +20,8 @@ import itertools
 import os
 import tempfile
 import warnings
-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
 import pandas as pd

cirq/work/observable_measurement_data.py

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

cirq/work/observable_measurement_test.py

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

cirq/work/observable_readout_calibration.py

@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Iterable, TYPE_CHECKING
+from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from cirq import circuits, ops, study
 from cirq.work.observable_measurement import measure_grouped_settings, StoppingCriteria

cirq/work/observable_readout_calibration_test.py

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

cirq/work/observable_settings.py

@@ -16,7 +16,8 @@ from __future__ import annotations
 
 import dataclasses
 import numbers
-from typing import Iterable, Mapping, TYPE_CHECKING
+from collections.abc import Iterable, Mapping
+from typing import TYPE_CHECKING
 
 import sympy
 

cirq/work/sampler.py

@@ -17,7 +17,8 @@
 from __future__ import annotations
 
 import collections
-from typing import Sequence, TYPE_CHECKING, TypeVar
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, TypeVar
 
 import duet
 import pandas as pd

cirq/work/sampler_test.py

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

{cirq_core-1.7.0.dev20250924231107.dist-info → cirq_core-1.7.0.dev20251203004401.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cirq-core
-Version: 1.7.0.dev20250924231107
+Version: 1.7.0.dev20251203004401
 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
@@ -28,10 +28,10 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: attrs>=21.3.0
 Requires-Dist: duet>=0.2.8
-Requires-Dist: matplotlib~=3.8
+Requires-Dist: matplotlib~=3.9
 Requires-Dist: networkx~=3.4
-Requires-Dist: numpy>=1.26
-Requires-Dist: pandas~=2.1
+Requires-Dist: numpy~=2.0
+Requires-Dist: pandas~=2.2
 Requires-Dist: sortedcontainers~=2.0
 Requires-Dist: scipy~=1.12
 Requires-Dist: sympy