Remove sim v0.16 deprecations

cirq-core/cirq/__init__.py

@@ -449,13 +449,6 @@
 )
 
 from cirq.sim import (
-    ActOnArgs,
-    ActOnArgsContainer,
-    ActOnCliffordTableauArgs,
-    ActOnDensityMatrixArgs,
-    ActOnStabilizerCHFormArgs,
-    ActOnStabilizerArgs,
-    ActOnStateVectorArgs,
     CIRCUIT_LIKE,
     CliffordSimulator,
     CliffordState,
@@ -464,14 +457,12 @@
     CliffordTrialResult,
     DensityMatrixSimulationState,
     DensityMatrixSimulator,
-    DensityMatrixSimulatorState,
     DensityMatrixStepResult,
     DensityMatrixTrialResult,
     measure_density_matrix,
     measure_state_vector,
     final_density_matrix,
     final_state_vector,
-    OperationTarget,
     sample,
     sample_density_matrix,
     sample_state_vector,
@@ -496,7 +487,6 @@
     StabilizerStateChForm,
     StateVectorMixin,
     StateVectorSimulationState,
-    StateVectorSimulatorState,
     StateVectorStepResult,
     StateVectorTrialResult,
     StepResult,

cirq-core/cirq/contrib/quimb/mps_simulator.py

@@ -25,8 +25,7 @@
 import quimb.tensor as qtn
 
 from cirq import devices, protocols, qis, value
-from cirq._compat import deprecated_parameter
-from cirq.sim import simulator, simulator_base
+from cirq.sim import simulator_base
 from cirq.sim.simulation_state import SimulationState
 
 if TYPE_CHECKING:
@@ -143,7 +142,6 @@ def _create_simulator_trial_result(
 class MPSTrialResult(simulator_base.SimulationTrialResultBase['MPSState']):
     """A single trial reult"""
 
-    @simulator._deprecated_step_result_parameter(old_position=3)
     def __init__(
         self,
         params: 'cirq.ParamResolver',
@@ -563,27 +561,14 @@ def sample(
 class MPSState(SimulationState[_MPSHandler]):
     """A state of the MPS simulation."""
 
-    @deprecated_parameter(
-        deadline='v0.16',
-        fix='Use kwargs instead of positional args',
-        parameter_desc='args',
-        match=lambda args, kwargs: len(args) > 1,
-    )
-    @deprecated_parameter(
-        deadline='v0.16',
-        fix='Replace log_of_measurement_results with'
-        ' classical_data=cirq.ClassicalDataDictionaryStore(_records=logs).',
-        parameter_desc='log_of_measurement_results',
-        match=lambda args, kwargs: 'log_of_measurement_results' in kwargs,
-    )
     def __init__(
         self,
+        *,
         qubits: Sequence['cirq.Qid'],
         prng: np.random.RandomState,
         simulation_options: MPSOptions = MPSOptions(),
         grouping: Optional[Dict['cirq.Qid', int]] = None,
         initial_state: int = 0,
-        log_of_measurement_results: Dict[str, Any] = None,
         classical_data: 'cirq.ClassicalDataStore' = None,
     ):
         """Creates and MPSState
@@ -596,8 +581,6 @@ def __init__(
             simulation_options: Numerical options for the simulation.
             grouping: How to group qubits together, if None all are individual.
             initial_state: An integer representing the initial state.
-            log_of_measurement_results: A mutable object that measurements are
-                being recorded into.
             classical_data: The shared classical data container for this
                 simulation.
 
@@ -614,16 +597,7 @@ def __init__(
             simulation_options=simulation_options,
             grouping={qubit_map[k]: v for k, v in final_grouping.items()},
         )
-        if log_of_measurement_results is not None:
-            super().__init__(
-                state=state,
-                prng=prng,
-                qubits=qubits,
-                log_of_measurement_results=log_of_measurement_results,
-                classical_data=classical_data,
-            )
-        else:
-            super().__init__(state=state, prng=prng, qubits=qubits, classical_data=classical_data)
+        super().__init__(state=state, prng=prng, qubits=qubits, classical_data=classical_data)
 
     def i_str(self, i: int) -> str:
         # Returns the index name for the i'th qid.

cirq-core/cirq/contrib/quimb/mps_simulator_test.py

@@ -488,13 +488,3 @@ def test_act_on_gate():
         args.state_vector().reshape((2, 2, 2)),
         cirq.one_hot(index=(0, 1, 0), shape=(2, 2, 2), dtype=np.complex64),
     )
-
-
-def test_deprecated():
-    prng = np.random.RandomState(0)
-    with cirq.testing.assert_deprecated('log_of_measurement_results', deadline='0.16', count=2):
-        _ = ccq.mps_simulator.MPSState(
-            qubits=cirq.LineQubit.range(3), prng=prng, log_of_measurement_results={}
-        )
-    with cirq.testing.assert_deprecated('positional', deadline='0.16'):
-        _ = ccq.mps_simulator.MPSState(cirq.LineQubit.range(3), prng=prng)

cirq-core/cirq/protocols/json_test_data/spec.py

@@ -33,7 +33,6 @@
         'CliffordSimulatorStepResult',
         'CliffordTrialResult',
         'DensityMatrixSimulator',
-        'DensityMatrixSimulatorState',
         'DensityMatrixStepResult',
         'DensityMatrixTrialResult',
         'ExpressionMap',
@@ -66,7 +65,6 @@
         'Timestamp',
         'TwoQubitGateTabulationResult',
         'UnitSweep',
-        'StateVectorSimulatorState',
         'StateVectorTrialResult',
         'ZerosSampler',
         'Zip',
@@ -76,19 +74,11 @@
         'Heatmap',
         'TwoQubitInteractionHeatmap',
         # Intermediate states with work buffers and unknown external prng guts.
-        'ActOnArgs',
-        'ActOnArgsContainer',
-        'ActOnCliffordTableauArgs',
-        'ActOnDensityMatrixArgs',
-        'ActOnStabilizerArgs',
-        'ActOnStabilizerCHFormArgs',
-        'ActOnStateVectorArgs',
         'ApplyChannelArgs',
         'ApplyMixtureArgs',
         'ApplyUnitaryArgs',
         'CliffordTableauSimulationState',
         'DensityMatrixSimulationState',
-        'OperationTarget',
         'SimulationProductState',
         'SimulationState',
         'SimulationStateBase',

cirq-core/cirq/sim/__init__.py

@@ -14,18 +14,7 @@
 
 """Classes for circuit simulators and base implementations of these classes."""
 
-from cirq.sim.act_on_args import ActOnArgs
-
-from cirq.sim.act_on_args_container import ActOnArgsContainer
-
-from cirq.sim.act_on_density_matrix_args import ActOnDensityMatrixArgs
-
-from cirq.sim.act_on_state_vector_args import ActOnStateVectorArgs
-
 from cirq.sim.clifford import (
-    ActOnCliffordTableauArgs,
-    ActOnStabilizerArgs,
-    ActOnStabilizerCHFormArgs,
     CliffordSimulator,
     CliffordSimulatorStepResult,
     CliffordState,
@@ -41,7 +30,6 @@
 
 from cirq.sim.density_matrix_simulator import (
     DensityMatrixSimulator,
-    DensityMatrixSimulatorState,
     DensityMatrixStepResult,
     DensityMatrixTrialResult,
 )
@@ -56,8 +44,6 @@
     sample_sweep,
 )
 
-from cirq.sim.operation_target import OperationTarget
-
 from cirq.sim.simulation_product_state import SimulationProductState
 
 from cirq.sim.simulation_state import SimulationState
@@ -84,7 +70,6 @@
 
 from cirq.sim.state_vector_simulator import (
     SimulatesIntermediateStateVector,
-    StateVectorSimulatorState,
     StateVectorStepResult,
     StateVectorTrialResult,
 )

cirq-core/cirq/sim/clifford/__init__.py

@@ -1,11 +1,5 @@
 # pylint: disable=wrong-or-nonexistent-copyright-notice
 
-from cirq.sim.clifford.act_on_clifford_tableau_args import ActOnCliffordTableauArgs
-
-from cirq.sim.clifford.act_on_stabilizer_args import ActOnStabilizerArgs
-
-from cirq.sim.clifford.act_on_stabilizer_ch_form_args import ActOnStabilizerCHFormArgs
-
 from cirq.sim.clifford.clifford_simulator import (
     CliffordSimulator,
     CliffordSimulatorStepResult,