cirq-core 1.5.0.dev20241028183905__py3-none-any.whl → 1.5.0.dev20241030184510__py3-none-any.whl

cirq/_version.py

@@ -28,4 +28,4 @@ if sys.version_info < (3, 10, 0):  # pragma: no cover
         'of cirq (e.g. "python -m pip install cirq==1.1.*")'
     )
 
-__version__ = "1.5.0.dev20241028183905"
+__version__ = "1.5.0.dev20241030184510"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version():
-    assert cirq.__version__ == "1.5.0.dev20241028183905"
+    assert cirq.__version__ == "1.5.0.dev20241030184510"

cirq/transformers/__init__.py

@@ -148,3 +148,8 @@ from cirq.transformers.gauge_compiling import (
 from cirq.transformers.randomized_measurements import (
     RandomizedMeasurements as RandomizedMeasurements,
 )
+
+
+from cirq.transformers.insertion_sort import (
+    insertion_sort_transformer as insertion_sort_transformer,
+)

cirq/transformers/insertion_sort.py

@@ -0,0 +1,64 @@
+# Copyright 2024 The Cirq Developers
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Transformer that sorts commuting operations in increasing order of their `.qubits` tuple."""
+
+from typing import Dict, List, Optional, TYPE_CHECKING
+
+from cirq import protocols, circuits
+from cirq.transformers import transformer_api
+
+if TYPE_CHECKING:
+    import cirq
+
+
+@transformer_api.transformer(add_deep_support=True)
+def insertion_sort_transformer(
+    circuit: 'cirq.AbstractCircuit', *, context: Optional['cirq.TransformerContext'] = None
+) -> 'cirq.Circuit':
+    """Sorts the operations using their sorted `.qubits` property as comparison key.
+
+    Operations are swapped only if they commute.
+
+    Args:
+        circuit: input circuit.
+        context: optional TransformerContext (not used),
+    """
+    final_operations: List['cirq.Operation'] = []
+    qubit_index: Dict['cirq.Qid', int] = {
+        q: idx for idx, q in enumerate(sorted(circuit.all_qubits()))
+    }
+    cached_qubit_indices: Dict[int, List[int]] = {}
+    for pos, op in enumerate(circuit.all_operations()):
+        # here `pos` is at the append position of final_operations
+        if (op_qubit_indices := cached_qubit_indices.get(id(op))) is None:
+            op_qubit_indices = cached_qubit_indices[id(op)] = sorted(
+                qubit_index[q] for q in op.qubits
+            )
+        for tail_op in reversed(final_operations):
+            tail_qubit_indices = cached_qubit_indices[id(tail_op)]
+            if op_qubit_indices < tail_qubit_indices and (
+                # special case for zero-qubit gates
+                not op_qubit_indices
+                # check if two sorted sequences are disjoint
+                or op_qubit_indices[-1] < tail_qubit_indices[0]
+                or set(op_qubit_indices).isdisjoint(tail_qubit_indices)
+                # fallback to more expensive commutation check
+                or protocols.commutes(op, tail_op, default=False)
+            ):
+                pos -= 1
+                continue
+            break
+        final_operations.insert(pos, op)
+    return circuits.Circuit(final_operations)

cirq/transformers/insertion_sort_test.py

@@ -0,0 +1,34 @@
+# Copyright 2024 The Cirq Developers
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import cirq
+import cirq.transformers
+
+
+def test_insertion_sort():
+    c = cirq.Circuit(
+        cirq.CZ(cirq.q(2), cirq.q(1)),
+        cirq.CZ(cirq.q(2), cirq.q(4)),
+        cirq.CZ(cirq.q(0), cirq.q(1)),
+        cirq.CZ(cirq.q(2), cirq.q(1)),
+        cirq.GlobalPhaseGate(1j).on(),
+    )
+    sorted_circuit = cirq.transformers.insertion_sort_transformer(c)
+    assert sorted_circuit == cirq.Circuit(
+        cirq.GlobalPhaseGate(1j).on(),
+        cirq.CZ(cirq.q(0), cirq.q(1)),
+        cirq.CZ(cirq.q(2), cirq.q(1)),
+        cirq.CZ(cirq.q(2), cirq.q(1)),
+        cirq.CZ(cirq.q(2), cirq.q(4)),
+    )

cirq/transformers/target_gatesets/compilation_target_gateset.py

@@ -86,6 +86,7 @@ class CompilationTargetGateset(ops.Gateset, metaclass=abc.ABCMeta):
         name: Optional[str] = None,
         unroll_circuit_op: bool = True,
         preserve_moment_structure: bool = True,
+        reorder_operations: bool = False,
     ):
         """Initializes CompilationTargetGateset.
 
@@ -97,9 +98,18 @@ class CompilationTargetGateset(ops.Gateset, metaclass=abc.ABCMeta):
                 validated by validating the underlying `cirq.Circuit`.
             preserve_moment_structure: Whether to preserve the moment structure of the
                 circuit during compilation or not.
+            reorder_operations: Whether to attempt to reorder the operations in order to reduce
+                circuit depth or not (can be True only if preserve_moment_structure=False).
+        Raises:
+            ValueError: If both reorder_operations and preserve_moment_structure are True.
         """
+        if reorder_operations and preserve_moment_structure:
+            raise ValueError(
+                'reorder_operations and preserve_moment_structure can not both be True'
+            )
         super().__init__(*gates, name=name, unroll_circuit_op=unroll_circuit_op)
         self._preserve_moment_structure = preserve_moment_structure
+        self._reorder_operations = reorder_operations
 
     @property
     @abc.abstractmethod
@@ -146,11 +156,15 @@ class CompilationTargetGateset(ops.Gateset, metaclass=abc.ABCMeta):
     @property
     def preprocess_transformers(self) -> List['cirq.TRANSFORMER']:
         """List of transformers which should be run before decomposing individual operations."""
+        reorder_transfomers = (
+            [transformers.insertion_sort_transformer] if self._reorder_operations else []
+        )
         return [
             create_transformer_with_kwargs(
                 transformers.expand_composite,
                 no_decomp=lambda op: protocols.num_qubits(op) <= self.num_qubits,
             ),
+            *reorder_transfomers,
             create_transformer_with_kwargs(
                 merge_k_qubit_gates.merge_k_qubit_unitaries,
                 k=self.num_qubits,

cirq/transformers/target_gatesets/cz_gateset.py

@@ -49,6 +49,7 @@ class CZTargetGateset(compilation_target_gateset.TwoQubitCompilationTargetGatese
         allow_partial_czs: bool = False,
         additional_gates: Sequence[Union[Type['cirq.Gate'], 'cirq.Gate', 'cirq.GateFamily']] = (),
         preserve_moment_structure: bool = True,
+        reorder_operations: bool = False,
     ) -> None:
         """Initializes CZTargetGateset
 
@@ -60,6 +61,8 @@ class CZTargetGateset(compilation_target_gateset.TwoQubitCompilationTargetGatese
               be "accepted" by this gateset. This is empty by default.
             preserve_moment_structure: Whether to preserve the moment structure of the
                 circuit during compilation or not.
+            reorder_operations: Whether to attempt to reorder the operations in order to reduce
+                circuit depth or not (can be True only if preserve_moment_structure=False).
         """
         super().__init__(
             ops.CZPowGate if allow_partial_czs else ops.CZ,
@@ -69,6 +72,7 @@ class CZTargetGateset(compilation_target_gateset.TwoQubitCompilationTargetGatese
             *additional_gates,
             name='CZPowTargetGateset' if allow_partial_czs else 'CZTargetGateset',
             preserve_moment_structure=preserve_moment_structure,
+            reorder_operations=reorder_operations,
         )
         self.additional_gates = tuple(
             g if isinstance(g, ops.GateFamily) else ops.GateFamily(gate=g) for g in additional_gates

cirq/transformers/target_gatesets/cz_gateset_test.py

@@ -319,3 +319,22 @@ def test_unsupported_gate():
 )
 def test_repr(gateset):
     cirq.testing.assert_equivalent_repr(gateset)
+
+
+def test_with_commutation():
+    c = cirq.Circuit(
+        cirq.CZ(cirq.q(0), cirq.q(1)), cirq.CZ(cirq.q(1), cirq.q(2)), cirq.CZ(cirq.q(0), cirq.q(1))
+    )
+    got = cirq.optimize_for_target_gateset(
+        c,
+        gateset=cirq.CZTargetGateset(preserve_moment_structure=False, reorder_operations=True),
+        max_num_passes=1,
+    )
+    assert got == cirq.Circuit(cirq.CZ(cirq.q(1), cirq.q(2)))
+
+
+def test_reorder_operations_and_preserve_moment_structure_raises():
+    with pytest.raises(
+        ValueError, match='reorder_operations and preserve_moment_structure can not both be True'
+    ):
+        _ = cirq.CZTargetGateset(preserve_moment_structure=True, reorder_operations=True)

{cirq_core-1.5.0.dev20241028183905.dist-info → cirq_core-1.5.0.dev20241030184510.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cirq-core
-Version: 1.5.0.dev20241028183905
+Version: 1.5.0.dev20241030184510
 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

{cirq_core-1.5.0.dev20241028183905.dist-info → cirq_core-1.5.0.dev20241030184510.dist-info}/RECORD

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=Qq3ZcfgD-Nb81cEppQdJqhAyrVqXKtfXZYGXT0p-Wh0,34718
 cirq/_doc.py,sha256=yDyWUD_2JDS0gShfGRb-rdqRt9-WeL7DhkqX7np0Nko,2879
 cirq/_import.py,sha256=p9gMHJscbtDDkfHOaulvd3Aer0pwUF5AXpL89XR8dNw,8402
 cirq/_import_test.py,sha256=6K_v0riZJXOXUphHNkGA8MY-JcmGlezFaGmvrNhm3OQ,1015
-cirq/_version.py,sha256=3IiIATzwlV1upJzvXw0UZy6fu4n_YeB_8p-bCzR00QM,1206
-cirq/_version_test.py,sha256=94XwthEQxZNTDejp24Nne93gtOLGxV1KNift0jGwsjs,147
+cirq/_version.py,sha256=cGjYAFK1kb_f_bComEY-4kxVfz8DTK4e4tLZSeN7Dqg,1206
+cirq/_version_test.py,sha256=AvbtaK4AQENKcY0yl9MG11qtXwI3xDTsRJxXm7S5I5c,147
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=ytePZtNZgKjOF2NiVpUTuotB-JKZmQNOFIFdvXqsxHw,13271
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -1022,7 +1022,7 @@ cirq/testing/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 cirq/testing/test_data/test_module_missing_json_test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cirq/testing/test_data/test_module_missing_testspec/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cirq/testing/test_data/test_module_missing_testspec/json_test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cirq/transformers/__init__.py,sha256=b_RQ5kTwwMeHFGSdBMNLDjjtaOJ0Oqb526XZN8WTgM4,6792
+cirq/transformers/__init__.py,sha256=QjYovkmQHRi7D6nPHkWrszVBM_1__thvOXG4wcYvX_E,6905
 cirq/transformers/align.py,sha256=B4DuX84DWd4tLfMH21JviMZSOFYu7KCOMSEMALYsQpw,2727
 cirq/transformers/align_test.py,sha256=M4etT2cgESv1RdkKASguiGxEuqY7kmI1IswjSi-1jjY,7174
 cirq/transformers/drop_empty_moments.py,sha256=Rtn_BrpwkLXyZBdLzwdnsnEGWTdYuf1xOPakzbpv7-w,1517
@@ -1037,6 +1037,8 @@ cirq/transformers/eject_z.py,sha256=d53z1siUVCPrtNbPls6_RSujz6d2gF77_AQAWhnJmVM,
 cirq/transformers/eject_z_test.py,sha256=U0BMdW6nW1cI18I5tE__1YpCvtzDwYGECgqUph5Fc8I,13302
 cirq/transformers/expand_composite.py,sha256=nASRoP4qfjsnX_t2a2hBw8BE7B_JD-0XLGIIXxbIdbc,2387
 cirq/transformers/expand_composite_test.py,sha256=4Gn6LVqr0DeuUumde80O4esOLGIoo86_S_Mk-HwnMfk,8640
+cirq/transformers/insertion_sort.py,sha256=cAwseOcAdBFoPlP8F45B_XP8ySGmkPHn0EftTVVsF9Q,2612
+cirq/transformers/insertion_sort_test.py,sha256=q81tMHSmlxTRqznkfgIGxanF-1fX8GclopAHTaF6yHs,1187
 cirq/transformers/measurement_transformers.py,sha256=m2v4FAEaIZtYXEh-rFzxa_sx-syqdWZmCbf6yar0GSM,19035
 cirq/transformers/measurement_transformers_test.py,sha256=tkuevHQWnFWmxmvfJZ2T42uCIw4oaYyZ4XvjRGFGdug,27504
 cirq/transformers/merge_k_qubit_gates.py,sha256=dUsswQOIHfbb6Lu37fecgrpT6_45zmDE7eqCUbW1KOI,4390
@@ -1118,10 +1120,10 @@ cirq/transformers/routing/route_circuit_cqc_test.py,sha256=gKGIBwftHR6CkUGdZ5z8t
 cirq/transformers/routing/visualize_routed_circuit.py,sha256=cKYvswXnNIQJ0Okketzkpy9Tw0Z_Y2DaG4cJmK9ouHY,2917
 cirq/transformers/routing/visualize_routed_circuit_test.py,sha256=L3IJ0UdyVg8cBIULjG5kcjWoTmKee9Sr_MHkyJwcopA,4140
 cirq/transformers/target_gatesets/__init__.py,sha256=q7v9KTCXZ8OyWUy89xBM4hp5b-M2hbXMyS3SYFJ0wGQ,1143
-cirq/transformers/target_gatesets/compilation_target_gateset.py,sha256=-dqUX5nRU70ceM5jfDmadVYd8bAhqN3bxM7ZHMRRmnM,13537
+cirq/transformers/target_gatesets/compilation_target_gateset.py,sha256=8gh_-CRvfe_h9-p9YNcZ9mEuVdqZ9BLEALeU05wcp9c,14287
 cirq/transformers/target_gatesets/compilation_target_gateset_test.py,sha256=_M8R9n8vklqlCHesokcNINDGTTLx22TIa4tVLQNswoE,9482
-cirq/transformers/target_gatesets/cz_gateset.py,sha256=5YJVD0uyb6w848_x8Qg5nLYMKyylyWmgDBNtm725oAU,4750
-cirq/transformers/target_gatesets/cz_gateset_test.py,sha256=M5rhQPt2XGrX26cvyknTIFGLBqa2jPgg4D0z8rhFogU,10584
+cirq/transformers/target_gatesets/cz_gateset.py,sha256=qN-TvRzQmTziafHwAQm6P8nqSO_b-b4nMpK8qqjhWt8,5031
+cirq/transformers/target_gatesets/cz_gateset_test.py,sha256=PvdIYSFtEA8FXYm4ZwdNk1RaQIa0rtTImjjH-6YbmDI,11277
 cirq/transformers/target_gatesets/sqrt_iswap_gateset.py,sha256=Rtoi2xmhlk_fobf5Hwc1nDQlLtmKPcJm2FJTR8JgpN0,6278
 cirq/transformers/target_gatesets/sqrt_iswap_gateset_test.py,sha256=-Oi3b9oX-0_3U9SKAkijVO-uBy4ut4PrFnsx-yFJ9mU,14391
 cirq/value/__init__.py,sha256=gk5m8gFTJiNtiOxO3SjsidqKI5L8ZLhRxQyZCyjITqU,2899
@@ -1184,8 +1186,8 @@ cirq/work/sampler.py,sha256=rzimb1Zmqrdb0coOJhGf459KTUaFpAnIR2Vm0mt1_i8,20848
 cirq/work/sampler_test.py,sha256=0HoptI2r-7yR5hmlvu6ykqkZ8TYO-lkIVvlv8yyDnDk,14885
 cirq/work/zeros_sampler.py,sha256=x1C7cup66a43n-3tm8QjhiqJa07qcJW10FxNp9jJ59Q,2356
 cirq/work/zeros_sampler_test.py,sha256=JIkpBBFPJe5Ba4142vzogyWyboG1Q1ZAm0UVGgOoZn8,3279
-cirq_core-1.5.0.dev20241028183905.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.5.0.dev20241028183905.dist-info/METADATA,sha256=q8NRE1EH66sAQsVIeGnFzO6MhwEyIzJLArPfNqWT29Q,1992
-cirq_core-1.5.0.dev20241028183905.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-cirq_core-1.5.0.dev20241028183905.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.5.0.dev20241028183905.dist-info/RECORD,,
+cirq_core-1.5.0.dev20241030184510.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.5.0.dev20241030184510.dist-info/METADATA,sha256=8FnTTAd3YmYT07Z_zSjfsL5_Pnqz-YjQ_wnUp0m6QoM,1992
+cirq_core-1.5.0.dev20241030184510.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+cirq_core-1.5.0.dev20241030184510.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.5.0.dev20241030184510.dist-info/RECORD,,