Revert D15499749: [pytorch][PR] Add Tensor.T attribute to reverse dimensions

ezyang · facebook-github-bot · commit 0544a491d58f · 2019-05-29T04:29:48.000-07:00
Differential Revision:
D15499749

Original commit changeset: f3306b496667

fbshipit-source-id: 7f50431d2ea37bc41bfed62f386ddedea1412878
diff --git a/aten/src/ATen/core/Tensor.h b/aten/src/ATen/core/Tensor.h
@@ -465,7 +465,6 @@ class CAFFE2_API Tensor {
   Tensor narrow_copy(int64_t dim, int64_t start, int64_t length) const;
   Tensor narrow(int64_t dim, int64_t start, int64_t length) const;
   Tensor permute(IntArrayRef dims) const;
-  Tensor T() const;
   Tensor pin_memory() const;
   Tensor pinverse(double rcond=1e-15) const;
   Tensor reciprocal() const;
diff --git a/aten/src/ATen/core/TensorMethods.h b/aten/src/ATen/core/TensorMethods.h
@@ -452,9 +452,6 @@ inline Tensor Tensor::narrow(int64_t dim, int64_t start, int64_t length) const {
 inline Tensor Tensor::permute(IntArrayRef dims) const {
     return dispatch_type().permute(*this, dims);
 }
-inline Tensor Tensor::T() const {
-    return dispatch_type().T(*this);
-}
 inline Tensor Tensor::pin_memory() const {
     return dispatch_type().pin_memory(*this);
 }
diff --git a/aten/src/ATen/core/Type.h b/aten/src/ATen/core/Type.h
@@ -274,7 +274,6 @@ struct CAFFE2_API Type {
   virtual Tensor narrow_copy(const Tensor & self, int64_t dim, int64_t start, int64_t length) const = 0;
   virtual Tensor narrow(const Tensor & self, int64_t dim, int64_t start, int64_t length) const = 0;
   virtual Tensor permute(const Tensor & self, IntArrayRef dims) const = 0;
-  virtual Tensor T(const Tensor & self) const = 0;
   virtual Tensor pin_memory(const Tensor & self) const = 0;
   virtual Tensor pinverse(const Tensor & self, double rcond) const = 0;
   virtual Tensor reciprocal(const Tensor & self) const = 0;
diff --git a/aten/src/ATen/native/TensorShape.cpp b/aten/src/ATen/native/TensorShape.cpp
@@ -853,17 +853,6 @@ std::vector<Tensor> meshgrid(TensorList tensors) {
   }
   return grids;
 }
-
-// Numpy-style `a.T`: returns the tensor
-// with dims reversed
-Tensor T(const Tensor &self) {
-  int64_t n = self.dim();
-  DimVector transpose_dims;
-  for (int64_t i = n - 1; i >= 0; --i) {
-    transpose_dims.push_back(i);
-  }
-  return self.permute(transpose_dims);
-}
 }
 
 }
diff --git a/aten/src/ATen/native/native_functions.yaml b/aten/src/ATen/native/native_functions.yaml
@@ -1405,9 +1405,6 @@
 - func: permute(Tensor(a) self, int[] dims) -> Tensor(a)
   variants: method  # This is method-only to match the previous tensor API. In the future we could make this a function too.
 
-- func: T(Tensor(a) self) -> Tensor(a)
-  variants: method
-
 - func: pixel_shuffle(Tensor self, int upscale_factor) -> Tensor
 
 - func: pin_memory(Tensor self) -> Tensor
diff --git a/docs/source/tensors.rst b/docs/source/tensors.rst
@@ -148,7 +148,6 @@ view of a storage and defines numeric operations on it.
    .. autoattribute:: device
    .. autoattribute:: grad
    .. autoattribute:: ndim
-   .. autoattribute:: T
 
    .. automethod:: abs
    .. automethod:: abs_
diff --git a/test/test_torch.py b/test/test_torch.py
@@ -11523,16 +11523,6 @@ def test_ndim(self):
         c = torch.randn(1, 0)
         self.assertEqual(2, c.ndim)
 
-    def test_T(self):
-        a = torch.randn(2, 3, 4)
-        t1 = a.T
-        t2 = a.permute(2, 1, 0)
-        self.assertEqual(t2, t1)
-        b = torch.randn(10)
-        self.assertEqual(b, b.T)
-        scalar = torch.tensor(5)
-        self.assertEqual(scalar, scalar.T)
-
 # Functions to test negative dimension wrapping
 METHOD = 1
 INPLACE_METHOD = 2
diff --git a/tools/autograd/gen_autograd.py b/tools/autograd/gen_autograd.py
@@ -33,7 +33,6 @@
 #      1. name of the argument that all outputs are view of
 #      2. map: output idx => name of the argument that this result is view of
 VIEW_FUNCTIONS = {
-    'T': 'self',
     'alias': 'self',
     'as_strided': 'self',
     'diagonal': 'self',
diff --git a/tools/autograd/gen_python_functions.py b/tools/autograd/gen_python_functions.py
@@ -31,7 +31,6 @@
     'slice', 'randint(_out)?',
     'item', '_local_scalar_dense', 'to',
     'copy_sparse_to_sparse_', 'copy_',
-    'T',  # this needs to be an attribute in Python, not a function
 ]
 
 # These function signatures are not exposed to Python. Note that this signature
diff --git a/torch/_tensor_docs.py b/torch/_tensor_docs.py
@@ -3196,11 +3196,3 @@ def callable(a, b) -> number
                r"""
 Alias for :meth:`~Tensor.dim()`
 """)
-
-add_docstr_all('T',
-               r"""
-Is this Tensor with its dimensions reversed.
-
-If ``n`` is the number of dimensions in ``x``,
-``x.T`` is equivalent to ``x.permute(n-1, n-2, ..., 0)``.
-""")
diff --git a/torch/csrc/autograd/python_variable.cpp b/torch/csrc/autograd/python_variable.cpp
@@ -159,14 +159,6 @@ static PyObject* THPVariable_make_subclass(PyObject* _ignored, PyObject* args, P
 typedef PyObject *(*getter)(PyObject *, void *);
 typedef int (*setter)(PyObject *, PyObject *, void *);
 
-PyObject *THPVariable_get_T(THPVariable *self)
-{
-  HANDLE_TH_ERRORS
-  auto& var = self->cdata;
-  return THPVariable_Wrap(var.T());
-  END_HANDLE_TH_ERRORS
-}
-
 PyObject *THPVariable_get_cdata(THPVariable *self)
 {
   HANDLE_TH_ERRORS
@@ -429,7 +421,6 @@ static PyObject * THPVariable_device(THPVariable* self) {
 }
 
 static struct PyGetSetDef THPVariable_properties[] = {
-  {"T", (getter)THPVariable_get_T, nullptr, nullptr, nullptr},
   {"_cdata", (getter)THPVariable_get_cdata, nullptr, nullptr, nullptr},
   {"_version", (getter)THPVariable_get_version, nullptr, nullptr, nullptr},
   {"grad_fn", (getter)THPVariable_get_grad_fn, nullptr, nullptr, nullptr},

Original file line number	Diff line number	Diff line change
`@@ -452,9 +452,6 @@ inline Tensor Tensor::narrow(int64_t dim, int64_t start, int64_t length) const {`
`452`	`452`	`inline Tensor Tensor::permute(IntArrayRef dims) const {`
`453`	`453`	`return dispatch_type().permute(*this, dims);`
`454`	`454`	`}`
`455`		`-inline Tensor Tensor::T() const {`
`456`		`- return dispatch_type().T(*this);`
`457`		`-}`
`458`	`455`	`inline Tensor Tensor::pin_memory() const {`
`459`	`456`	`return dispatch_type().pin_memory(*this);`
`460`	`457`	`}`
Original file line number	Diff line number	Diff line change
`@@ -853,17 +853,6 @@ std::vector<Tensor> meshgrid(TensorList tensors) {`
`853`	`853`	`}`
`854`	`854`	`return grids;`
`855`	`855`	`}`
`856`		`-`
`857`		-// Numpy-style `a.T`: returns the tensor
`858`		`-// with dims reversed`
`859`		`-Tensor T(const Tensor &self) {`
`860`		`- int64_t n = self.dim();`
`861`		`- DimVector transpose_dims;`
`862`		`- for (int64_t i = n - 1; i >= 0; --i) {`
`863`		`- transpose_dims.push_back(i);`
`864`		`- }`
`865`		`- return self.permute(transpose_dims);`
`866`		`-}`
`867`	`856`	`}`
`868`	`857`
`869`	`858`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@`
`31`	`31`	`'slice', 'randint(_out)?',`
`32`	`32`	`'item', '_local_scalar_dense', 'to',`
`33`	`33`	`'copy_sparse_to_sparse_', 'copy_',`
`34`		`- 'T', # this needs to be an attribute in Python, not a function`
`35`	`34`	`]`
`36`	`35`
`37`	`36`	`# These function signatures are not exposed to Python. Note that this signature`