[WIP] Fixing JSON serialization

Author: verult

cirq-core/cirq/protocols/json_test_data/CZTargetGateset.json

@@ -2,34 +2,12 @@
   {
     "cirq_type": "CZTargetGateset",
     "atol": 1e-06,
-    "allow_partial_czs": false,
-    "additional_gates": [
-      {
-        "cirq_type": "GateFamily",
-        "gate": "GlobalPhaseGate",
-        "name": "Type GateFamily: cirq.ops.global_phase_op.GlobalPhaseGate",
-        "description": "Accepts `cirq.Gate` instances `g` s.t. `isinstance(g, cirq.ops.global_phase_op.GlobalPhaseGate)`",
-        "ignore_global_phase": true,
-        "tags_to_accept": [],
-        "tags_to_ignore": []
-      }
-    ]
+    "allow_partial_czs": false
   },
   {
     "cirq_type": "CZTargetGateset",
     "atol": 1e-08,
-    "allow_partial_czs": true,
-    "additional_gates": [
-      {
-        "cirq_type": "GateFamily",
-        "gate": "GlobalPhaseGate",
-        "name": "Type GateFamily: cirq.ops.global_phase_op.GlobalPhaseGate",
-        "description": "Accepts `cirq.Gate` instances `g` s.t. `isinstance(g, cirq.ops.global_phase_op.GlobalPhaseGate)`",
-        "ignore_global_phase": true,
-        "tags_to_accept": [],
-        "tags_to_ignore": []
-      }
-    ]
+    "allow_partial_czs": true
   },
   {
     "cirq_type": "CZTargetGateset",

cirq-core/cirq/protocols/json_test_data/CZTargetGateset.repr

@@ -1,14 +1,6 @@
 [
-    cirq.CZTargetGateset(
-        atol=1e-06,
-        allow_partial_czs=False,
-        additional_gates=[cirq.ops.global_phase_op.GlobalPhaseGate],
-    ),
-    cirq.CZTargetGateset(
-        atol=1e-08,
-        allow_partial_czs=True,
-        additional_gates=[cirq.ops.global_phase_op.GlobalPhaseGate],
-    ),
+    cirq.CZTargetGateset(atol=1e-06, allow_partial_czs=False, additional_gates=[]),
+    cirq.CZTargetGateset(atol=1e-08, allow_partial_czs=True, additional_gates=[]),
     cirq.CZTargetGateset(
         atol=1e-06,
         allow_partial_czs=True,

cirq-core/cirq/transformers/target_gatesets/cz_gateset.py

@@ -32,6 +32,7 @@ class CZTargetGateset(compilation_target_gateset.TwoQubitCompilationTargetGatese
     - `cirq.CZ` / `cirq.CZPowGate`: The two qubit entangling gate.
     - `cirq.PhasedXZGate`: Single qubit rotations.
     - `cirq.MeasurementGate`: Measurements.
+    - `cirq.GlobalPhaseGate`: Global phase.
 
     Optionally, users can also specify additional gates / gate families which should
     be accepted by this gateset via the `additional_gates` argument.
@@ -46,9 +47,7 @@ def __init__(
         *,
         atol: float = 1e-8,
         allow_partial_czs: bool = False,
-        additional_gates: Sequence[Union[Type['cirq.Gate'], 'cirq.Gate', 'cirq.GateFamily']] = (
-            ops.GlobalPhaseGate,
-        ),
+        additional_gates: Sequence[Union[Type['cirq.Gate'], 'cirq.Gate', 'cirq.GateFamily']] = (),
     ) -> None:
         """Initializes CZTargetGateset
 
@@ -63,6 +62,7 @@ def __init__(
             ops.CZPowGate if allow_partial_czs else ops.CZ,
             ops.MeasurementGate,
             ops.PhasedXZGate,
+            ops.GlobalPhaseGate,
             *additional_gates,
             name='CZPowTargetGateset' if allow_partial_czs else 'CZTargetGateset',
         )
@@ -99,16 +99,13 @@ def _value_equality_values_(self) -> Any:
         return self.atol, self.allow_partial_czs, frozenset(self.additional_gates)
 
     def _json_dict_(self) -> Dict[str, Any]:
-        return {
-            'atol': self.atol,
-            'allow_partial_czs': self.allow_partial_czs,
-            'additional_gates': list(self.additional_gates),
-        }
+        d: Dict[str, Any] = {'atol': self.atol, 'allow_partial_czs': self.allow_partial_czs}
+        if self.additional_gates:
+            d['additional_gates'] = list(self.additional_gates)
+        return d
 
     @classmethod
-    def _from_json_dict_(
-        cls, atol, allow_partial_czs, additional_gates=(ops.GlobalPhaseGate,), **kwargs
-    ):
+    def _from_json_dict_(cls, atol, allow_partial_czs, additional_gates=(), **kwargs):
         return cls(
             atol=atol, allow_partial_czs=allow_partial_czs, additional_gates=additional_gates
         )

cirq-core/cirq/transformers/target_gatesets/sqrt_iswap_gateset.py

@@ -33,6 +33,7 @@ class SqrtIswapTargetGateset(compilation_target_gateset.TwoQubitCompilationTarge
     - `cirq.SQRT_ISWAP` / `cirq.SQRT_ISWAP_INV`: The two qubit entangling gate.
     - `cirq.PhasedXZGate`: Single qubit rotations.
     - `cirq.MeasurementGate`: Measurements.
+    - `cirq.GlobalPhaseGate`: Global phase.
 
     Optionally, users can also specify additional gates / gate families which should
     be accepted by this gateset via the `additional_gates` argument.
@@ -48,9 +49,7 @@ def __init__(
         atol: float = 1e-8,
         required_sqrt_iswap_count: Optional[int] = None,
         use_sqrt_iswap_inv: bool = False,
-        additional_gates: Sequence[Union[Type['cirq.Gate'], 'cirq.Gate', 'cirq.GateFamily']] = (
-            ops.GlobalPhaseGate,
-        ),
+        additional_gates: Sequence[Union[Type['cirq.Gate'], 'cirq.Gate', 'cirq.GateFamily']] = (),
     ):
         """Initializes `cirq.SqrtIswapTargetGateset`
 
@@ -74,6 +73,7 @@ def __init__(
             ops.SQRT_ISWAP_INV if use_sqrt_iswap_inv else ops.SQRT_ISWAP,
             ops.MeasurementGate,
             ops.PhasedXZGate,
+            ops.GlobalPhaseGate,
             *additional_gates,
             name='SqrtIswapInvTargetGateset' if use_sqrt_iswap_inv else 'SqrtIswapTargetGateset',
         )
@@ -124,21 +124,18 @@ def _value_equality_values_(self) -> Any:
         )
 
     def _json_dict_(self) -> Dict[str, Any]:
-        return {
+        d: Dict[str, Any] = {
             'atol': self.atol,
             'required_sqrt_iswap_count': self.required_sqrt_iswap_count,
             'use_sqrt_iswap_inv': self.use_sqrt_iswap_inv,
-            'additional_gates': list(self.additional_gates),
         }
+        if self.additional_gates:
+            d['additional_gates'] = list(self.additional_gates)
+        return d
 
     @classmethod
     def _from_json_dict_(
-        cls,
-        atol,
-        required_sqrt_iswap_count,
-        use_sqrt_iswap_inv,
-        additional_gates=(ops.GlobalPhaseGate,),
-        **kwargs,
+        cls, atol, required_sqrt_iswap_count, use_sqrt_iswap_inv, additional_gates=(), **kwargs
     ):
         return cls(
             atol=atol,

cirq-core/cirq/transformers/target_gatesets/sqrt_iswap_gateset_test.py

@@ -149,9 +149,7 @@ def test_sqrt_iswap_gateset_raises():
 def test_sqrt_iswap_gateset_eq():
     eq = cirq.testing.EqualsTester()
     eq.add_equality_group(
-        cirq.SqrtIswapTargetGateset(),
-        cirq.SqrtIswapTargetGateset(use_sqrt_iswap_inv=False),
-        cirq.SqrtIswapTargetGateset(additional_gates=[cirq.GlobalPhaseGate]),
+        cirq.SqrtIswapTargetGateset(), cirq.SqrtIswapTargetGateset(use_sqrt_iswap_inv=False)
     )
     eq.add_equality_group(
         cirq.SqrtIswapTargetGateset(atol=1e-6, required_sqrt_iswap_count=0, use_sqrt_iswap_inv=True)