cirq-core 1.2.0.dev20230629203543__py3-none-any.whl → 1.2.0.dev20230704233149__py3-none-any.whl

cirq/_version.py

@@ -1 +1 @@
-__version__ = "1.2.0.dev20230629203543"
+__version__ = "1.2.0.dev20230704233149"

cirq/ops/qubit_manager.py

@@ -39,6 +39,7 @@ class QubitManager(metaclass=abc.ABCMeta):
 class _BaseAncillaQid(raw_types.Qid):
     id: int
     dim: int = 2
+    prefix: str = ''
 
     def _comparison_key(self) -> int:
         return self.id
@@ -49,7 +50,8 @@ class _BaseAncillaQid(raw_types.Qid):
 
     def __repr__(self) -> str:
         dim_str = f', dim={self.dim}' if self.dim != 2 else ''
-        return f"cirq.ops.{type(self).__name__}({self.id}{dim_str})"
+        prefix_str = f', prefix={self.prefix}' if self.prefix != '' else ''
+        return f"cirq.ops.{type(self).__name__}({self.id}{dim_str}{prefix_str})"
 
 
 class CleanQubit(_BaseAncillaQid):
@@ -57,7 +59,7 @@ class CleanQubit(_BaseAncillaQid):
 
     def __str__(self) -> str:
         dim_str = f' (d={self.dimension})' if self.dim != 2 else ''
-        return f"_c({self.id}){dim_str}"
+        return f"{self.prefix}_c({self.id}){dim_str}"
 
 
 class BorrowableQubit(_BaseAncillaQid):
@@ -65,23 +67,27 @@ class BorrowableQubit(_BaseAncillaQid):
 
     def __str__(self) -> str:
         dim_str = f' (d={self.dimension})' if self.dim != 2 else ''
-        return f"_b({self.id}){dim_str}"
+        return f"{self.prefix}_b({self.id}){dim_str}"
 
 
 class SimpleQubitManager(QubitManager):
     """Allocates a new `CleanQubit`/`BorrowableQubit` for every `qalloc`/`qborrow` request."""
 
-    def __init__(self):
+    def __init__(self, prefix: str = ''):
         self._clean_id = 0
         self._borrow_id = 0
+        self._prefix = prefix
 
     def qalloc(self, n: int, dim: int = 2) -> List['cirq.Qid']:
         self._clean_id += n
-        return [CleanQubit(i, dim) for i in range(self._clean_id - n, self._clean_id)]
+        return [CleanQubit(i, dim, self._prefix) for i in range(self._clean_id - n, self._clean_id)]
 
     def qborrow(self, n: int, dim: int = 2) -> List['cirq.Qid']:
         self._borrow_id = self._borrow_id + n
-        return [BorrowableQubit(i, dim) for i in range(self._borrow_id - n, self._borrow_id)]
+        return [
+            BorrowableQubit(i, dim, self._prefix)
+            for i in range(self._borrow_id - n, self._borrow_id)
+        ]
 
     def qfree(self, qubits: Iterable['cirq.Qid']) -> None:
         for q in qubits:

cirq/protocols/decompose_protocol.py

@@ -11,6 +11,7 @@
 # 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 itertools
 import dataclasses
 import inspect
 from collections import defaultdict
@@ -49,6 +50,8 @@ RaiseTypeErrorIfNotProvided: Any = ([],)
 
 DecomposeResult = Union[None, NotImplementedType, 'cirq.OP_TREE']
 
+_CONTEXT_COUNTER = itertools.count()  # Use _reset_context_counter() to reset the counter.
+
 
 @runtime_checkable
 class OpDecomposerWithContext(Protocol):
@@ -299,6 +302,8 @@ def decompose(
             "acceptable to keep."
         )
 
+    if context is None:
+        context = DecompositionContext(ops.SimpleQubitManager(prefix='_decompose_protocol'))
     args = _DecomposeArgs(
         context=context,
         intercepting_decomposer=intercepting_decomposer,
@@ -364,6 +369,11 @@ def decompose_once(
         TypeError: `val` didn't have a `_decompose_` method (or that method returned
             `NotImplemented` or `None`) and `default` wasn't set.
     """
+    if context is None:
+        context = DecompositionContext(
+            ops.SimpleQubitManager(prefix=f'_decompose_protocol_{next(_CONTEXT_COUNTER)}')
+        )
+
     method = getattr(val, '_decompose_with_context_', None)
     decomposed = NotImplemented if method is None else method(*args, **kwargs, context=context)
     if decomposed is NotImplemented or None:

cirq/protocols/decompose_protocol_test.py

@@ -11,6 +11,7 @@
 # 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 itertools
 from typing import Optional
 from unittest import mock
 import pytest
@@ -387,7 +388,7 @@ def test_decompose_recursive_dfs(with_context: bool):
     circuit = cirq.Circuit(moment)
     for val in [gate_op, tagged_op, controlled_op, classically_controlled_op, moment, circuit]:
         mock_qm.reset_mock()
-        _ = cirq.decompose(val)
+        _ = cirq.decompose(val, context=cirq.DecompositionContext(qubit_manager=mock_qm))
         assert mock_qm.method_calls == expected_calls
 
         mock_qm.reset_mock()
@@ -398,3 +399,42 @@ def test_decompose_recursive_dfs(with_context: bool):
             if with_context
             else mock_qm.method_calls == expected_calls
         )
+
+
+class G1(cirq.Gate):
+    def _num_qubits_(self) -> int:
+        return 1
+
+    def _decompose_with_context_(self, qubits, context):
+        yield cirq.CNOT(qubits[0], context.qubit_manager.qalloc(1)[0])
+
+
+class G2(cirq.Gate):
+    def _num_qubits_(self) -> int:
+        return 1
+
+    def _decompose_with_context_(self, qubits, context):
+        yield G1()(*context.qubit_manager.qalloc(1))
+
+
+@mock.patch('cirq.protocols.decompose_protocol._CONTEXT_COUNTER', itertools.count())
+def test_successive_decompose_once_succeed():
+    op = G2()(cirq.NamedQubit('q'))
+    d1 = cirq.decompose_once(op)
+    d2 = cirq.decompose_once(d1[0])
+    assert d2 == [
+        cirq.CNOT(
+            cirq.ops.CleanQubit(0, prefix='_decompose_protocol_0'),
+            cirq.ops.CleanQubit(0, prefix='_decompose_protocol_1'),
+        )
+    ]
+
+
+def test_decompose_without_context_succeed():
+    op = G2()(cirq.NamedQubit('q'))
+    assert cirq.decompose(op, keep=lambda op: op.gate is cirq.CNOT) == [
+        cirq.CNOT(
+            cirq.ops.CleanQubit(0, prefix='_decompose_protocol'),
+            cirq.ops.CleanQubit(1, prefix='_decompose_protocol'),
+        )
+    ]

cirq/sim/state_vector_simulator.py

@@ -20,6 +20,7 @@ import numpy as np
 
 from cirq import _compat, ops, value, qis
 from cirq.sim import simulator, state_vector, simulator_base
+from cirq.protocols import qid_shape
 
 if TYPE_CHECKING:
     import cirq
@@ -31,7 +32,7 @@ TStateVectorStepResult = TypeVar('TStateVectorStepResult', bound='StateVectorSte
 class SimulatesIntermediateStateVector(
     Generic[TStateVectorStepResult],
     simulator_base.SimulatorBase[
-        TStateVectorStepResult, 'cirq.StateVectorTrialResult', 'cirq.StateVectorSimulationState',
+        TStateVectorStepResult, 'cirq.StateVectorTrialResult', 'cirq.StateVectorSimulationState'
     ],
     simulator.SimulatesAmplitudes,
     metaclass=abc.ABCMeta,
@@ -172,7 +173,7 @@ class StateVectorTrialResult(
             size = np.prod(shape, dtype=np.int64)
             final = final.reshape(size)
             if len([1 for e in final if abs(e) > 0.001]) < 16:
-                state_vector = qis.dirac_notation(final, 3)
+                state_vector = qis.dirac_notation(final, 3, qid_shape(substate.qubits))
             else:
                 state_vector = str(final)
             label = f'qubits: {substate.qubits}' if substate.qubits else 'phase:'

cirq/sim/state_vector_simulator_test.py

@@ -159,6 +159,28 @@ def test_str_big():
     assert 'output vector: [0.03125+0.j 0.03125+0.j 0.03125+0.j ..' in str(result)
 
 
+def test_str_qudit():
+    qutrit = cirq.LineQid(0, dimension=3)
+    final_simulator_state = cirq.StateVectorSimulationState(
+        prng=np.random.RandomState(0),
+        qubits=[qutrit],
+        initial_state=np.array([0, 0, 1]),
+        dtype=np.complex64,
+    )
+    result = cirq.StateVectorTrialResult(cirq.ParamResolver(), {}, final_simulator_state)
+    assert "|2⟩" in str(result)
+
+    ququart = cirq.LineQid(0, dimension=4)
+    final_simulator_state = cirq.StateVectorSimulationState(
+        prng=np.random.RandomState(0),
+        qubits=[ququart],
+        initial_state=np.array([0, 1, 0, 0]),
+        dtype=np.complex64,
+    )
+    result = cirq.StateVectorTrialResult(cirq.ParamResolver(), {}, final_simulator_state)
+    assert "|1⟩" in str(result)
+
+
 def test_pretty_print():
     final_simulator_state = cirq.StateVectorSimulationState(
         available_buffer=np.array([1]),

{cirq_core-1.2.0.dev20230629203543.dist-info → cirq_core-1.2.0.dev20230704233149.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cirq-core
-Version: 1.2.0.dev20230629203543
+Version: 1.2.0.dev20230704233149
 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.2.0.dev20230629203543.dist-info → cirq_core-1.2.0.dev20230704233149.dist-info}/RECORD

@@ -4,7 +4,7 @@ cirq/_compat_test.py,sha256=yaTzjrXRFRHRZ5mom2NFrGP-1SeV7AlnH4fMmL5Jeps,33945
 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=Ym8NriI8C54dsW7BzIJTCN2wM7BOVxl4Emzrckb6W5E,40
+cirq/_version.py,sha256=k1a4_IMZAPnferSuFo0iDuGq31Fkzm0K8qiXKQmIdBk,40
 cirq/_version_test.py,sha256=ZM9GLAiU02rzyJQ_HOT2o_tZixJ0lMXs4tCkOareqTA,133
 cirq/conftest.py,sha256=mHCDs5--u17oLFDAfIlkTS4TRGSc35eLnZ2CXuIuB7I,1175
 cirq/json_resolver_cache.py,sha256=JJiO1dhHsEqYClUv68eg-hiOzbb_C1QiQ-BCcvoe4Ck,13067
@@ -347,7 +347,7 @@ cirq/ops/projector.py,sha256=isDlNLR8YS5CxsVCihtRAgfKZXFFQxk7kuFXY14t8ys,5690
 cirq/ops/projector_test.py,sha256=Wq7ddj-PV30yUXJxJoT3XIw2sIUC1AilnZ9m9N5Ejr8,9063
 cirq/ops/qid_util.py,sha256=2x9BCtJzTpfDAXvs5teROPsU1lA8gyr2JEaLWi1Q9y8,2148
 cirq/ops/qid_util_test.py,sha256=JdViBgFfH4bZJyPKTjUf9MuPxMQe08JV_Tl6tusekfk,1061
-cirq/ops/qubit_manager.py,sha256=GV-_U0ivGbQpoaC0Ebeno1UxLmbFanGCGukZCufCI9Y,3136
+cirq/ops/qubit_manager.py,sha256=EbA8nC00lmi3YMkovSCJjCXYvS_AKIPW-GBzKbUaeyc,3381
 cirq/ops/qubit_manager_test.py,sha256=adogGKdWVulCwpByXC_KMP6YNst94R0wuW-5VTEozSk,2351
 cirq/ops/qubit_order.py,sha256=nYkcMg-y5QtR7M3W1HXq1IWJyMKjrTZXVK1GEbY6gng,5616
 cirq/ops/qubit_order_or_list.py,sha256=WVnhQcOYCgAhiB4t47Kji-pN1tnvs--X5deCQwwGVno,1165
@@ -385,8 +385,8 @@ cirq/protocols/commutes_protocol.py,sha256=ZSwtnkqB7as1y28alLfZWnMvvP1vFhel0-EML
 cirq/protocols/commutes_protocol_test.py,sha256=h0Lky4jrs7Hxrh4MeHxmxNciuofKGGZ2eC-ceWP8wKU,5849
 cirq/protocols/control_key_protocol.py,sha256=S3b4XOvTIj6TxNbj0W33fjdvXiWSKOtflvfEGeruzWw,2630
 cirq/protocols/control_key_protocol_test.py,sha256=190gp4QBu5QpP2doMmzx9RkAkp6VZOOWGOXp0RIFgqc,970
-cirq/protocols/decompose_protocol.py,sha256=p053AJFyo7TjbPKQRz6CyudNEed1cDmbEEPNz2Xzws4,18772
-cirq/protocols/decompose_protocol_test.py,sha256=2lH00efYg0ZXGIZ5dxO6NH8XKRcpQleAbbYYk-9w-78,14752
+cirq/protocols/decompose_protocol.py,sha256=b4NCMzdI_RuHzkGhRBNL_vW1YiX8gmkMvCLEwqDMuK4,19164
+cirq/protocols/decompose_protocol_test.py,sha256=zV-eAOYYqeXd73MuoqsRMe3FKj7Q1vxjJAizNKpZaHs,15969
 cirq/protocols/equal_up_to_global_phase_protocol.py,sha256=0a93790FDjID46cX94PVAlA9i9Fu7uN8cj6qT94NH9w,4101
 cirq/protocols/equal_up_to_global_phase_protocol_test.py,sha256=qpiPXPCncim2SEsnpJ-Xx5Bv_nRKBED9N-iRkJ6aWIc,5718
 cirq/protocols/has_stabilizer_effect_protocol.py,sha256=q7x5AlDtqgmbGWJPXKdPR3jYacwPoBHGsylHxqCvoMY,2685
@@ -897,8 +897,8 @@ cirq/sim/sparse_simulator_test.py,sha256=3EAeCHUQeKllAAtdw14X592zBsGQY_vwfIYK-gE
 cirq/sim/state_vector.py,sha256=N6N9EELlW66UaLTBaq62ms0XkfIK7CzN9SBM7t52dXo,13428
 cirq/sim/state_vector_simulation_state.py,sha256=ZTmRdf9J--L3hISroWmW9vgqPvj13s99I2axIgV5x7o,17631
 cirq/sim/state_vector_simulation_state_test.py,sha256=UtGMIurlV6N74nX7qoVnGoRhwF35-ghDEIP7Mj5AXmI,9841
-cirq/sim/state_vector_simulator.py,sha256=d_6s5cBgUVCSCgx6yxzKYlbRp-e9BBfFmlZetN8MIS8,7465
-cirq/sim/state_vector_simulator_test.py,sha256=Xl6v_WghJGZtEEK7EHw_1QGoXCVbnvKhVu1K8OJ5D24,7098
+cirq/sim/state_vector_simulator.py,sha256=L2S0xyUGqRcVgYdzYef0gVREVZVIDcCXPclVbIJEpPE,7529
+cirq/sim/state_vector_simulator_test.py,sha256=wJq1OZRzKokeM9cJyaJXi6wHH2qi97h0HmJlYOEBDzU,7864
 cirq/sim/state_vector_test.py,sha256=OjhAL2tWqJWstHV8RvJYQVqg95zm0PcS9nQKrLOhMmQ,16934
 cirq/sim/clifford/__init__.py,sha256=lD7l6JuE5n0xwvOYNYH-giCH3qAEVH1SUwDrZM1jKKY,636
 cirq/sim/clifford/clifford_simulator.py,sha256=6M69sv6IbtJTOk5ZE8CGWiILf6Ee2sCEALiZaw9NmvQ,9735
@@ -1136,8 +1136,8 @@ cirq/work/sampler.py,sha256=JVv1vvfa6EgFiR3UeDk44U186dCrioH2NZXueCgsb9w,19828
 cirq/work/sampler_test.py,sha256=zo1Hj6sn6fLs_WZMxYRApBqgBsldmptn74NL0jhNukc,12325
 cirq/work/zeros_sampler.py,sha256=D3hbNZC-jXKuNAWg2OUiUuT8pmDV_WFnEfMank6In4o,2357
 cirq/work/zeros_sampler_test.py,sha256=JIkpBBFPJe5Ba4142vzogyWyboG1Q1ZAm0UVGgOoZn8,3279
-cirq_core-1.2.0.dev20230629203543.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.2.0.dev20230629203543.dist-info/METADATA,sha256=6P2IeFXstBhyYNva39vgvhLU08mHF-V7wa4Jc-WcLKY,2095
-cirq_core-1.2.0.dev20230629203543.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-cirq_core-1.2.0.dev20230629203543.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.2.0.dev20230629203543.dist-info/RECORD,,
+cirq_core-1.2.0.dev20230704233149.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.2.0.dev20230704233149.dist-info/METADATA,sha256=59UAg0yYVU9wwJDLEW7dnwd6O3pslgVl4P1V8T-siHY,2095
+cirq_core-1.2.0.dev20230704233149.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+cirq_core-1.2.0.dev20230704233149.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.2.0.dev20230704233149.dist-info/RECORD,,