cirq-core 1.4.0.dev20240315194126__py3-none-any.whl → 1.4.0.dev20240318170608__py3-none-any.whl

cirq/__init__.py

@@ -240,6 +240,7 @@ from cirq.ops import (
     MatrixGate,
     MixedUnitaryChannel,
     M,
+    MSGate,
     measure,
     measure_each,
     measure_paulistring_terms,

cirq/_version.py

@@ -1 +1 @@
-__version__ = "1.4.0.dev20240315194126"
+__version__ = "1.4.0.dev20240318170608"

cirq/json_resolver_cache.py

@@ -157,6 +157,7 @@ def _class_resolver_dictionary() -> Dict[str, ObjectFactory]:
         'LineTopology': cirq.LineTopology,
         'Linspace': cirq.Linspace,
         'ListSweep': cirq.ListSweep,
+        'cirq.MSGate': cirq.MSGate,
         'MatrixGate': cirq.MatrixGate,
         'MixedUnitaryChannel': cirq.MixedUnitaryChannel,
         'MeasurementKey': cirq.MeasurementKey,

cirq/ops/parity_gates.py

@@ -399,6 +399,11 @@ class MSGate(XXPowGate):
             return 'cirq.ms(np.pi/2)'
         return f'cirq.ms({self._exponent!r}*np.pi/2)'
 
+    # the default namespace is already occupied by cirq_ionq.MSGate
+    @classmethod
+    def _json_namespace_(cls) -> str:
+        return 'cirq'
+
     def _json_dict_(self) -> Dict[str, Any]:
         return protocols.obj_to_dict_helper(self, ["rads"])
 

cirq/ops/parity_gates_test.py

@@ -258,7 +258,7 @@ def test_trace_distance():
 def test_ms_arguments():
     eq_tester = cirq.testing.EqualsTester()
     eq_tester.add_equality_group(
-        cirq.ms(np.pi / 2), cirq.ops.MSGate(rads=np.pi / 2), cirq.XXPowGate(global_shift=-0.5)
+        cirq.ms(np.pi / 2), cirq.MSGate(rads=np.pi / 2), cirq.XXPowGate(global_shift=-0.5)
     )
     eq_tester.add_equality_group(
         cirq.ms(np.pi / 4), cirq.XXPowGate(exponent=0.5, global_shift=-0.5)
@@ -323,15 +323,7 @@ b: ───×───────────MS(π)───
 
 
 def test_json_serialization():
-    def custom_resolver(cirq_type: str):
-        if cirq_type == "MSGate":
-            return cirq.ops.MSGate
-        return None
-
-    assert cirq.read_json(
-        json_text=cirq.to_json(cirq.ms(np.pi / 2)), resolvers=[custom_resolver]
-    ) == cirq.ms(np.pi / 2)
-    assert custom_resolver('X') is None
+    assert cirq.read_json(json_text=cirq.to_json(cirq.ms(np.pi / 2))) == cirq.ms(np.pi / 2)
 
 
 @pytest.mark.parametrize('gate_cls', (cirq.XXPowGate, cirq.YYPowGate, cirq.ZZPowGate))

cirq/protocols/json_test_data/cirq.MSGate.json

@@ -0,0 +1,4 @@
+{
+  "cirq_type": "cirq.MSGate",
+  "rads": 1.5707963267948966
+}

cirq/protocols/json_test_data/cirq.MSGate.repr

@@ -0,0 +1 @@
+cirq.ms(np.pi/2)

cirq/protocols/json_test_data/spec.py

@@ -22,6 +22,7 @@ TestSpec = ModuleJsonTestSpec(
     name="cirq",
     packages=[cirq, cirq.work],
     test_data_path=pathlib.Path(__file__).parent,
+    custom_class_name_to_cirq_type={"MSGate": "cirq.MSGate"},
     resolver_cache=_class_resolver_dictionary(),
     not_yet_serializable=[
         'Alignment',

cirq/transformers/transformer_primitives.py

@@ -53,12 +53,9 @@ def _to_target_circuit_type(
 
 
 def _create_target_circuit_type(ops: ops.OP_TREE, target_circuit: CIRCUIT_TYPE) -> CIRCUIT_TYPE:
-    return cast(
-        CIRCUIT_TYPE,
-        circuits.Circuit(ops)
-        if isinstance(target_circuit, circuits.Circuit)
-        else circuits.FrozenCircuit(ops),
-    )
+    if isinstance(target_circuit, circuits.FrozenCircuit):
+        return cast(CIRCUIT_TYPE, circuits.FrozenCircuit(ops).with_tags(*target_circuit.tags))
+    return cast(CIRCUIT_TYPE, circuits.Circuit(ops))
 
 
 def map_moments(

cirq/transformers/transformer_primitives_test.py

@@ -205,6 +205,33 @@ def test_map_operations_deep_subcircuits():
 # pylint: enable=line-too-long
 
 
+@pytest.mark.parametrize("deep", [False, True])
+def test_map_operations_preserves_circuit_tags(deep: bool) -> None:
+    tag = "should be preserved"
+
+    def func(op: cirq.Operation, idx: int) -> cirq.Operation:
+        return cirq.Y(op.qubits[0]) if op.gate == cirq.X else op
+
+    x = cirq.X(cirq.q(0))
+    circuit = cirq.FrozenCircuit.from_moments(x, cirq.FrozenCircuit(x)).with_tags(tag)
+    mapped = cirq.map_operations(circuit, func, deep=deep)
+
+    assert mapped.tags == (tag,)
+
+
+def test_map_operations_deep_preserves_subcircuit_tags():
+    tag = "should be preserved"
+
+    def func(op: cirq.Operation, idx: int) -> cirq.Operation:
+        return cirq.Y(op.qubits[0]) if op.gate == cirq.X else op
+
+    x = cirq.X(cirq.q(0))
+    circuit = cirq.FrozenCircuit.from_moments(x, cirq.FrozenCircuit(x).with_tags(tag))
+    mapped = cirq.map_operations(circuit, func, deep=True)
+
+    assert mapped[1].operations[0].circuit.tags == (tag,)
+
+
 def test_map_operations_deep_respects_tags_to_ignore():
     q = cirq.LineQubit.range(2)
     c_nested = cirq.FrozenCircuit(cirq.CX(*q), cirq.CX(*q).with_tags("ignore"), cirq.CX(*q))

{cirq_core-1.4.0.dev20240315194126.dist-info → cirq_core-1.4.0.dev20240318170608.dist-info}/METADATA

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

@@ -1,13 +1,13 @@
-cirq/__init__.py,sha256=GlOnPWDvat-Y203LsbXhkC0UnGm9HHiNx2ywz7Bkc3o,15708
+cirq/__init__.py,sha256=-me8ux2uyeDMA9bO17djZH-SbpSKixOsfrvotuAJRc8,15720
 cirq/_compat.py,sha256=ogNbww9v943-ZNZcOx-ad8kGO8-jLBuS8865gQ3QA-c,29350
 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=auc4QKfVzWFRmDVThWti8Hf0H_zuSGJSfqWNiM6g3HU,40
+cirq/_version.py,sha256=IP9DCUnAKpWQbKEXBra8_ck6RKP0bPH7OII1n5QGDL8,40
 cirq/_version_test.py,sha256=yYS6xm5-nuBRQJa9R3n41WdvFtVyY7Lb5Q8bea3VgBI,133
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
-cirq/json_resolver_cache.py,sha256=S0HaPOCUIck-vNSQlS6KxnQtle6w-2dGuSxkUbJQY9Y,13168
+cirq/json_resolver_cache.py,sha256=9g_JQMmfBzTuV-3s2flUbXIgcLjs4K7LjAFFgngdG1U,13204
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
 cirq/type_workarounds.py,sha256=-qyat6dmVoz8z76I-JLrnK1vAXmY9G1Qa3LYjQ4rJlI,959
 cirq/circuits/__init__.py,sha256=UPBO-WG6VodQWDkYgJdBzKK8k9CsxHFGIENM95vh7ac,1117
@@ -323,8 +323,8 @@ cirq/ops/op_tree.py,sha256=iXsIFcQCciU7C9SiPxhd_zrp4TBGCsmnqxKDjUl1aEo,6159
 cirq/ops/op_tree_test.py,sha256=h4phqrxQwYAfyu8o4f_fLi3WP2kdVuzWqrSCWGLHo_c,5575
 cirq/ops/parallel_gate.py,sha256=RSj1SuiwbDCMWxvTmi3xz7oE2QXBFgA59emijh4JPkE,6335
 cirq/ops/parallel_gate_test.py,sha256=M6o3AyXFQrwyiOTtGxlYH09TbHdjtTxCuMjmn-ALnn0,6298
-cirq/ops/parity_gates.py,sha256=JJdw_A9HHiJFVlYfWxp0QPBXtgfHjQYbYH_YFjoU4K4,14208
-cirq/ops/parity_gates_test.py,sha256=-Ib4GO4njRHanuTMpGvz_zaQf0siUJNNd_tpEYKUOjg,11462
+cirq/ops/parity_gates.py,sha256=FVXd1h-HqftRAFfYGSmz0URR_lvVG4kpwav0mxf6DtU,14354
+cirq/ops/parity_gates_test.py,sha256=7C0BmJl1HuoyVzfA8-lVCTiE1qNYQhMtyQlVx2uvFKA,11244
 cirq/ops/pauli_gates.py,sha256=sqqQEKEU89cmb1pzLPnrZ5XC0LchSXid8tHLQs8xJnk,6984
 cirq/ops/pauli_gates_test.py,sha256=bHt7A2w0auWxN9gyKAVeimT1KeOHz5C_CjFHSK1V-Co,7752
 cirq/ops/pauli_interaction_gate.py,sha256=GQtK5lRw2Uh7hs2GsoRxe-VMlMTO8PxDeZNVT6_qOWI,5499
@@ -825,6 +825,8 @@ cirq/protocols/json_test_data/_YEigenState.repr,sha256=xOsv4JMPz5zf4P9o2ezAROyUE
 cirq/protocols/json_test_data/_ZEigenState.json,sha256=DnBLzEfAc-tfaaVpBy8hd29Cn5NTDwcJwxhpRZ1SpZE,127
 cirq/protocols/json_test_data/_ZEigenState.repr,sha256=V2P3aMF1iBbzud8CUvnSVrBRt7KjOPbeWdeZKMRO510,36
 cirq/protocols/json_test_data/__init__.py,sha256=9f7jgLPoGVYZTfVJ0nGw5lu0uAKXJ8rZlQi82AJNglM,641
+cirq/protocols/json_test_data/cirq.MSGate.json,sha256=G_roYqHu9XgZSu1lMZbInFsefVvgZfKuRubengXuawg,63
+cirq/protocols/json_test_data/cirq.MSGate.repr,sha256=grCt0Y_v0_26K-HgqtVzc8pRgS09z1s4JhjE-cAucoE,16
 cirq/protocols/json_test_data/complex.json,sha256=fGbU2uxufM6Pt-sg3sHazL0oiqusseIPOid-1sxi0Do,212
 cirq/protocols/json_test_data/complex.repr,sha256=A-Gf4uPuecYNJPvdQYJ694YCx0uy1RV1HD3MYN6WUlo,19
 cirq/protocols/json_test_data/datetime.datetime.json,sha256=fb50Dr0wfnkYrG_pBzUsIstWb9GsFHbpnh9eZKEqhAc,67
@@ -835,7 +837,7 @@ cirq/protocols/json_test_data/pandas.Index.json_inward,sha256=KENE3PlSxmtMdnikuJ
 cirq/protocols/json_test_data/pandas.Index.repr_inward,sha256=2YnQUO58RGFGvuVjmR57v25YIvPAnTgVYh0jeQYhXHo,52
 cirq/protocols/json_test_data/pandas.MultiIndex.json,sha256=pF6YdRE3Qjhsf8CeGEZQvX5AWHAWaMNQF6c661Sqrxg,233
 cirq/protocols/json_test_data/pandas.MultiIndex.repr,sha256=g4q-1zFWYG8T7IAI0anQ5aMHSFlGF2CJsAoYdZzbGa8,80
-cirq/protocols/json_test_data/spec.py,sha256=8s-ZCIP8I-aNIMxKsnlpv8ej9_py3Rxxrr2loU0K6W4,5531
+cirq/protocols/json_test_data/spec.py,sha256=7NY4zWAt-RG5k5Y1TZLIUEKzQNGsW4QE6axboziJUG8,5593
 cirq/protocols/json_test_data/sympy.Add.json,sha256=fVilRXllnMRnQcXuoU06IlwZOWK9Kwim1t6Q_s6z97g,1000
 cirq/protocols/json_test_data/sympy.Add.repr,sha256=9L_05ZlcrFpo8QoExFAAO_kEEpc7SSqGyp0vudkRlsU,228
 cirq/protocols/json_test_data/sympy.E.json,sha256=d2NfgXTX-YhePH-I0SkkI-lSSJ6PkqTnUZ-yngh9GQk,39
@@ -1040,8 +1042,8 @@ cirq/transformers/synchronize_terminal_measurements.py,sha256=p061MYYglY6HhWYYkF
 cirq/transformers/synchronize_terminal_measurements_test.py,sha256=VTiw5S3s_Y31qR7ME8Mzv50LdJ_6M3DOtgwvtziQzPI,7742
 cirq/transformers/transformer_api.py,sha256=beDdouAulWeg4SQRwAjgc5H1jrKD0maYY32XczsHokI,16964
 cirq/transformers/transformer_api_test.py,sha256=f-Vup0VCUvTqJKm5kWHf6xet7sFTerLMGYzJHy8Rc5s,13045
-cirq/transformers/transformer_primitives.py,sha256=zj-GYew5sioNjOxOgjIjanxxDikYiewZcc9vPVCDZz0,37544
-cirq/transformers/transformer_primitives_test.py,sha256=pJhCN28Tev7F04waYRtTlgJEY8fqtBcYJZDPSPUAWLw,41319
+cirq/transformers/transformer_primitives.py,sha256=tINAM7D7_MN9QzXwa7_BJkZ6ThcfYLxolbSsQQx2oM0,37578
+cirq/transformers/transformer_primitives_test.py,sha256=TwznpAZpJue9gE1sRQAl_0n6YyXTimckgGy4-2YrEvY,42256
 cirq/transformers/analytical_decompositions/__init__.py,sha256=ZNtETntol3G_n6uqzGxOmBanGMbCj0QAc-5vicN2jkM,2724
 cirq/transformers/analytical_decompositions/clifford_decomposition.py,sha256=DsuuP91pm2dX0CO4rWwmJAJyAfuXMcA1UJK0g8krp7k,6726
 cirq/transformers/analytical_decompositions/clifford_decomposition_test.py,sha256=AAZh_9vEb5f2E_EItPZTlMRNdv0d47AwqTn4BytX0UI,7102
@@ -1152,8 +1154,8 @@ cirq/work/sampler.py,sha256=JEAeQQRF3bqlO9AkOf4XbrTATDI5f5JgyM_FAUCNxao,19751
 cirq/work/sampler_test.py,sha256=B2ZsuqGT854gQtBIAh8k0LiG9Vj5wSzcGvkxOUoTcW4,13217
 cirq/work/zeros_sampler.py,sha256=x1C7cup66a43n-3tm8QjhiqJa07qcJW10FxNp9jJ59Q,2356
 cirq/work/zeros_sampler_test.py,sha256=JIkpBBFPJe5Ba4142vzogyWyboG1Q1ZAm0UVGgOoZn8,3279
-cirq_core-1.4.0.dev20240315194126.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.4.0.dev20240315194126.dist-info/METADATA,sha256=cJfQKWPoUGyyBxBmMYQiSWBAEraf43RA2ZqhjxVdK18,2090
-cirq_core-1.4.0.dev20240315194126.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cirq_core-1.4.0.dev20240315194126.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.4.0.dev20240315194126.dist-info/RECORD,,
+cirq_core-1.4.0.dev20240318170608.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.4.0.dev20240318170608.dist-info/METADATA,sha256=9LlNx-yxMHX68BtN6ge8WxHkurWmdK7I1u4F4lAWbWA,2090
+cirq_core-1.4.0.dev20240318170608.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cirq_core-1.4.0.dev20240318170608.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.4.0.dev20240318170608.dist-info/RECORD,,