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.

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

Move GateTabulation and friends to cirq-core as requested in #4461 #4602

Merged
merged 57 commits into from
Jan 10, 2022
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
8d7f5b6
Moved GateTabulation and friends to cirq-core as requested in #4461
Ashalynd Oct 27, 2021
46a7ede
obligatory followup fix for typo
Ashalynd Oct 27, 2021
8e8577b
one more typo fix
Ashalynd Oct 27, 2021
bd8fc86
Merge branch 'master' into gatetab
Ashalynd Oct 27, 2021
5215976
Merge branch 'master' into gatetab
Ashalynd Nov 10, 2021
decbfc6
added back deprecated classes for the time being
Ashalynd Nov 10, 2021
fa86a08
working on errors
Ashalynd Nov 17, 2021
79953c2
merged master
Ashalynd Nov 17, 2021
fa0788e
deleted by mistake
Ashalynd Nov 17, 2021
209f4a5
made tests pass
Ashalynd Nov 18, 2021
94823e2
mostly works
Ashalynd Nov 18, 2021
2344258
Merge branch 'master' into gatetab
Ashalynd Nov 18, 2021
3323f20
formatting
Ashalynd Nov 18, 2021
3d7b229
removed now-unreachable clause from test
Ashalynd Nov 18, 2021
bc5b5c4
lint fix
Ashalynd Nov 18, 2021
1950632
Merge branch 'master' into gatetab
Ashalynd Nov 18, 2021
bfcc0de
next round of changes
Ashalynd Dec 14, 2021
4ce92ae
merged latest master
Ashalynd Dec 14, 2021
43f1248
updated deprecation version
Ashalynd Dec 14, 2021
a6c3e23
Merge branch 'gatetab' of github.com:Ashalynd/Cirq into gatetab
Ashalynd Dec 14, 2021
54add0e
Merge branch 'master' into gatetab
Ashalynd Dec 15, 2021
74f1fae
renamed two_qubit_gate_compilation -> two_qubit_gate_tabulation
Ashalynd Dec 15, 2021
cb6a85d
renamed TwoQubitGateCompilation -> TwoQubitGateCompilationResult
Ashalynd Dec 15, 2021
d1b39de
merged updates
Ashalynd Dec 15, 2021
05ad3cf
merged master
Ashalynd Jan 2, 2022
105fb06
addressing reviewers suggestions
Ashalynd Jan 3, 2022
e086ef8
formatting
Ashalynd Jan 4, 2022
2f5c4ab
deprecate math_utils
Ashalynd Jan 4, 2022
4e47e09
more changes
Ashalynd Jan 5, 2022
f3d1a6d
Merge branch 'master' into gatetab
Ashalynd Jan 5, 2022
dba7a7b
restore undesired change.
Ashalynd Jan 5, 2022
ecca007
removed unnecessary tests, simplified the deprecated methods as sugge…
Ashalynd Jan 5, 2022
5dea605
Merge branch 'master' into gatetab
Ashalynd Jan 5, 2022
ff79ca7
deprecated one more class from gate_compiilation.py
Ashalynd Jan 5, 2022
e3a6314
Merge branch 'gatetab' of github.com:Ashalynd/Cirq into gatetab
Ashalynd Jan 5, 2022
943ec6d
formatting
Ashalynd Jan 5, 2022
b600a6d
Merge branch 'master' into gatetab
Ashalynd Jan 5, 2022
c4e935e
removed deprecated module
Ashalynd Jan 5, 2022
7a58a9f
fixed module description
Ashalynd Jan 5, 2022
fb884bc
restored unchanged file
Ashalynd Jan 5, 2022
623757e
added a test for deprecated math_utils
Ashalynd Jan 5, 2022
03c0996
added the deleted line back to keep formatter test happy
Ashalynd Jan 5, 2022
479814a
updated tests for "old" gate_compilcation
Ashalynd Jan 5, 2022
3a8d411
removed unused import
Ashalynd Jan 5, 2022
542614e
removed another unused import
Ashalynd Jan 5, 2022
31ee180
one more round of changes
Ashalynd Jan 5, 2022
38dce7e
formatting
Ashalynd Jan 5, 2022
b7ef60f
removed unused import
Ashalynd Jan 5, 2022
9b60602
Merge branch 'master' into gatetab
Ashalynd Jan 5, 2022
fd6fa49
Merge branch 'master' into gatetab
Ashalynd Jan 5, 2022
54a5a41
Merge branch 'master' into gatetab
Ashalynd Jan 7, 2022
65307cc
restore changes in json_serialization_test.py; disable serialization …
Ashalynd Jan 8, 2022
581bfaa
reenabled serialization test for GateTabulation
Ashalynd Jan 8, 2022
4b3da36
Merge branch 'master' into gatetab
Ashalynd Jan 8, 2022
a314689
addressed the reviewer's comments
Ashalynd Jan 10, 2022
fb73754
Merge branch 'gatetab' of github.com:Ashalynd/Cirq into gatetab
Ashalynd Jan 10, 2022
8232505
made linter happy
Ashalynd Jan 10, 2022
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
2 changes: 2 additions & 0 deletions cirq-core/cirq/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,11 @@
single_qubit_op_to_framed_phase_form,
stratified_circuit,
SynchronizeTerminalMeasurements,
two_qubit_gate_product_tabulation,
two_qubit_matrix_to_operations,
two_qubit_matrix_to_diagonal_and_operations,
two_qubit_matrix_to_sqrt_iswap_operations,
TwoQubitGateTabulation,
three_qubit_matrix_to_operations,
)

Expand Down
1 change: 1 addition & 0 deletions cirq-core/cirq/json_resolver_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ def _parallel_gate_op(gate, qubits):
'TaggedOperation': cirq.TaggedOperation,
'TiltedSquareLattice': cirq.TiltedSquareLattice,
'TrialResult': cirq.Result, # keep support for Cirq < 0.11.
'TwoQubitGateTabulation': cirq.TwoQubitGateTabulation,
'Result': cirq.Result,
'Rx': cirq.Rx,
'Ry': cirq.Ry,
Expand Down
6 changes: 6 additions & 0 deletions cirq-core/cirq/optimizers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@
two_qubit_matrix_to_operations,
two_qubit_matrix_to_diagonal_and_operations,
)

from cirq.optimizers.two_qubit_gate_compilation import (
two_qubit_gate_product_tabulation,
TwoQubitGateTabulation,
)

from cirq.optimizers.two_qubit_to_sqrt_iswap import (
two_qubit_matrix_to_sqrt_iswap_operations,
)
Expand Down
Loading