Skip to content

cirq_google GridDevice: set JSON namespace to cirq.google #5512

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

Merged
merged 2 commits into from
Jun 14, 2022
Merged

cirq_google GridDevice: set JSON namespace to cirq.google #5512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2280e5
cirq_google GridDevice: set JSON namespace to cirq.google
verult Jun 14, 2022
4b544e1
Merge branch 'master' into cg-device-refactor/griddevice-json-namespace
CirqBot Jun 14, 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
4 changes: 4 additions & 0 deletions cirq-google/cirq_google/devices/grid_device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,10 @@ def _repr_pretty_(self, p: Any, cycle: bool) -> None:
def __repr__(self) -> str:
return f'cirq_google.GridDevice({repr(self._metadata)})'

@classmethod
def _json_namespace_(cls) -> str:
return 'cirq.google'

def _json_dict_(self):
return {'metadata': self._metadata}

Expand Down
2 changes: 1 addition & 1 deletion cirq-google/cirq_google/json_resolver_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ def _class_resolver_dictionary() -> Dict[str, ObjectFactory]:
'GoogleNoiseProperties': cirq_google.GoogleNoiseProperties,
'SycamoreGate': cirq_google.SycamoreGate,
'GateTabulation': cirq_google.GateTabulation,
'GridDevice': cirq_google.GridDevice,
Copy link
Collaborator

@95-martin-orion 95-martin-orion Jun 14, 2022

Choose a reason for hiding this comment

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

[No change needed] As discussed, this is safe because GridDevice has not yet appeared in a Cirq release.

'PhysicalZTag': cirq_google.PhysicalZTag,
'FSimGateFamily': cirq_google.FSimGateFamily,
'FloquetPhasedFSimCalibrationOptions': cirq_google.FloquetPhasedFSimCalibrationOptions,
Expand Down Expand Up @@ -67,4 +66,5 @@ def _class_resolver_dictionary() -> Dict[str, ObjectFactory]:
'cirq.google.HardcodedQubitPlacer': cirq_google.HardcodedQubitPlacer,
# pylint: enable=line-too-long
'cirq.google.EngineResult': cirq_google.EngineResult,
'cirq.google.GridDevice': cirq_google.GridDevice,
}
2 changes: 1 addition & 1 deletion ...irq_google/json_test_data/GridDevice.json → ...son_test_data/cirq.google.GridDevice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"cirq_type": "GridDevice",
"cirq_type": "cirq.google.GridDevice",
"metadata": {
"cirq_type": "GridDeviceMetadata",
"qubit_pairs": [
Expand Down
0 ...irq_google/json_test_data/GridDevice.repr → ...son_test_data/cirq.google.GridDevice.repr
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions cirq-google/cirq_google/json_test_data/spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
'SimulatedProcessorRecord',
'SimulatedProcessorWithLocalDeviceRecord',
'EngineResult',
'GridDevice',
]
},
resolver_cache=_class_resolver_dictionary(),
Expand Down