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.

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

Remove deprecated class SerializableDevice #5743

Merged
merged 7 commits into from
Jul 13, 2022
Merged

Remove deprecated class SerializableDevice #5743

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ba3dc7
Remove deprecated class SerializableDevice
pavoljuhas Jul 12, 2022
78f9c83
Remove deprecated property GridDevice.qubits
pavoljuhas Jul 12, 2022
9a5616c
Remove documentation references to SerializableDevice
pavoljuhas Jul 12, 2022
fdf39af
Use full reference to cirq.Device in a docstring
pavoljuhas Jul 12, 2022
d7ae409
Clarify section title in specification.md
pavoljuhas Jul 12, 2022
5fee35e
Fix circuit validation example in specification doc
pavoljuhas Jul 13, 2022
fc86275
Merge branch 'master' into drop-cirq_google.SerializableDevice
pavoljuhas Jul 13, 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
1 change: 0 additions & 1 deletion cirq-google/cirq_google/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
GoogleNoiseProperties,
GridDevice,
NoiseModelFromGoogleNoiseProperties,
SerializableDevice,
Sycamore,
Sycamore23,
)
Expand Down
2 changes: 0 additions & 2 deletions cirq-google/cirq_google/devices/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,3 @@
from cirq_google.devices.known_devices import Sycamore, Sycamore23

from cirq_google.devices.grid_device import GridDevice

from cirq_google.devices.serializable_device import SerializableDevice
9 changes: 0 additions & 9 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 @@ -305,15 +305,6 @@ def metadata(self) -> cirq.GridDeviceMetadata:
"""Get metadata information for the device."""
return self._metadata

# Some user code using SerializableDevices gets the qubit list via `device.qubits`.
# This is a stopgap solution to prevent user breakage with the change to GridDevice.
@property # type: ignore
@cirq._compat.deprecated(
deadline='v0.16', fix='Change `device.qubits` to `device.metadata.qubit_set`.'
)
def qubits(self) -> List[cirq.Qid]:
return sorted(self._metadata.qubit_set)

def validate_operation(self, operation: cirq.Operation) -> None:
"""Raises an exception if an operation is not valid.

Expand Down
8 changes: 0 additions & 8 deletions cirq-google/cirq_google/devices/grid_device_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,3 @@ def test_to_proto_empty():
assert len(device.metadata.qubit_pairs) == 0
assert device.metadata.gateset == cirq.Gateset()
assert device.metadata.gate_durations is None


def test_grid_device_qubits():
device_info, spec = _create_device_spec_with_horizontal_couplings()
device = cirq_google.GridDevice.from_proto(spec)

with cirq.testing.assert_deprecated('device.qubits', deadline='v0.16'):
assert device.qubits == device_info.grid_qubits
347 changes: 0 additions & 347 deletions cirq-google/cirq_google/devices/serializable_device.py
View file
Open in desktop

This file was deleted.

Loading