Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added MSGate to top level #6466

Merged
merged 9 commits into from
Mar 16, 2024
Merged

Added MSGate to top level #6466

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
638ed83
add `MSGate` to top level
prakharb10 Feb 15, 2024
761c1d8
Merge branch 'main' into cirq-6354
tanujkhattar Feb 28, 2024
ffdb3de
mark `MSGate` as `not_yet_serializable`
prakharb10 Feb 28, 2024
e7bad1f
Merge branch 'main' into cirq-6354
prakharb10 Feb 28, 2024
8d88fdd
Merge branch 'main' into cirq-6354
prakharb10 Mar 1, 2024
3b02bf7
Merge branch 'main' into cirq-6354
pavoljuhas Mar 15, 2024
dde24b6
Revert "mark `MSGate` as `not_yet_serializable`"
pavoljuhas Mar 16, 2024
90043bb
Test json serialization of cirq.MSGate without custom resolver
pavoljuhas Mar 16, 2024
f959478
Use the "cirq" namespace to JSON-serialize `cirq.MSGate`
pavoljuhas Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cirq-core/cirq/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@
MatrixGate,
MixedUnitaryChannel,
M,
MSGate,
measure,
measure_each,
measure_paulistring_terms,
Expand Down
4 changes: 2 additions & 2 deletions cirq-core/cirq/ops/parity_gates_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -325,7 +325,7 @@ def test_ms_diagrams():
def test_json_serialization():
def custom_resolver(cirq_type: str):
if cirq_type == "MSGate":
return cirq.ops.MSGate
return cirq.MSGate
return None

assert cirq.read_json(
Expand Down
1 change: 1 addition & 0 deletions cirq-core/cirq/protocols/json_test_data/spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
'KakDecomposition',
'LinearCombinationOfGates',
'LinearCombinationOfOperations',
'MSGate', # namespace conflict with `cirq_ionq.ionq_native_gates.MSGate`
'PauliSumCollector',
'PauliSumExponential',
'PeriodicValue',
Expand Down