pytorch · cyyever · May 11, 2024 · May 12, 2024
diff --git a/aten/src/ATen/native/ReduceAllOps.cpp b/aten/src/ATen/native/ReduceAllOps.cpp
@@ -8,7 +8,6 @@
 #include <ATen/Functions.h>
 #include <ATen/NativeFunctions.h>
 #else
-#include <ATen/ops/_aminmax_native.h>
 #include <ATen/ops/aminmax.h>
 #include <ATen/ops/empty.h>
 #include <ATen/ops/max.h>
@@ -66,11 +65,4 @@ Tensor& max_unary_out(const Tensor &self, Tensor& out) {
   return out;
 }
 
-// DEPRECATED: Use at::aminmax instead
-std::tuple<Tensor, Tensor> _aminmax_all(const Tensor &self) {
-  TORCH_WARN_ONCE("_aminmax is deprecated as of PyTorch 1.11 and will be removed in a future release. Use aminmax instead."
-                  " This warning will only appear once per process.");
-  return at::aminmax(self);
-}
-
 } // namespace at::native
diff --git a/aten/src/ATen/native/TensorCompare.cpp b/aten/src/ATen/native/TensorCompare.cpp
@@ -20,7 +20,6 @@
 #include <ATen/Functions.h>
 #include <ATen/NativeFunctions.h>
 #else
-#include <ATen/ops/_aminmax_native.h>
 #include <ATen/ops/_assert_async_native.h>
 #include <ATen/ops/_functional_assert_async_native.h>
 #include <ATen/ops/_print_native.h>
@@ -682,13 +681,6 @@ std::tuple<Tensor, Tensor> qmin(const Tensor& self, int64_t dim, bool keepdim) {
       at::_make_per_tensor_quantized_tensor(min, self.q_scale(), self.q_zero_point()), min_indices);
 }
 
-// DEPRECATED: Use at::aminmax instead
-std::tuple<Tensor, Tensor> _aminmax(const Tensor& self, int64_t dim, bool keepdim) {
-  TORCH_WARN_ONCE("_aminmax is deprecated as of PyTorch 1.11 and will be removed in a future release. Use aminmax instead."
-                  " This warning will only appear once per process.");
-  return at::aminmax(self, dim, keepdim);
-}
-
 TORCH_IMPL_FUNC(clamp_out)
 (
  const Tensor& /*self*/,

diff --git a/aten/src/ATen/native/native_functions.yaml b/aten/src/ATen/native/native_functions.yaml
@@ -3762,18 +3762,6 @@
 # This function should be deprecated in favor of differential_analytic_matrix_function in FunctionsManual.cpp
 - func: matrix_exp_backward(Tensor self, Tensor grad) -> Tensor
 
-# DEPRECATED: Use torch.aminmax instead
-- func: _aminmax(Tensor self) -> (Tensor, Tensor)
-  dispatch:
-    CPU, CUDA: _aminmax_all
-  autogen: _aminmax.out
-
-# DEPRECATED: Use torch.aminmax instead
-- func: _aminmax.dim(Tensor self, int dim, bool keepdim=False) -> (Tensor, Tensor)
-  dispatch:
-    CPU, CUDA: _aminmax
-  autogen: _aminmax.dim_out
-
 - func: aminmax(Tensor self, *, int? dim=None, bool keepdim=False) -> (Tensor min, Tensor max)
   device_check: NoCheck   # TensorIterator
   structured_delegate: aminmax.out

@@ -1109,7 +1109,6 @@
     "_add_relu",
     "_add_relu_",
     "_addmm_activation",
-    "_aminmax",
     "_amp_foreach_non_finite_check_and_unscale_",
     "_amp_update_scale_",
     "_assert_async",
@@ -1319,6 +1318,7 @@
     "_values_copy",
     "_weight_norm",
     "_weight_norm_interface",
+    "aminmax",
     "autocast",
     "broadcast_shapes",
     "candidate",

diff --git a/test/expect/HasDecompTest.test_has_decomposition.expect b/test/expect/HasDecompTest.test_has_decomposition.expect
@@ -18,10 +18,6 @@ aten::_add_relu.Tensor
 aten::_add_relu.out
 aten::_add_relu_.Scalar
 aten::_add_relu_.Tensor
-aten::_aminmax
-aten::_aminmax.dim
-aten::_aminmax.dim_out
-aten::_aminmax.out
 aten::_amp_foreach_non_finite_check_and_unscale
 aten::_amp_foreach_non_finite_check_and_unscale.out
 aten::_amp_foreach_non_finite_check_and_unscale_

diff --git a/test/forward_backward_compatibility/check_forward_backward_compatibility.py b/test/forward_backward_compatibility/check_forward_backward_compatibility.py
@@ -9,6 +9,9 @@
 from torch._C import parse_schema
 
 
+# Run by backwards_compat CI job
+
+
 # How to run this test locally:
 # 1 Have two virtual environments (eg conda env), one without PyTorch installed (venv_nightly)
 #   one with your local changes (venv_yours).
@@ -142,6 +145,10 @@
     ("onednn::qconv2d_pointwise.binary", datetime.date(2024, 12, 31)),
     # BC-breaking change in can_cast signature: 'from' -> 'from_'
     ("aten::can_cast", datetime.date(2024, 5, 31)),
+    ("aten::_aminmax", datetime.date(2024, 12, 31)),
+    ("aten::_aminmax.dim", datetime.date(2024, 12, 31)),
+    ("aten::_aminmax.out", datetime.date(2024, 12, 31)),
+    ("aten::_aminmax.dim_out", datetime.date(2024, 12, 31)),
 ]
 
 ALLOW_LIST_COMPILED = [

diff --git a/test/mobile/model_test/coverage.yaml b/test/mobile/model_test/coverage.yaml
@@ -1048,7 +1048,6 @@ uncovered_ops:
   aten::__is__: 83
   aten::__isnot__: 81
   aten::__not__: 32
-  aten::_aminmax: 4
   aten::_convolution: 12
   aten::_convolution.deprecated: 3
   aten::_make_per_tensor_quantized_tensor: 2

diff --git a/test/mobile/model_test/model_ops.yaml b/test/mobile/model_test/model_ops.yaml
@@ -30,7 +30,6 @@ root_operators:
   aten::__range_length: 106
   aten::__rshift__.int: 2
   aten::__xor__.bool: 16
-  aten::_aminmax: 18
   aten::_convolution: 27
   aten::_convolution.deprecated: 3
   aten::_infer_size: 9

diff --git a/torch/_dynamo/trace_rules.py b/torch/_dynamo/trace_rules.py
@@ -372,7 +372,6 @@
         "torch._add_relu_",
         "torch._add_relu",
         "torch._addmm_activation",
-        "torch._aminmax",
         "torch._amp_foreach_non_finite_check_and_unscale_",
         "torch._amp_update_scale_",
         "torch._assert_async",