cirq-core 1.5.0.dev20250405043305__py3-none-any.whl → 1.5.0.dev20250405050852__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.dev20250405043305"
+__version__ = "1.5.0.dev20250405050852"

cirq/_version_test.py

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

cirq/ops/common_channels.py

@@ -1089,15 +1089,12 @@ class BitFlipChannel(raw_types.Gate):
             ValueError: if p is not a valid probability.
         """
         self._p = value.validate_probability(p, 'p')
-        self._delegate = AsymmetricDepolarizingChannel(p, 0.0, 0.0)
 
     def _num_qubits_(self) -> int:
         return 1
 
-    def _mixture_(self) -> Sequence[Tuple[float, np.ndarray]]:
-        mixture = self._delegate._mixture_()
-        # just return identity and x term
-        return (mixture[0], mixture[1])
+    def _mixture_(self) -> Sequence[Tuple[float, Any]]:
+        return ((1 - self._p, identity.I), (self._p, pauli_gates.X))
 
     def _has_mixture_(self) -> bool:
         return True

cirq/protocols/apply_mixture_protocol.py

@@ -24,7 +24,6 @@ from cirq import linalg
 from cirq._doc import doc_private
 from cirq.protocols import qid_shape_protocol
 from cirq.protocols.apply_unitary_protocol import apply_unitary, ApplyUnitaryArgs
-from cirq.protocols.mixture_protocol import mixture
 
 # This is a special indicator value used by the apply_mixture method
 # to determine whether or not the caller provided a 'default' argument. It must
@@ -260,9 +259,9 @@ def apply_mixture(
         return result
 
     # Fallback to using the object's `_mixture_` matrices. (STEP C)
-    prob_mix = mixture(val, None)
-    if prob_mix is not None:
-        return _mixture_strat(prob_mix, args, is_density_matrix)
+    result = _apply_mixture_from_mixture_strat(val, args, is_density_matrix)
+    if result is not None:
+        return result
 
     # Don't know how to apply mixture. Fallback to specified default behavior.
     # (STEP D)
@@ -359,11 +358,19 @@ def _apply_unitary_from_matrix_strat(
     return args.target_tensor
 
 
-def _mixture_strat(val: Any, args: 'ApplyMixtureArgs', is_density_matrix: bool) -> np.ndarray:
+def _apply_mixture_from_mixture_strat(
+    val: Any, args: 'ApplyMixtureArgs', is_density_matrix: bool
+) -> Optional[np.ndarray]:
     """Attempt to use unitary matrices in _mixture_ and return the result."""
+    method = getattr(val, '_mixture_', None)
+    if method is None:
+        return None
+    prob_mix = method()
+    if prob_mix is NotImplemented or prob_mix is None:
+        return None
     args.out_buffer[:] = 0
     np.copyto(dst=args.auxiliary_buffer1, src=args.target_tensor)
-    for prob, op in val:
+    for prob, op in prob_mix:
         np.copyto(dst=args.target_tensor, src=args.auxiliary_buffer1)
         right_result = _apply_unitary_strat(op, args, is_density_matrix)
         if right_result is None:

cirq/protocols/apply_mixture_protocol_test.py

@@ -237,6 +237,17 @@ def test_apply_mixture_no_protocols_implemented():
         assert_apply_mixture_returns(NoProtocols(), rho, left_axes=[1], right_axes=[1])
 
 
+def test_apply_mixture_mixture_returns_not_implemented():
+    class NoMixture:
+        def _mixture_(self):
+            return NotImplemented
+
+    rho = np.ones((2, 2, 2, 2), dtype=np.complex128)
+
+    with pytest.raises(TypeError, match='has no'):
+        assert_apply_mixture_returns(NoMixture(), rho, left_axes=[1], right_axes=[1])
+
+
 def test_apply_mixture_no_protocols_implemented_default():
     class NoProtocols:
         pass

cirq/protocols/kraus_protocol.py

@@ -24,6 +24,7 @@ from typing_extensions import Protocol
 from cirq._doc import doc_private
 from cirq.protocols.decompose_protocol import _try_decompose_into_operations_and_qubits
 from cirq.protocols.mixture_protocol import has_mixture
+from cirq.protocols.unitary_protocol import unitary
 
 # This is a special indicator value used by the channel method to determine
 # whether or not the caller provided a 'default' argument. It must be of type
@@ -145,7 +146,9 @@ def kraus(
     mixture_getter = getattr(val, '_mixture_', None)
     mixture_result = NotImplemented if mixture_getter is None else mixture_getter()
     if mixture_result is not NotImplemented and mixture_result is not None:
-        return tuple(np.sqrt(p) * u for p, u in mixture_result)
+        return tuple(
+            np.sqrt(p) * (u if isinstance(u, np.ndarray) else unitary(u)) for p, u in mixture_result
+        )
 
     unitary_getter = getattr(val, '_unitary_', None)
     unitary_result = NotImplemented if unitary_getter is None else unitary_getter()

cirq/protocols/mixture_protocol.py

@@ -23,6 +23,7 @@ from typing_extensions import Protocol
 from cirq._doc import doc_private
 from cirq.protocols.decompose_protocol import _try_decompose_into_operations_and_qubits
 from cirq.protocols.has_unitary_protocol import has_unitary
+from cirq.protocols.unitary_protocol import unitary
 
 # This is a special indicator value used by the inverse method to determine
 # whether or not the caller provided a 'default' argument.
@@ -84,14 +85,14 @@ def mixture(
         with that probability in the mixture. The probabilities will sum to 1.0.
 
     Raises:
-        TypeError: If `val` has no `_mixture_` or `_unitary_` mehod, or if it
+        TypeError: If `val` has no `_mixture_` or `_unitary_` method, or if it
             does and this method returned `NotImplemented`.
     """
 
     mixture_getter = getattr(val, '_mixture_', None)
     result = NotImplemented if mixture_getter is None else mixture_getter()
-    if result is not NotImplemented:
-        return result
+    if result is not NotImplemented and result is not None:
+        return tuple((p, u if isinstance(u, np.ndarray) else unitary(u)) for p, u in result)
 
     unitary_getter = getattr(val, '_unitary_', None)
     result = NotImplemented if unitary_getter is None else unitary_getter()

cirq/protocols/mixture_protocol_test.py

@@ -17,6 +17,9 @@ import pytest
 
 import cirq
 
+a = np.array([1])
+b = np.array([1j])
+
 
 class NoMethod:
     pass
@@ -32,7 +35,7 @@ class ReturnsNotImplemented:
 
 class ReturnsValidTuple(cirq.SupportsMixture):
     def _mixture_(self):
-        return ((0.4, 'a'), (0.6, 'b'))
+        return ((0.4, a), (0.6, b))
 
     def _has_mixture_(self):
         return True
@@ -40,27 +43,27 @@ class ReturnsValidTuple(cirq.SupportsMixture):
 
 class ReturnsNonnormalizedTuple:
     def _mixture_(self):
-        return ((0.4, 'a'), (0.4, 'b'))
+        return ((0.4, a), (0.4, b))
 
 
 class ReturnsNegativeProbability:
     def _mixture_(self):
-        return ((0.4, 'a'), (-0.4, 'b'))
+        return ((0.4, a), (-0.4, b))
 
 
 class ReturnsGreaterThanUnityProbability:
     def _mixture_(self):
-        return ((1.2, 'a'), (0.4, 'b'))
+        return ((1.2, a), (0.4, b))
 
 
 class ReturnsMixtureButNoHasMixture:
     def _mixture_(self):
-        return ((0.4, 'a'), (0.6, 'b'))
+        return ((0.4, a), (0.6, b))
 
 
 class ReturnsUnitary:
     def _unitary_(self):
-        return np.ones((2, 2))
+        return np.eye(2)
 
     def _has_unitary_(self):
         return True
@@ -74,12 +77,18 @@ class ReturnsNotImplementedUnitary:
         return NotImplemented
 
 
+class ReturnsMixtureOfReturnsUnitary:
+    def _mixture_(self):
+        return ((0.4, ReturnsUnitary()), (0.6, ReturnsUnitary()))
+
+
 @pytest.mark.parametrize(
     'val,mixture',
     (
-        (ReturnsValidTuple(), ((0.4, 'a'), (0.6, 'b'))),
-        (ReturnsNonnormalizedTuple(), ((0.4, 'a'), (0.4, 'b'))),
-        (ReturnsUnitary(), ((1.0, np.ones((2, 2))),)),
+        (ReturnsValidTuple(), ((0.4, a), (0.6, b))),
+        (ReturnsNonnormalizedTuple(), ((0.4, a), (0.4, b))),
+        (ReturnsUnitary(), ((1.0, np.eye(2)),)),
+        (ReturnsMixtureOfReturnsUnitary(), ((0.4, np.eye(2)), (0.6, np.eye(2)))),
     ),
 )
 def test_objects_with_mixture(val, mixture):
@@ -88,7 +97,7 @@ def test_objects_with_mixture(val, mixture):
     np.testing.assert_almost_equal(keys, expected_keys)
     np.testing.assert_equal(values, expected_values)
 
-    keys, values = zip(*cirq.mixture(val, ((0.3, 'a'), (0.7, 'b'))))
+    keys, values = zip(*cirq.mixture(val, ((0.3, a), (0.7, b))))
     np.testing.assert_almost_equal(keys, expected_keys)
     np.testing.assert_equal(values, expected_values)
 
@@ -101,7 +110,7 @@ def test_objects_with_no_mixture(val):
         _ = cirq.mixture(val)
     assert cirq.mixture(val, None) is None
     assert cirq.mixture(val, NotImplemented) is NotImplemented
-    default = ((0.4, 'a'), (0.6, 'b'))
+    default = ((0.4, a), (0.6, b))
     assert cirq.mixture(val, default) == default
 
 

{cirq_core-1.5.0.dev20250405043305.dist-info → cirq_core-1.5.0.dev20250405050852.dist-info}/METADATA

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

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=0m3sYIyxRNv9jvAo6rzJ-cnbpny3KGnAByrbU7bApgQ,34720
 cirq/_doc.py,sha256=yDyWUD_2JDS0gShfGRb-rdqRt9-WeL7DhkqX7np0Nko,2879
 cirq/_import.py,sha256=cfocxtT1BJ4HkfZ-VO8YyIhPP-xfqHDkLrzz6eeO5U0,8421
 cirq/_import_test.py,sha256=6K_v0riZJXOXUphHNkGA8MY-JcmGlezFaGmvrNhm3OQ,1015
-cirq/_version.py,sha256=lcCzHo7o7aBVgMbzjtSwrvnpFHV1Hut93nbUgxA0ibU,1206
-cirq/_version_test.py,sha256=6ZYv5DT6HSuJAbOiQc4EeFJuUzypuwLQTA2AHZusBCI,147
+cirq/_version.py,sha256=rrHncQSD1uha8V-ZVfxjGi97KobvlRJIdilCH7DsjIw,1206
+cirq/_version_test.py,sha256=ZAHy9pdX7FT9NoLH9SJy53S2EU42iikkMzR--NkmMMg,147
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=YVamU72nCUT5dG0bhAvRKVX5lXcZMNTwP3H36v-cYag,13615
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -276,7 +276,7 @@ cirq/ops/classically_controlled_operation.py,sha256=ePhBPrHymodrsztJFk_g2IGI3QSb
 cirq/ops/classically_controlled_operation_test.py,sha256=nIYyXfNH4E2IibZSLk6QDVHpfJQbuI_iWwirCH8rhi8,50209
 cirq/ops/clifford_gate.py,sha256=5mE97WQG6kW9ntRcn20hoFip71TFofnNKMx01RHETO4,39488
 cirq/ops/clifford_gate_test.py,sha256=dqghYb7_afYxCLceBarX56Tn9y_dSWCKF75W-Qrzvcw,40341
-cirq/ops/common_channels.py,sha256=LfIjy4WBRF_K81kc12Y4nLjdVZnJUhIKHL7sxiNNINU,37259
+cirq/ops/common_channels.py,sha256=lGDOSdstoK57DingL-lo2n49-a51MshhJOl4LOcpQfg,37126
 cirq/ops/common_channels_test.py,sha256=nQsSSxu7vtedb3ZUuw4hNKIX7MYI4x8lxvLyWMZNt10,30079
 cirq/ops/common_gate_families.py,sha256=2E31Qr_Yv1zI-r_MNWmr1xJYrEHHU45274iDrt_oKPE,8611
 cirq/ops/common_gate_families_test.py,sha256=bEF6Q6GtEOTc9kHM5WC1UIULPGnMPXdtm8gzLT_aNBI,5276
@@ -384,8 +384,8 @@ cirq/protocols/act_on_protocol.py,sha256=pRjl2lHqxuYWlJopkWCSPiwrHPggHOdRMb0nu-k
 cirq/protocols/act_on_protocol_test.py,sha256=q4vOBfG9-O8CIzmwU8HaB2HZR_U1fk2Vm-q1QhyeEpY,3147
 cirq/protocols/apply_channel_protocol.py,sha256=s5gkjAcAMe_qdPJGPuZnt4r6zZhszpddnK8Ed-wEO90,15678
 cirq/protocols/apply_channel_protocol_test.py,sha256=ETAWrBTVkPuUPUgHsLZo1HUsJnZsO0hD2fQeXlXtvjE,10582
-cirq/protocols/apply_mixture_protocol.py,sha256=t_nSa5nISHqDM-wUzMRRz50RhxZ2d1nHq2a4RL2NTqU,16306
-cirq/protocols/apply_mixture_protocol_test.py,sha256=6sNZhauFDec2MvHmUsvmkVF-qjH1WLDnZO35RT0OtRY,10793
+cirq/protocols/apply_mixture_protocol.py,sha256=pYxlpOXxPjMIddyYtEw82_18ioNNvEEcmsImaQ1YiBc,16479
+cirq/protocols/apply_mixture_protocol_test.py,sha256=aWyzK9h9QNmpZJBu0ASaQ8BGYJt5T5KugN4OPMO5pCU,11129
 cirq/protocols/apply_unitary_protocol.py,sha256=giJwec5XCEt5s0_uyNEuhGBlcDeJymPvuoIVx08hszY,29772
 cirq/protocols/apply_unitary_protocol_test.py,sha256=ajjHvcBBv5n8Qh_hMPZkdsOvy1xJ774q4kuC25DJnKM,26136
 cirq/protocols/approximate_equality_protocol.py,sha256=ZqnkoltD8vS1eQjV7Lw3RS49cdjZjGTF0LbdRUlBOCw,6257
@@ -409,12 +409,12 @@ cirq/protocols/inverse_protocol.py,sha256=aicyqdJVDbd-ZO-wKHA8S_5CcPl3HDhRklSSdo
 cirq/protocols/inverse_protocol_test.py,sha256=pqqIU4_G4Npc9Z-SeoM9eCB2T5JRTeI02NCXhP0UtaI,2017
 cirq/protocols/json_serialization.py,sha256=VJCEXB9fkIZh3_d6dkh_QDxwjC3iJAlELGHsCmAMvE4,24779
 cirq/protocols/json_serialization_test.py,sha256=qrh6XTy6k-FCVAd3QvSV_ENHVf9UUgHOt_pzsniI6UM,28144
-cirq/protocols/kraus_protocol.py,sha256=Icazcmk9J1GSC0FL_dYLkrnpE_FH7G7xtawYuYbx3_g,9179
+cirq/protocols/kraus_protocol.py,sha256=NVzMsIyqxytGAui-avLdq3K0C7UqjckrTDvr0ENmDtQ,9300
 cirq/protocols/kraus_protocol_test.py,sha256=NYVayiCaEpfvelsoR7bP57lUKn2pjFKYOiVOFHeZn9Q,5400
 cirq/protocols/measurement_key_protocol.py,sha256=vqoxjmthtmQ1nWbi7Xd4fdxFNe5y3WL7DZkQ3M_VPnc,13409
 cirq/protocols/measurement_key_protocol_test.py,sha256=W7yWKFVo6fMr7JjTECe8bMh1-NMDOpGMh3S-vmNl_3s,8654
-cirq/protocols/mixture_protocol.py,sha256=Hva80ZD09ZEfGa_jCGVNYygk_yyI02zzOEDykHejxPo,6301
-cirq/protocols/mixture_protocol_test.py,sha256=N09cs9WoXj3CBvs1p95yDpLK-h6WTManz3-xvHcFGO4,3615
+cirq/protocols/mixture_protocol.py,sha256=L6FDIJmYqirVGsNwoUz5sulEDFoRUbhwz4yFL0ML2Po,6448
+cirq/protocols/mixture_protocol_test.py,sha256=5mCh6JjlumMiSwDM818Nvo72AGxttuIYuawyESIQFtY,3818
 cirq/protocols/mul_protocol.py,sha256=ZhkowiHCulggWanjoz6HpMGf0ODqDNIjM32knFKPuJ0,2770
 cirq/protocols/mul_protocol_test.py,sha256=Qv7y17r-HjLXC7e-6t_Y6ht8lD_iiXE6CRyRFb7noGE,2136
 cirq/protocols/pauli_expansion_protocol.py,sha256=vtpVoBlU1pXm4RQf3DDGervXwcW8jqNxs6ETHPSsp1I,3750
@@ -1209,8 +1209,8 @@ cirq/work/sampler.py,sha256=sW0RhIelGABAKbqTM58shwyyCPgf86JIv9IGdJe__js,19186
 cirq/work/sampler_test.py,sha256=mdk1J-WrvbPUYhY41VhWf9_te4DnXr_XMPcugWwc4-I,13281
 cirq/work/zeros_sampler.py,sha256=8_Ne6dBkDANtTZuql7Eb0Qg_E_P3-_gu-ybFzxTbKAQ,2356
 cirq/work/zeros_sampler_test.py,sha256=JIkpBBFPJe5Ba4142vzogyWyboG1Q1ZAm0UVGgOoZn8,3279
-cirq_core-1.5.0.dev20250405043305.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.5.0.dev20250405043305.dist-info/METADATA,sha256=mP0FqihGxdqzrn2lCHUtmxPFrW_4FeXXFBMSk45NBrI,4584
-cirq_core-1.5.0.dev20250405043305.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cirq_core-1.5.0.dev20250405043305.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.5.0.dev20250405043305.dist-info/RECORD,,
+cirq_core-1.5.0.dev20250405050852.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.5.0.dev20250405050852.dist-info/METADATA,sha256=JbcLAzlUu5jxiad1Wd8Gb9vhve4q05YQnFhfyMBMgLI,4584
+cirq_core-1.5.0.dev20250405050852.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cirq_core-1.5.0.dev20250405050852.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.5.0.dev20250405050852.dist-info/RECORD,,