Remove THTensor (pytorch#69040)

peterbell10 · facebook-github-bot · commit 9962bfb3c965 · 2021-12-10T02:29:11.000-08:00
Summary: Pull Request resolved: pytorch#69040 Test Plan: Imported from OSS Reviewed By: anjali411 Differential Revision: D32872478 Pulled By: ngimel fbshipit-source-id: f93e16509d64308d91e374744410a6a811e7f4e3
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -352,7 +352,6 @@ filegroup(
     name = "th_srcs",
     srcs = [
         "aten/src/TH/THGeneral.cpp",
-        "aten/src/TH/THTensor.cpp",
     ],
 )
 
diff --git a/aten/src/TH/CMakeLists.txt b/aten/src/TH/CMakeLists.txt
@@ -5,7 +5,6 @@ set(hdr
 
 set(ATen_TH_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/THGeneral.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/THTensor.cpp
   )
 # Remember that PARENT_SCOPE variables are not in the current scope
 set(ATen_TH_SRCS ${ATen_TH_SRCS} PARENT_SCOPE)
@@ -34,13 +33,5 @@ install(FILES
   TH.h
   ${CMAKE_CURRENT_BINARY_DIR}/THGeneral.h
   THGenerateByteType.h
-  THTensor.h
   THHalf.h
-  THTensor.hpp
   DESTINATION "${ATEN_INSTALL_INCLUDE_SUBDIR}/TH")
-
-install(FILES
-  generic/THTensor.cpp
-  generic/THTensor.h
-  # See Note [TH abstraction violation]
-  DESTINATION "${ATEN_INSTALL_INCLUDE_SUBDIR}/TH/generic")
diff --git a/aten/src/TH/TH.h b/aten/src/TH/TH.h
@@ -2,6 +2,5 @@
 #define TH_INC
 
 #include <TH/THGeneral.h>
-#include <TH/THTensor.h>
 
 #endif
diff --git a/aten/src/TH/THTensor.cpp b/aten/src/TH/THTensor.cpp
diff --git a/aten/src/TH/THTensor.h b/aten/src/TH/THTensor.h
diff --git a/aten/src/TH/THTensor.hpp b/aten/src/TH/THTensor.hpp
diff --git a/aten/src/TH/generic/THTensor.cpp b/aten/src/TH/generic/THTensor.cpp
diff --git a/aten/src/TH/generic/THTensor.h b/aten/src/TH/generic/THTensor.h
diff --git a/tools/build_variables.bzl b/tools/build_variables.bzl
@@ -1250,7 +1250,6 @@ aten_native_source_non_codegen_list = [
     "aten/src/ATen/native/sparse/SparseUnaryOps.cpp",
     "aten/src/ATen/native/sparse/SparseCsrTensorMath.cpp",
     "aten/src/TH/THGeneral.cpp",
-    "aten/src/TH/THTensor.cpp",
     "aten/src/ATen/native/utils/Factory.cpp",
     "aten/src/ATen/native/xnnpack/Activation.cpp",
     "aten/src/ATen/native/xnnpack/ChannelShuffle.cpp",
diff --git a/torch/csrc/PythonTypes.h b/torch/csrc/PythonTypes.h
@@ -7,7 +7,7 @@ namespace torch {
 
 struct THPVoidTensor {
   PyObject_HEAD
-  THVoidTensor *cdata;
+  c10::TensorImpl *cdata;
   char device_type;
   char data_type;
 };
diff --git a/torch/csrc/THP.h b/torch/csrc/THP.h
@@ -3,7 +3,6 @@
 
 #include <torch/csrc/python_headers.h>
 #include <TH/TH.h>
-#include <TH/THTensor.hpp>
 
 #include <torch/csrc/Export.h>
 
@@ -17,15 +16,6 @@
 #define PyInt_Type              PyLong_Type
 #endif
 
-// By default, don't specify library state (TH doesn't use one)
-#define LIBRARY_STATE
-#define LIBRARY_STATE_NOARGS
-#define LIBRARY_STATE_TYPE
-#define LIBRARY_STATE_TYPE_NOARGS
-
-#define THWTensor THTensor
-#define THWTensor_(NAME) THTensor_(NAME)
-
 #include <torch/csrc/Exceptions.h>
 #include <torch/csrc/Generator.h>
 #include <torch/csrc/Module.h>
diff --git a/torch/csrc/Types.h b/torch/csrc/Types.h
@@ -10,10 +10,4 @@
 
 template <typename T> struct THPTypeInfo {};
 
-namespace torch {
-
-typedef THTensor THVoidTensor;
-
-}  // namespace torch
-
 #endif
diff --git a/torch/csrc/cuda/Storage.cpp b/torch/csrc/cuda/Storage.cpp
@@ -4,9 +4,6 @@
 #include <structmember.h>
 #include <fmt/format.h>
 
-// See Note [TH abstraction violation]
-//    - Used to get at allocator from storage
-#include <TH/THTensor.hpp>
 #include <torch/csrc/cuda/THCP.h>
 
 #include <torch/csrc/cuda/override_macros.h>
diff --git a/torch/csrc/cuda/override_macros.h b/torch/csrc/cuda/override_macros.h
@@ -1,7 +1,6 @@
 #include <torch/csrc/cuda/undef_macros.h>
 
 #define THPStoragePtr THCPStoragePtr
-#define THWTensorPtr THCTensorPtr
 #define THPTensorPtr THCPTensorPtr
 
 #define THWTensor THCTensor
@@ -39,11 +38,4 @@
 #define THSPTensorStateless THCSPTensorStateless
 
 
-#define LIBRARY_STATE_NOARGS state
-#define LIBRARY_STATE state,
-#define LIBRARY_STATE_TYPE THCState*,
-#define LIBRARY_STATE_TYPE_NOARGS THCState*
 #define TH_GENERIC_FILE THC_GENERIC_FILE
-
-#define THHostTensor TH_CONCAT_3(TH,Real,Tensor)
-#define THHostTensor_(NAME) TH_CONCAT_4(TH,Real,Tensor_,NAME)
diff --git a/torch/csrc/cuda/undef_macros.h b/torch/csrc/cuda/undef_macros.h
@@ -1,8 +1,4 @@
 #undef TH_GENERIC_FILE
-#undef LIBRARY_STATE
-#undef LIBRARY_STATE_NOARGS
-#undef LIBRARY_STATE_TYPE
-#undef LIBRARY_STATE_TYPE_NOARGS
 
 #undef THPTensor_
 #undef THPTensor_stateless_
@@ -21,13 +17,11 @@
 #undef THPStorageClass
 #undef THPStorageType
 
-#undef THWTensor
-#undef THWTensor_
-
 #undef THPStoragePtr
-#undef THWTensorPtr
 #undef THPTensorPtr
 
+#undef THWTensor
+#undef THWTensor_
 
 #undef THSPTensor_
 #undef THSPTensor_stateless_
@@ -41,7 +35,3 @@
 #undef THSPTensorType
 
 #undef THSPTensorPtr
-
-
-#undef THHostTensor
-#undef THHostTensor_
diff --git a/torch/csrc/utils.cpp b/torch/csrc/utils.cpp
@@ -176,13 +176,6 @@ bool maybeThrowBackCompatKeepdimWarn(char *func) {
   return true;
 }
 
-template<>
-void THPPointer<THTensor>::free() {
-  if (ptr) {
-    c10::raw::intrusive_ptr::decref(ptr);
-  }
-}
-
 template<>
 void THPPointer<THPStorage>::free() {
   if (ptr)

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,6 @@ filegroup(`
`352`	`352`	`name = "th_srcs",`
`353`	`353`	`srcs = [`
`354`	`354`	`"aten/src/TH/THGeneral.cpp",`
`355`		`- "aten/src/TH/THTensor.cpp",`
`356`	`355`	`],`
`357`	`356`	`)`
`358`	`357`