Remove can_add_operation_into_moment deprecation. (#5379)

Yet more v0.15 device deprecation reomvals.

Author: MichaelBroughton

cirq-core/cirq/circuits/circuit_test.py

@@ -29,17 +29,7 @@
 
 
 class _Foxy(ValidatingTestDevice):
-    def can_add_operation_into_moment(
-        self, operation: 'cirq.Operation', moment: 'cirq.Moment'
-    ) -> bool:
-        if not super().can_add_operation_into_moment(operation, moment):
-            return False
-        # a fake rule for ensuring that no two CZs are executed at the same moment.
-        # this will ensure that CZs are always in separate moments in this device
-        return not (
-            isinstance(operation.gate, ops.CZPowGate)
-            and any(isinstance(op.gate, ops.CZPowGate) for op in moment.operations)
-        )
+    pass
 
 
 FOXY = _Foxy(

cirq-core/cirq/devices/device.py

@@ -77,28 +77,6 @@ def validate_moment(self, moment: 'cirq.Moment') -> None:
         for operation in moment.operations:
             self.validate_operation(operation)
 
-    @_compat.deprecated(
-        deadline='v0.15',
-        fix='can_add_operation_into_moment will be removed in the future.'
-        ' Consider using device.validate_circuit instead.',
-    )
-    def can_add_operation_into_moment(
-        self, operation: 'cirq.Operation', moment: 'cirq.Moment'
-    ) -> bool:
-        """Determines if it's possible to add an operation into a moment.
-
-        For example, on the XmonDevice two CZs shouldn't be placed in the same
-        moment if they are on adjacent qubits.
-
-        Args:
-            operation: The operation being added.
-            moment: The moment being transformed.
-
-        Returns:
-            Whether or not the moment will validate after adding the operation.
-        """
-        return not moment.operates_on(operation.qubits)
-
 
 @value.value_equality
 class DeviceMetadata:

cirq-core/cirq/ion/ion_device_test.py

@@ -165,24 +165,6 @@ def num_qubits(self):
         d.validate_operation(NotImplementedOperation())
 
 
-def test_can_add_operation_into_moment_device_deprecated():
-    with cirq.testing.assert_deprecated('can_add_operation_into_moment', deadline='v0.15', count=6):
-        d = ion_device(3)
-        q0 = cirq.LineQubit(0)
-        q1 = cirq.LineQubit(1)
-        q2 = cirq.LineQubit(2)
-        q3 = cirq.LineQubit(3)
-        circuit = cirq.Circuit()
-        circuit.append(cirq.XX(q0, q1))
-        for moment in circuit:
-            assert not d.can_add_operation_into_moment(cirq.XX(q2, q0), moment)
-            assert not d.can_add_operation_into_moment(cirq.XX(q1, q2), moment)
-            assert d.can_add_operation_into_moment(cirq.XX(q2, q3), moment)
-            assert d.can_add_operation_into_moment(cirq.Z(q3), moment)
-        circuit = cirq.Circuit([cirq.X(q0)])
-        assert d.can_add_operation_into_moment(cirq.XX(q1, q2), circuit[0])
-
-
 def test_ion_device_eq():
     eq = cirq.testing.EqualsTester()
     eq.make_equality_group(lambda: ion_device(3))

cirq-core/cirq/neutral_atoms/neutral_atom_devices.py

@@ -250,31 +250,6 @@ def _are_qubit_lists_too_close(self, *qubit_lists: Iterable[raw_types.Qid]) -> b
             self._are_qubit_lists_too_close(a, b) for a, b in itertools.combinations(qubit_lists, 2)
         )
 
-    def can_add_operation_into_moment(
-        self, operation: ops.Operation, moment: circuits.Moment
-    ) -> bool:
-        """Determines if it's possible to add an operation into a moment.
-
-        An operation can be added if the moment with the operation added is valid.
-
-        Args:
-            operation: The operation being added.
-            moment: The moment being transformed.
-
-        Returns:
-            Whether or not the moment will validate after adding the operation.
-
-        Raises:
-            ValueError: If either of the given moment or operation is invalid
-        """
-        if not super().can_add_operation_into_moment(operation, moment):
-            return False
-        try:
-            self.validate_moment(moment.with_operation(operation))
-        except:
-            return False
-        return True
-
     def validate_circuit(self, circuit: circuits.AbstractCircuit):
         """Raises an error if the given circuit is invalid on this device.
 

cirq-core/cirq/neutral_atoms/neutral_atom_devices_test.py

@@ -236,18 +236,6 @@ def test_validate_moment_errors():
         d2.validate_moment(m)
 
 
-def test_can_add_operation_into_moment_coverage_deprecated():
-    with cirq.testing.assert_deprecated('can_add_operation_into_moment', deadline='v0.15', count=4):
-        d = square_device(2, 2)
-        q00 = cirq.GridQubit(0, 0)
-        q01 = cirq.GridQubit(0, 1)
-        q10 = cirq.GridQubit(1, 0)
-        m = cirq.Moment([cirq.X.on(q00)])
-        assert not d.can_add_operation_into_moment(cirq.X.on(q00), m)
-        assert not d.can_add_operation_into_moment(cirq.CZ.on(q01, q10), m)
-        assert d.can_add_operation_into_moment(cirq.Z.on(q01), m)
-
-
 def test_validate_circuit_errors():
     d = square_device(2, 2, max_controls=3)
     q00 = cirq.GridQubit(0, 0)

cirq-google/cirq_google/devices/xmon_device.py

@@ -186,18 +186,6 @@ def validate_moment(self, moment: cirq.Moment):
                     ):
                         raise ValueError(f'Adjacent Exp11 operations: {moment}.')
 
-    def can_add_operation_into_moment(self, operation: cirq.Operation, moment: cirq.Moment) -> bool:
-        self.validate_moment(moment)
-
-        if not super().can_add_operation_into_moment(operation, moment):
-            return False
-        if isinstance(operation.gate, cirq.CZPowGate):
-            return not self._check_if_exp11_operation_interacts_with_any(
-                cast(cirq.GateOperation, operation),
-                cast(Iterable[cirq.GateOperation], moment.operations),
-            )
-        return True
-
     def at(self, row: int, col: int) -> Optional[cirq.GridQubit]:
         """Returns the qubit at the given position, if there is one, else None."""
         q = cirq.GridQubit(row, col)

cirq-google/cirq_google/devices/xmon_device_test.py

@@ -142,18 +142,6 @@ def test_repr():
     )
 
 
-@mock.patch.dict(os.environ, clear='CIRQ_TESTING')
-def test_can_add_operation_into_moment():
-
-    d = square_device(2, 2)
-    q00 = cirq.GridQubit(0, 0)
-    q01 = cirq.GridQubit(0, 1)
-    q10 = cirq.GridQubit(1, 0)
-    q11 = cirq.GridQubit(1, 1)
-    m = cirq.Moment([cirq.CZ(q00, q01)])
-    assert not d.can_add_operation_into_moment(cirq.CZ(q10, q11), m)
-
-
 @mock.patch.dict(os.environ, clear='CIRQ_TESTING')
 def test_validate_moment():
 

cirq-pasqal/cirq_pasqal/pasqal_device.py

@@ -183,30 +183,6 @@ def validate_circuit(self, circuit: 'cirq.AbstractCircuit') -> None:
                 if isinstance(operation.gate, cirq.MeasurementGate):
                     has_measurement_occurred = True
 
-    def can_add_operation_into_moment(self, operation: cirq.Operation, moment: cirq.Moment) -> bool:
-        """Determines if it's possible to add an operation into a moment.
-
-        An operation can be added if the moment with the operation added is
-        valid.
-
-        Args:
-            operation: The operation being added.
-            moment: The moment being transformed.
-
-        Returns:
-            Whether or not the moment will validate after adding the operation.
-
-        Raises:
-            ValueError: If either of the given moment or operation is invalid
-        """
-        if not super().can_add_operation_into_moment(operation, moment):
-            return False
-        try:
-            self.validate_moment(moment.with_operation(operation))
-        except ValueError:
-            return False
-        return True
-
     def __repr__(self):
         return f'pasqal.PasqalDevice(qubits={sorted(self.qubits)!r})'
 

cirq-pasqal/cirq_pasqal/pasqal_device_test.py

@@ -193,16 +193,6 @@ def test_validate_circuit():
         d.validate_circuit(circuit1)
 
 
-def test_can_add_operation_into_moment_deprecated():
-    d = square_virtual_device(control_r=1.0, num_qubits=2)
-    with cirq.testing.assert_deprecated('can_add_operation_into_moment', deadline='v0.15', count=3):
-        m1 = cirq.Moment([cirq.Z.on(TwoDQubit(0, 0))])
-        assert not d.can_add_operation_into_moment(cirq.X.on(TwoDQubit(0, 0)), m1)
-        assert not d.can_add_operation_into_moment(cirq.X.on(TwoDQubit(1, 1)), m1)
-        m2 = cirq.Moment([cirq.measure(*d.qubits[:-1])])
-        assert d.can_add_operation_into_moment(cirq.measure(TwoDQubit(1, 1)), m2)
-
-
 def test_minimal_distance():
     dev = square_virtual_device(control_r=1.0, num_qubits=1)