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

Add FSimViaModelTag #6527

Merged
merged 6 commits into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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-google/cirq_google/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
from cirq_google.ops import (
CalibrationTag,
FSimGateFamily,
FSimViaModelTag,
InternalGate,
PhysicalZTag,
SYC,
Expand Down
1 change: 1 addition & 0 deletions cirq-google/cirq_google/json_resolver_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ def _old_xmon(*args, **kwargs):
'GateTabulation': TwoQubitGateTabulation,
'PhysicalZTag': cirq_google.PhysicalZTag,
'FSimGateFamily': cirq_google.FSimGateFamily,
'FSimViaModelTag': cirq_google.FSimViaModelTag,
'SycamoreTargetGateset': cirq_google.SycamoreTargetGateset,
'cirq.google.BitstringsMeasurement': cirq_google.BitstringsMeasurement,
'cirq.google.QuantumExecutable': cirq_google.QuantumExecutable,
Expand Down
3 changes: 3 additions & 0 deletions cirq-google/cirq_google/json_test_data/FSimViaModelTag.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"cirq_type": "FSimViaModelTag"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cirq_google.FSimViaModelTag()
2 changes: 2 additions & 0 deletions cirq-google/cirq_google/ops/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

from cirq_google.ops.fsim_gate_family import FSimGateFamily

from cirq_google.ops.fsim_via_model_tag import FSimViaModelTag

from cirq_google.ops.physical_z_tag import PhysicalZTag

from cirq_google.ops.sycamore_gate import SycamoreGate, SYC
Expand Down
44 changes: 44 additions & 0 deletions cirq-google/cirq_google/ops/fsim_via_model_tag.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Copyright 2024 The Cirq Developers
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
"""A class that can be used to denote FSim gate implementation using polynomial model."""
from typing import Any, Dict

import cirq


class FSimViaModelTag:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Would it make sense to be more specific in the name, e.g. FSimViaPolyModelTag?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FSimViaModel is also the name used in the pyle. (I wish I thought twice on this name). But maybe without Poly is preferred -- in case we have other modeling approach to do the implementation in the future.

"""A tag class to denote FSim gate implementation using polynomial model.

Without the tag, the translation of FSim gate implementation is possible only for a certain
angles. For example, when theta=pi/2, phi=0, it translates into the same implementation
as the SWAP gate. If FSimGate is tagged with this class, the translation will become
a coupler gate that with proper coupler strength and coupler length via some polynomial
modelling. Note not all combination of theta and phi in FSim gate are feasible and
you need the calibration for these angle in advance before using them.
"""

def __str__(self) -> str:
return 'FSimViaModelTag()'

def __repr__(self) -> str:
return 'cirq_google.FSimViaModelTag()'

def _json_dict_(self) -> Dict[str, Any]:
return cirq.obj_to_dict_helper(self, [])

def __eq__(self, other) -> bool:
return isinstance(other, FSimViaModelTag)

def __hash__(self) -> int:
return hash("FSimViaModelTag")
28 changes: 28 additions & 0 deletions cirq-google/cirq_google/ops/fsim_via_model_tag_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Copyright 2024 The Cirq Developers
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import cirq
import cirq_google


def test_equality():
assert cirq_google.FSimViaModelTag() == cirq_google.FSimViaModelTag()
assert hash(cirq_google.FSimViaModelTag()) == hash(cirq_google.FSimViaModelTag())


def test_str_repr():
assert str(cirq_google.FSimViaModelTag()) == 'FSimViaModelTag()'
assert repr(cirq_google.FSimViaModelTag()) == 'cirq_google.FSimViaModelTag()'
cirq.testing.assert_equivalent_repr(
cirq_google.FSimViaModelTag(), setup_code=('import cirq\nimport cirq_google\n')
)