Skip to content

Commit

Permalink
merge issues
Browse files Browse the repository at this point in the history
  • Loading branch information
mpharrigan committed Nov 24, 2021
1 parent fa0345d commit ee3b78e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 0 additions & 4 deletions cirq-core/cirq/devices/named_topologies.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
import networkx as nx
from matplotlib import pyplot as plt

from cirq import _compat
from cirq.devices import GridQubit, LineQubit
from cirq.protocols.json_serialization import obj_to_dict_helper

from cirq import _compat
from cirq.devices import GridQubit, LineQubit
from cirq.protocols.json_serialization import dataclass_json_dict
Expand Down
6 changes: 5 additions & 1 deletion cirq-google/cirq_google/workflow/qubit_placement.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,12 @@ def place_circuit(
) -> Tuple['cirq.FrozenCircuit', Dict[Any, 'cirq.Qid']]:
return circuit.freeze(), {q: q for q in circuit.all_qubits()}

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

def _json_dict_(self) -> Dict[str, Any]:
return cirq.dataclass_json_dict(self, namespace='cirq.google')
return cirq.dataclass_json_dict(self)

def __repr__(self) -> str:
return _compat.dataclass_repr(self, namespace='cirq_google')

0 comments on commit ee3b78e

Please sign in to comment.