Skip to content

GridDeviceMetadata: allow qubit pairs in both directions #5241

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
Apr 26, 2022
Merged

GridDeviceMetadata: allow qubit pairs in both directions #5241

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e49b319
GridDeviceMetadata: allow qubit pairs in both directions
verult Apr 9, 2022
80eeb1d
Merge branch 'master' into griddevicemetadata-qubitpairs
CirqBot Apr 26, 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
17 changes: 11 additions & 6 deletions cirq-core/cirq/devices/grid_device_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def __init__(
connectivity.add_edges_from(sorted(edge_set), directed=False)
super().__init__(all_qubits, connectivity)

self._qubit_pairs = frozenset(edge_set)
self._qubit_pairs = frozenset({frozenset(pair) for pair in edge_set})
self._gateset = gateset
self._isolated_qubits = all_qubits.difference(node_set)

Expand All @@ -110,8 +110,12 @@ def __init__(
self._gate_durations = gate_durations

@property
def qubit_pairs(self) -> FrozenSet[Tuple['cirq.Qid', 'cirq.Qid']]:
"""Returns the set of all couple-able qubits on the device."""
def qubit_pairs(self) -> FrozenSet[FrozenSet['cirq.Qid']]:
"""Returns the set of all couple-able qubits on the device.

Each element in the outer frozenset is a 2-element frozenset representing a bidirectional
pair.
"""
return self._qubit_pairs

@property
Expand All @@ -135,15 +139,16 @@ def _value_equality_values_(self):
duration_equality = sorted(self._gate_durations.items(), key=lambda x: repr(x[0]))

return (
tuple(sorted(self._qubit_pairs)),
self._qubit_pairs,
self._gateset,
tuple(duration_equality),
tuple(sorted(self.qubit_set)),
)

def __repr__(self) -> str:
qubit_pair_tuples = frozenset({tuple(sorted(p)) for p in self._qubit_pairs})
return (
f'cirq.GridDeviceMetadata({repr(self._qubit_pairs)},'
f'cirq.GridDeviceMetadata({repr(qubit_pair_tuples)},'
f' {repr(self._gateset)}, {repr(self._gate_durations)},'
f' {repr(self.qubit_set)})'
)
Expand All @@ -154,7 +159,7 @@ def _json_dict_(self):
duration_payload = sorted(self._gate_durations.items(), key=lambda x: repr(x[0]))

return {
'qubit_pairs': sorted(list(self._qubit_pairs)),
'qubit_pairs': sorted([sorted(pair) for pair in self._qubit_pairs]),
'gateset': self._gateset,
'gate_durations': duration_payload,
'all_qubits': sorted(list(self.qubit_set)),
Expand Down
14 changes: 7 additions & 7 deletions cirq-core/cirq/devices/grid_device_metadata_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ def test_griddevice_metadata():
metadata = cirq.GridDeviceMetadata(qubit_pairs, gateset, all_qubits=qubits + isolated_qubits)
expected_pairings = frozenset(
{
(cirq.GridQubit(0, 0), cirq.GridQubit(0, 1)),
(cirq.GridQubit(0, 1), cirq.GridQubit(0, 2)),
(cirq.GridQubit(0, 1), cirq.GridQubit(1, 1)),
(cirq.GridQubit(0, 2), cirq.GridQubit(1, 2)),
(cirq.GridQubit(1, 0), cirq.GridQubit(1, 1)),
(cirq.GridQubit(1, 1), cirq.GridQubit(1, 2)),
(cirq.GridQubit(0, 0), cirq.GridQubit(1, 0)),
frozenset((cirq.GridQubit(0, 0), cirq.GridQubit(0, 1))),
frozenset((cirq.GridQubit(0, 1), cirq.GridQubit(0, 2))),
frozenset((cirq.GridQubit(0, 1), cirq.GridQubit(1, 1))),
frozenset((cirq.GridQubit(0, 2), cirq.GridQubit(1, 2))),
frozenset((cirq.GridQubit(1, 0), cirq.GridQubit(1, 1))),
frozenset((cirq.GridQubit(1, 1), cirq.GridQubit(1, 2))),
frozenset((cirq.GridQubit(0, 0), cirq.GridQubit(1, 0))),
}
)
assert metadata.qubit_set == frozenset(qubits + isolated_qubits)
Expand Down
2 changes: 1 addition & 1 deletion cirq-core/cirq/protocols/json_test_data/GridDeviceMetadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,4 +197,4 @@
"col": 10
}
]
}
}
2 changes: 1 addition & 1 deletion cirq-core/cirq/protocols/json_test_data/GridDeviceMetadata.repr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cirq.GridDeviceMetadata(frozenset({(cirq.GridQubit(0, 2), cirq.GridQubit(1, 2)), (cirq.GridQubit(0, 0), cirq.GridQubit(1, 0)), (cirq.GridQubit(0, 1), cirq.GridQubit(1, 1)), (cirq.GridQubit(0, 0), cirq.GridQubit(0, 1)), (cirq.GridQubit(0, 1), cirq.GridQubit(0, 2)), (cirq.GridQubit(1, 1), cirq.GridQubit(1, 2)), (cirq.GridQubit(1, 0), cirq.GridQubit(1, 1))}), cirq.Gateset(cirq.ops.common_gates.XPowGate, cirq.ops.common_gates.YPowGate, cirq.ops.common_gates.ZPowGate), {cirq.GateFamily(cirq.ops.common_gates.XPowGate): cirq.Duration(nanos=1), cirq.GateFamily(cirq.ops.common_gates.YPowGate): cirq.Duration(picos=1), cirq.GateFamily(cirq.ops.common_gates.ZPowGate): cirq.Duration(picos=1)}, cirq.GridQubit.rect(2, 3) + [cirq.GridQubit(9, 9), cirq.GridQubit(10, 10)])
cirq.GridDeviceMetadata(frozenset({(cirq.GridQubit(0, 1), cirq.GridQubit(0, 2)), (cirq.GridQubit(1, 1), cirq.GridQubit(1, 2)), (cirq.GridQubit(1, 0), cirq.GridQubit(1, 1)), (cirq.GridQubit(0, 0), cirq.GridQubit(0, 1)), (cirq.GridQubit(0, 0), cirq.GridQubit(1, 0)), (cirq.GridQubit(0, 2), cirq.GridQubit(1, 2)), (cirq.GridQubit(0, 1), cirq.GridQubit(1, 1))}), cirq.Gateset(cirq.ops.common_gates.XPowGate, cirq.ops.common_gates.YPowGate, cirq.ops.common_gates.ZPowGate, unroll_circuit_op = True), {cirq.GateFamily(gate=cirq.ops.common_gates.XPowGate, ignore_global_phase=True): cirq.Duration(nanos=1), cirq.GateFamily(gate=cirq.ops.common_gates.YPowGate, ignore_global_phase=True): cirq.Duration(picos=1), cirq.GateFamily(gate=cirq.ops.common_gates.ZPowGate, ignore_global_phase=True): cirq.Duration(picos=1)}, frozenset({cirq.GridQubit(0, 0), cirq.GridQubit(1, 0), cirq.GridQubit(1, 2), cirq.GridQubit(10, 10), cirq.GridQubit(0, 2), cirq.GridQubit(0, 1), cirq.GridQubit(1, 1), cirq.GridQubit(9, 9)}))
2 changes: 1 addition & 1 deletion cirq-google/cirq_google/devices/serializable_device_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def test_metadata_correct():
qubits=qubits, pairs=pairs, gate_sets=[cg.FSIM_GATESET]
)
device = cgdk.SerializableDevice.from_proto(device_proto, gate_sets=[cg.FSIM_GATESET])
assert device.metadata.qubit_pairs == frozenset(pairs)
assert device.metadata.qubit_pairs == frozenset({frozenset(p) for p in pairs})
assert device.metadata.gateset == cirq.Gateset(
cirq.FSimGate,
cirq.ISwapPowGate,
Expand Down
24 changes: 12 additions & 12 deletions cirq-google/cirq_google/devices/xmon_device_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@ def test_device_metadata():
)
assert d.metadata.qubit_pairs == frozenset(
{
(cirq.GridQubit(0, 0), cirq.GridQubit(0, 1)),
(cirq.GridQubit(0, 1), cirq.GridQubit(1, 1)),
(cirq.GridQubit(2, 0), cirq.GridQubit(2, 1)),
(cirq.GridQubit(0, 0), cirq.GridQubit(1, 0)),
(cirq.GridQubit(0, 2), cirq.GridQubit(1, 2)),
(cirq.GridQubit(1, 0), cirq.GridQubit(2, 0)),
(cirq.GridQubit(1, 0), cirq.GridQubit(1, 1)),
(cirq.GridQubit(1, 1), cirq.GridQubit(2, 1)),
(cirq.GridQubit(1, 1), cirq.GridQubit(1, 2)),
(cirq.GridQubit(0, 1), cirq.GridQubit(0, 2)),
(cirq.GridQubit(2, 1), cirq.GridQubit(2, 2)),
(cirq.GridQubit(1, 2), cirq.GridQubit(2, 2)),
frozenset((cirq.GridQubit(0, 0), cirq.GridQubit(0, 1))),
frozenset((cirq.GridQubit(0, 1), cirq.GridQubit(1, 1))),
frozenset((cirq.GridQubit(2, 0), cirq.GridQubit(2, 1))),
frozenset((cirq.GridQubit(0, 0), cirq.GridQubit(1, 0))),
frozenset((cirq.GridQubit(0, 2), cirq.GridQubit(1, 2))),
frozenset((cirq.GridQubit(1, 0), cirq.GridQubit(2, 0))),
frozenset((cirq.GridQubit(1, 0), cirq.GridQubit(1, 1))),
frozenset((cirq.GridQubit(1, 1), cirq.GridQubit(2, 1))),
frozenset((cirq.GridQubit(1, 1), cirq.GridQubit(1, 2))),
frozenset((cirq.GridQubit(0, 1), cirq.GridQubit(0, 2))),
frozenset((cirq.GridQubit(2, 1), cirq.GridQubit(2, 2))),
frozenset((cirq.GridQubit(1, 2), cirq.GridQubit(2, 2))),
}
)

Expand Down