Add FSimViaModel Gate into device.proto (#6548)

* Add FSimViaModel Gate * Update the name * Add serialization on grid device * Fix the test
quantumlib · Apr 4, 2024 · b8f0663 · b8f0663
1 parent bc3f9ff
commit b8f0663
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 41 deletions.
diff --git a/cirq-google/cirq_google/api/v2/device.proto b/cirq-google/cirq_google/api/v2/device.proto
@@ -56,6 +56,7 @@ message GateSpecification {
     CouplerPulse coupler_pulse = 9;
     Measurement meas = 10;
     Wait wait = 11;
+    FSimViaModel fsim_via_model = 12;
   }
 
   // Gate types available to Google devices.
@@ -72,6 +73,7 @@ message GateSpecification {
   message CouplerPulse {}
   message Measurement {}
   message Wait {}
+  message FSimViaModel {}
 }
 
 message GateSet {

diff --git a/cirq-google/cirq_google/api/v2/device_pb2.py b/cirq-google/cirq_google/api/v2/device_pb2.py
diff --git a/cirq-google/cirq_google/api/v2/device_pb2.pyi b/cirq-google/cirq_google/api/v2/device_pb2.pyi
diff --git a/cirq-google/cirq_google/devices/grid_device.py b/cirq-google/cirq_google/devices/grid_device.py
@@ -156,6 +156,10 @@ class _GateRepresentations:
         gate_spec_name='meas', supported_gates=[cirq.GateFamily(cirq.MeasurementGate)]
     ),
     _GateRepresentations(gate_spec_name='wait', supported_gates=[cirq.GateFamily(cirq.WaitGate)]),
+    _GateRepresentations(
+        gate_spec_name='fsim_via_model',
+        supported_gates=[cirq.GateFamily(cirq.FSimGate, tags_to_accept=[ops.FSimViaModelTag()])],
+    ),
 ]
 
 

diff --git a/cirq-google/cirq_google/devices/grid_device_test.py b/cirq-google/cirq_google/devices/grid_device_test.py
@@ -77,6 +77,7 @@ def _create_device_spec_with_horizontal_couplings():
         'coupler_pulse',
         'meas',
         'wait',
+        'fsim_via_model',
     ]
     gate_durations = [(n, i * 1000) for i, n in enumerate(gate_names)]
     for gate_name, duration in sorted(gate_durations):
@@ -109,6 +110,7 @@ def _create_device_spec_with_horizontal_couplings():
         cirq.GateFamily(cirq_google.experimental.ops.coupler_pulse.CouplerPulse),
         cirq.GateFamily(cirq.ops.measurement_gate.MeasurementGate),
         cirq.GateFamily(cirq.ops.wait_gate.WaitGate),
+        cirq.GateFamily(cirq.ops.FSimGate, tags_to_accept=[cirq_google.FSimViaModelTag()]),
     )
 
     base_duration = cirq.Duration(picos=1_000)
@@ -139,6 +141,10 @@ def _create_device_spec_with_horizontal_couplings():
         cirq.GateFamily(cirq_google.experimental.ops.coupler_pulse.CouplerPulse): base_duration * 7,
         cirq.GateFamily(cirq.ops.measurement_gate.MeasurementGate): base_duration * 8,
         cirq.GateFamily(cirq.ops.wait_gate.WaitGate): base_duration * 9,
+        cirq.GateFamily(
+            cirq.ops.FSimGate, tags_to_accept=[cirq_google.FSimViaModelTag()]
+        ): base_duration
+        * 10,
     }
 
     expected_target_gatesets = (
@@ -164,6 +170,7 @@ def _create_device_spec_with_horizontal_couplings():
                 ),
                 cirq_google.experimental.ops.coupler_pulse.CouplerPulse,
                 cirq.ops.wait_gate.WaitGate,
+                cirq.GateFamily(cirq.ops.FSimGate, tags_to_accept=[cirq_google.FSimViaModelTag()]),
             ]
         ),
         cirq_google.SycamoreTargetGateset(),
@@ -189,6 +196,7 @@ def _create_device_spec_with_horizontal_couplings():
                 ),
                 cirq_google.experimental.ops.coupler_pulse.CouplerPulse,
                 cirq.ops.wait_gate.WaitGate,
+                cirq.GateFamily(cirq.ops.FSimGate, tags_to_accept=[cirq_google.FSimViaModelTag()]),
             ]
         ),
     )
@@ -505,6 +513,7 @@ def test_device_from_device_information_equals_device_from_proto():
         cirq_google.experimental.ops.coupler_pulse.CouplerPulse,
         cirq.ops.measurement_gate.MeasurementGate,
         cirq.ops.wait_gate.WaitGate,
+        cirq.GateFamily(cirq.ops.FSimGate, tags_to_accept=[cirq_google.FSimViaModelTag()]),
     )
 
     base_duration = cirq.Duration(picos=1_000)
@@ -525,6 +534,10 @@ def test_device_from_device_information_equals_device_from_proto():
         cirq.GateFamily(cirq_google.experimental.ops.coupler_pulse.CouplerPulse): base_duration * 7,
         cirq.GateFamily(cirq.ops.measurement_gate.MeasurementGate): base_duration * 8,
         cirq.GateFamily(cirq.ops.wait_gate.WaitGate): base_duration * 9,
+        cirq.GateFamily(
+            cirq.ops.FSimGate, tags_to_accept=[cirq_google.FSimViaModelTag()]
+        ): base_duration
+        * 10,
     }
 
     device_from_information = cirq_google.GridDevice._from_device_information(
@@ -627,6 +640,10 @@ def test_to_proto():
         cirq.GateFamily(cirq_google.experimental.ops.coupler_pulse.CouplerPulse): base_duration * 7,
         cirq.GateFamily(cirq.ops.measurement_gate.MeasurementGate): base_duration * 8,
         cirq.GateFamily(cirq.ops.wait_gate.WaitGate): base_duration * 9,
+        cirq.GateFamily(
+            cirq.ops.FSimGate, tags_to_accept=[cirq_google.FSimViaModelTag()]
+        ): base_duration
+        * 10,
     }
 
     spec = cirq_google.GridDevice._from_device_information(