Remove SparseAdam weird allowance of raw Tensor input

janeyx99 · janeyx99 · commit 50d6f15d968f · 2024-05-24T06:14:42.000-07:00
[ghstack-poisoned]
diff --git a/torch/optim/optimizer.py b/torch/optim/optimizer.py
@@ -349,21 +349,10 @@ def __init__(self, params: ParamsT, defaults: Dict[str, Any]) -> None:
         self._patch_step_function()
 
         if isinstance(params, torch.Tensor):
-            if self.__class__.__name__ == "SparseAdam":
-                warnings.warn(
-                    (
-                        "Passing in a raw Tensor as ``params`` to SparseAdam "
-                        "is deprecated. In the future, this will raise an error. "
-                        "Please wrap your Tensor in an iterable instead."
-                    ),
-                    FutureWarning,
-                )
-                params = [params]
-            else:
-                raise TypeError(
-                    "params argument given to the optimizer should be "
-                    "an iterable of Tensors or dicts, but got " + torch.typename(params)
-                )
+            raise TypeError(
+                "params argument given to the optimizer should be "
+                "an iterable of Tensors or dicts, but got " + torch.typename(params)
+            )
 
         self.state: DefaultDict[torch.Tensor, Any] = defaultdict(dict)
         self.param_groups: List[Dict[str, Any]] = []
diff --git a/torch/testing/_internal/common_optimizers.py b/torch/testing/_internal/common_optimizers.py
@@ -962,13 +962,6 @@ def optim_error_inputs_func_sparseadam(device, dtype):
     error_inputs = get_error_inputs_for_all_optims(device, dtype)
 
     if str(device) == "cpu":
-        # SparseAdam raises a warning and not an error for the first entry. We
-        # update it here:
-        error_inputs[0].error_type = FutureWarning
-        error_inputs[
-            0
-        ].error_regex = "Passing in a raw Tensor as ``params`` to SparseAdam"
-
         error_inputs += [
             ErrorOptimizerInput(
                 OptimizerInput(
