Remove TH/THC Storage (pytorch#68556)

Summary:
Fixes pytorch#67852

cc ezyang bhosmer smessmer ljk53 bdhirsh

Pull Request resolved: pytorch#68556

Reviewed By: ejguan

Differential Revision: D32652758

Pulled By: ngimel

fbshipit-source-id: 170956fca112606f9008abe09b92c6ddc411be09

Author: kurtamohler

BUILD.bazel

@@ -349,7 +349,6 @@ filegroup(
     name = "th_srcs",
     srcs = [
         "aten/src/TH/THGeneral.cpp",
-        "aten/src/TH/THStorageFunctions.cpp",
         "aten/src/TH/THTensor.cpp",
     ],
 )
@@ -385,8 +384,6 @@ filegroup(
         "aten/src/ATen/native/sparse/cuda/SparseCUDATensor.cpp",
         "aten/src/ATen/native/sparse/cuda/SparseBlas.cpp",
         "aten/src/ATen/native/sparse/cuda/SparseBlasImpl.cpp",
-        "aten/src/THC/THCStorage.cpp",
-        "aten/src/THC/THCTensor.cpp",
     ],
 )
 
@@ -396,7 +393,6 @@ filegroup(
         "aten/src/THC/THCReduceApplyUtils.cu.cc",
         "aten/src/THC/THCSleep.cu.cc",
         "aten/src/THC/THCSortUtils.cu.cc",
-        "aten/src/THC/THCStorage.cu.cc",
         "aten/src/THC/THCTensor.cu.cc",
         "aten/src/THC/THCTensorCopy.cu.cc",
         "aten/src/THC/THCTensorMathScan.cu.cc",

aten/src/ATen/hip/impl/HIPCachingAllocatorMasqueradingAsCUDA.h

@@ -10,7 +10,7 @@ class DataPtr;
 namespace hip {
 namespace HIPCachingAllocatorMasqueradingAsCUDA {
 
-Allocator* get();
+C10_HIP_API Allocator* get();
 C10_HIP_API void recordStreamMasqueradingAsCUDA(const DataPtr& ptr, HIPStreamMasqueradingAsCUDA stream);
 
 } // namespace HIPCachingAllocatorMasqueradingAsCUDA

aten/src/README.md

@@ -17,7 +17,7 @@ multiple variants of the library, summarized here:
 PyTorch employs reference counting in order to permit tensors to provide
 differing views on a common underlying storage.  For example, when you call
 view() on a Tensor, a new THTensor is allocated with differing dimensions,
-but it shares the same THStorage with the original tensor.
+but it shares the same c10::StorageImpl with the original tensor.
 
 Unfortunately, this means we are in the business of manually tracking reference
 counts inside our C library code.  Fortunately, for most of our library code implementing
@@ -63,9 +63,9 @@ of freeing it.  If that function holds on to a pointer to the object, it
 will `retain` it itself.
 
 ```
-  THLongStorage *inferred_size = THLongStorage_newInferSize(size, numel);
+  THByteStorage *inferred_size = THByteStorage_newInferSize(size, numel);
   THTensor_(setStorage)(self, tensor->storage, tensor->storageOffset, inferred_size, NULL);
-  THLongStorage_free(inferred_size);
+  c10::raw::intrusive_ptr::decref(inferred_size);
 ```
 
 Sometimes, you have a tensor in hand which you'd like to use directly, but

aten/src/TH/CMakeLists.txt

@@ -1,11 +1,10 @@
 set(Aten_TH_AVX_extra_src)
 
 set(hdr
-  THGeneral.h THHalf.h THStorage.h THStorageFunctions.h THTensor.h)
+  THGeneral.h THHalf.h THTensor.h)
 
 set(ATen_TH_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/THGeneral.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/THStorageFunctions.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/THTensor.cpp
   )
 # Remember that PARENT_SCOPE variables are not in the current scope
@@ -35,17 +34,12 @@ install(FILES
   TH.h
   ${CMAKE_CURRENT_BINARY_DIR}/THGeneral.h
   THGenerateByteType.h
-  THStorage.h
-  THStorageFunctions.h
   THTensor.h
   THHalf.h
   THTensor.hpp
-  THStorageFunctions.hpp
   DESTINATION "${ATEN_INSTALL_INCLUDE_SUBDIR}/TH")
 
 install(FILES
-  generic/THStorage.cpp
-  generic/THStorage.h
   generic/THTensor.cpp
   generic/THTensor.h
   # See Note [TH abstraction violation]

aten/src/TH/TH.h

@@ -2,8 +2,6 @@
 #define TH_INC
 
 #include <TH/THGeneral.h>
-
-#include <TH/THStorageFunctions.h>
 #include <TH/THTensor.h>
 
 #endif

aten/src/TH/THStorage.h

@@ -16,7 +16,7 @@ void THTensor_free(THTensor *self)
   c10::raw::intrusive_ptr::decref(self);
 }
 
-void THTensor_setStorage(THTensor *self, THStorage *storage_, ptrdiff_t storageOffset_, at::IntArrayRef size_, at::IntArrayRef stride_) {
+void THTensor_setStorage(THTensor *self, c10::StorageImpl *storage_, ptrdiff_t storageOffset_, at::IntArrayRef size_, at::IntArrayRef stride_) {
   c10::raw::intrusive_ptr::incref(storage_);
   THTensor_wrap(self).set_(at::Storage(c10::intrusive_ptr<at::StorageImpl>::reclaim(storage_)), storageOffset_, size_, stride_);
 }

aten/src/TH/THStorageFunctions.cpp

@@ -1,7 +1,7 @@
 #ifndef TH_TENSOR_INC
 #define TH_TENSOR_INC
 
-#include <TH/THStorageFunctions.h>
+#include <TH/THGeneral.h>
 
 #define THTensor_(NAME)   TH_CONCAT_4(TH,Real,Tensor_,NAME)
 

aten/src/TH/THStorageFunctions.h

@@ -4,7 +4,7 @@
 // read Note [TH abstraction violation]
 
 #include <TH/THTensor.h>
-#include <TH/THStorageFunctions.hpp>
+#include <c10/core/StorageImpl.h>
 
 #include <atomic>
 #include <ATen/ATen.h>
@@ -18,4 +18,4 @@ inline at::Tensor THTensor_wrap(THTensor* tensor) {
 
 TH_API void THTensor_free(THTensor *self);
 
-TH_CPP_API void THTensor_setStorage(THTensor *self, THStorage *storage_, ptrdiff_t storageOffset_, at::IntArrayRef size_, at::IntArrayRef stride_);
+TH_CPP_API void THTensor_setStorage(THTensor *self, c10::StorageImpl *storage_, ptrdiff_t storageOffset_, at::IntArrayRef size_, at::IntArrayRef stride_);