Expand Floquet calibration to arbitrary FSim gates #4164

fedimser · 2021-06-05T18:19:41Z

Added a method try_convert_gate_to_fsim which can convert to PhaseCalibratedFSimGate wide range of gates, including sqrt(iSWAP), Sycamore and Controlled-Z gates.
Used this method (instead of try_convert_sqrt_iswap_to_fsim) as default gate translator in all methods in workflow.py.

As a result, compensation step Floquet calibration now works not only for sqrt(iSWAP), but also for:

all FSim gates (including Sycamore gate);
PhasedFSim gates (such that zeta=gamma=0);
all ISwapPow gates;
all PhasedISwapPow gates;
CZPow gates without global phase (including CZ).

This change doesn't affect characterization step the Floquet calibration.

mrwojtek

Thank you Dmytro for doing this! The concepts contained here are a little bit complex. I've tried to explain some of them but feel free to ping me if some of my comments are not clear for you.

cirq-google/cirq_google/calibration/workflow_test.py

cirq-google/cirq_google/calibration/workflow.py

cirq-google/cirq_google/calibration/phased_fsim.py

cirq-google/cirq_google/calibration/phased_fsim_test.py

fedimser · 2021-06-08T18:01:25Z

Hi Wojtek, I resolved most of your comments, and rewrote try_convert_gate_to_fsim so it tries to make engine gate as "canonical" as possible, in paricular now theta is in range [0, pi).
I am still not sure how to write good integration test for the new compensation - let's discuss that. Should i expand engine simulator to support arbitrary imperfect FSim gates (and not only sqrt(iSWAP)).

fedimser · 2021-06-14T11:00:06Z

I added a test utilizing the engine simulator. Please take another look.
@mrwojtek

Merge branch 'master' into calibration-expand

fedimser · 2021-06-15T18:36:14Z

Hi @mrwojtek, I addressed your comments and added more tests. PTAL.

mrwojtek

Three minor issues and one question which maybe you could clarify for me and we are done I think.

cirq-google/cirq_google/calibration/engine_simulator.py

cirq-google/cirq_google/calibration/phased_fsim.py

cirq-google/cirq_google/calibration/workflow_test.py

mrwojtek · 2021-06-16T14:36:16Z

cirq-google/cirq_google/calibration/workflow_test.py

+    engine_simulator = cirq_google.PhasedFSimEngineSimulator.create_from_dictionary(
+        parameters={
+            (a, b): {
+                cirq.FSimGate(theta=0, phi=np.pi): params_cz_ab,


Could you use cirq.CZ gate here and below?

I can't, because cirq.CZ != FSimGate(theta=0, phi=np.pi), but gate translator converts all gates to FSimGate. So all gates in this map must be FSimGate, otherwise there will be no match.

Yes, you're right. If this code will be used heavily in the future we might think about normalizing all gates to a common form inside the "create_from_dictionary" by using the converter itself. (Let's postpone it for now.)

fedimser · 2021-06-16T21:33:54Z

I addressed issue with global_phase and other suggestions.
@mrwojtek

mrwojtek · 2021-06-17T07:45:59Z

cirq-google/cirq_google/calibration/workflow_test.py

+    engine_simulator = cirq_google.PhasedFSimEngineSimulator.create_from_dictionary(
+        parameters={
+            (a, b): {
+                cirq.FSimGate(theta=0, phi=np.pi): params_cz_ab,


Yes, you're right. If this code will be used heavily in the future we might think about normalizing all gates to a common form inside the "create_from_dictionary" by using the converter itself. (Let's postpone it for now.)

mrwojtek · 2021-06-17T07:48:55Z

@balopat can we have approval from code owners for this?

tanujkhattar

LGTM % comment

tanujkhattar · 2021-06-18T23:56:08Z

cirq-google/cirq_google/calibration/phased_fsim.py

@@ -1038,3 +1046,51 @@ def try_convert_sqrt_iswap_to_fsim(gate: cirq.Gate) -> Optional[PhaseCalibratedF
        return PhaseCalibratedFSimGate(cirq.FSimGate(theta=np.pi / 4, phi=0.0), 0.5)

    return None
+
+
+def try_convert_gate_to_fsim(gate: cirq.Gate) -> Optional[PhaseCalibratedFSimGate]:


[Unrelated comment] We should work towards getting cirq.match()! #2536

cirq-google/cirq_google/calibration/phased_fsim.py

Goal of this PR is that circuits having any of these 2-qubit gates (sqrt(iSWAP), Sycamore) can be calibrated on real hardware. In #4164 I ensured that any FSim-compatible gate can be handled on compensation phase. But on characterization step we can support only these 2 gates, because only they are implemented in hardware (so far). For that: * Added method `try_convert_syc_or_sqrt_iswap_to_fsim` which is restriction of `try_convert_gate_to_fsim` on gates supported by hardware. * Used that method in `workflow.py` as gate translator everywhere where `try_convert_sqrt_iswap_to_fsim` was used. * Fixed a bug in `_merge_into_calibrations` so if there are calibrations for 2 different gates, it wouldn't fail with assertion error, but would append new calibration to the list of calibration. * Modified a test `test_run_zeta_chi_gamma_calibration_for_moments` so the circuit under test contains gates of 2 types.

* Added a method try_convert_gate_to_fsim which can convert to PhaseCalibratedFSimGate wide range of gates, including sqrt(iSWAP), Sycamore and Controlled-Z gates. * Used this method (instead of try_convert_sqrt_iswap_to_fsim) as default gate translator in all methods in workflow.py. As a result, compensation step Floquet calibration now works not only for sqrt(iSWAP), but also for: * all FSim gates (including Sycamore gate); * PhasedFSim gates (such that zeta=gamma=0); * all ISwapPow gates; * all PhasedISwapPow gates; * CZPow gates without global phase (including CZ). This change doesn't affect characterization step the Floquet calibration.

…mlib#4248) Goal of this PR is that circuits having any of these 2-qubit gates (sqrt(iSWAP), Sycamore) can be calibrated on real hardware. In quantumlib#4164 I ensured that any FSim-compatible gate can be handled on compensation phase. But on characterization step we can support only these 2 gates, because only they are implemented in hardware (so far). For that: * Added method `try_convert_syc_or_sqrt_iswap_to_fsim` which is restriction of `try_convert_gate_to_fsim` on gates supported by hardware. * Used that method in `workflow.py` as gate translator everywhere where `try_convert_sqrt_iswap_to_fsim` was used. * Fixed a bug in `_merge_into_calibrations` so if there are calibrations for 2 different gates, it wouldn't fail with assertion error, but would append new calibration to the list of calibration. * Modified a test `test_run_zeta_chi_gamma_calibration_for_moments` so the circuit under test contains gates of 2 types.

Added function try_convert_gate_to_fsim

5c554f4

fedimser requested review from cduck, vtomole, wcourtney and a team as code owners June 5, 2021 18:19

fedimser requested a review from balopat June 5, 2021 18:19

google-cla bot added the cla: yes Makes googlebot stop complaining. label Jun 5, 2021

fedimser marked this pull request as draft June 5, 2021 18:21

fedimser added 4 commits June 5, 2021 19:22

format

31970eb

Add a test

e841ebf

format

a2842b7

Revert change to script

386504f

fedimser marked this pull request as ready for review June 5, 2021 19:54

mrwojtek self-requested a review June 7, 2021 07:15

mrwojtek reviewed Jun 7, 2021

View reviewed changes

fedimser added 5 commits June 8, 2021 00:12

Merge branch 'master' into calibration-expand

b80d6ca

Handle SycamoreGate specifically

d53341d

Addressed some comments from review

0a6a870

Removed 1 test

4a1fa77

Merge remote-tracking branch 'upstream/master' into calibration-expand

22015b3

Merge branch 'master' into calibration-expand

0defe32

fedimser marked this pull request as draft June 10, 2021 12:46

fedimser added 5 commits June 14, 2021 09:49

fix merge conflict

504d69b

Compare unitary matrices in test_try_convert_gate_to_fsim

7bac1e5

Expand engine simulator to handle arbitraty gates

f954824

Add integration test with engine simulator

8c59ce7

Add test for ValueError

e5c9953

fedimser marked this pull request as ready for review June 14, 2021 11:00

fedimser added 3 commits June 15, 2021 19:14

Merge branch 'master' into calibration-expand

1b5f47b

:wq

e49f58c

Merge branch 'master' into calibration-expand

test_create_from_dictionary_simulates_correctly

e80941f

mrwojtek reviewed Jun 16, 2021

View reviewed changes

fedimser added 6 commits June 16, 2021 21:31

Merge remote-tracking branch 'upstream/master' into calibration-expand

fe35e56

Correctlyhandle global phase for eigen gates

2bb32e1

Address comments from review

9911936

Improve coverage

f35ba78

Merge branch 'master' into calibration-expand

d1bd0cd

Improve coverage

130d6be

mrwojtek approved these changes Jun 17, 2021

View reviewed changes

tanujkhattar approved these changes Jun 19, 2021

View reviewed changes

fedimser and others added 6 commits June 21, 2021 10:22

Handle parameterized gates

aac8c37

Merge branch 'master' into calibration-expand

2bcfe95

Remove unused import

8d5a3cf

Use cirq.is_parameterized

e3114f4

Merge branch 'master' into calibration-expand

a73f71f

Merge branch 'master' into calibration-expand

7285e94

balopat added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Jun 21, 2021

CirqBot added the front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. label Jun 21, 2021

CirqBot merged commit a2f107c into quantumlib:master Jun 21, 2021

CirqBot removed automerge Tells CirqBot to sync and merge this PR. (If it's running.) front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. labels Jun 21, 2021

fedimser mentioned this pull request Jun 21, 2021

Support sqrt(iSWAP) and Sycamore gates in Floquet calibration #4248

Merged

Expand Floquet calibration to arbitrary FSim gates #4164

Expand Floquet calibration to arbitrary FSim gates #4164

Uh oh!

Conversation

fedimser commented Jun 5, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mrwojtek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fedimser commented Jun 8, 2021

Uh oh!

fedimser commented Jun 14, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fedimser commented Jun 15, 2021

Uh oh!

mrwojtek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mrwojtek Jun 16, 2021

Choose a reason for hiding this comment

Uh oh!

fedimser Jun 16, 2021

Choose a reason for hiding this comment

Uh oh!

mrwojtek Jun 17, 2021

Choose a reason for hiding this comment

Uh oh!

fedimser commented Jun 16, 2021

Uh oh!

mrwojtek Jun 17, 2021

Choose a reason for hiding this comment

Uh oh!

mrwojtek commented Jun 17, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tanujkhattar left a comment

Choose a reason for hiding this comment

Uh oh!

tanujkhattar Jun 18, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

fedimser commented Jun 5, 2021 •

edited

Loading

fedimser commented Jun 14, 2021 •

edited

Loading

mrwojtek commented Jun 17, 2021 •

edited

Loading