Remove remaining THC code (pytorch#69039)

Summary: Pull Request resolved: pytorch#69039 Test Plan: Imported from OSS Reviewed By: anjali411 Differential Revision: D32872476 Pulled By: ngimel fbshipit-source-id: 7972aacc24aef9450fb59b707ed6396c501bcb31
bmedishe · Dec 8, 2021 · e279963 · e279963
1 parent 7407e3d
commit e279963
Show file tree

Hide file tree

Showing 35 changed files with 20 additions and 289 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -389,27 +389,6 @@ filegroup(
     ],
 )
 
-filegroup(
-    name = "thc_srcs_cu",
-    srcs = [
-        "aten/src/THC/THCReduceApplyUtils.cu.cc",
-        "aten/src/THC/THCSortUtils.cu.cc",
-        "aten/src/THC/THCTensor.cu.cc",
-        "aten/src/THC/THCTensorCopy.cu.cc",
-        "aten/src/THC/THCTensorMathScan.cu.cc",
-        "aten/src/THC/THCTensorScatterGather.cu.cc",
-        "aten/src/THC/THCTensorSort.cu.cc",
-        "aten/src/THC/generated/THCTensorSortByte.cu.cc",
-        "aten/src/THC/generated/THCTensorSortChar.cu.cc",
-        "aten/src/THC/generated/THCTensorSortDouble.cu.cc",
-        "aten/src/THC/generated/THCTensorSortFloat.cu.cc",
-        "aten/src/THC/generated/THCTensorSortHalf.cu.cc",
-        "aten/src/THC/generated/THCTensorSortInt.cu.cc",
-        "aten/src/THC/generated/THCTensorSortLong.cu.cc",
-        "aten/src/THC/generated/THCTensorSortShort.cu.cc",
-    ],
-)
-
 filegroup(
     name = "aten_srcs_cu",
     srcs = [
@@ -550,9 +529,7 @@ cc_library(
         "aten/src/**/*.h",
         "aten/src/**/*.hpp",
         "aten/src/TH/**/*.cpp",
-        "aten/src/THC/**/*.cpp",
         "aten/src/THC/*.cuh",
-        "aten/src/THC/generic/*.cu.cc",
     ],
     exclude = [
         "aten/src/ATen/Config.h",
@@ -692,7 +669,6 @@ cu_library(
     name = "aten_cuda",
     srcs = [
         ":aten_srcs_cu",
-        ":thc_srcs_cu",
     ],
     copts = ATEN_COPTS + torch_cuda_half_options,
     visibility = ["//visibility:public"],

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -243,9 +243,6 @@ into the repo directory.
 * [aten](aten) - C++ tensor library for PyTorch (no autograd support)
   * [src](aten/src) - [README](aten/src/README.md)
     * [TH](aten/src/TH)
-      [THC](aten/src/THC) - Legacy library code from the original
-      Torch. Try not to add things here; we're slowly porting these to
-      [native](aten/src/ATen/native).
       * generic - Contains actual implementations of operators,
         parametrized over `scalar_t`. Files here get compiled N times
         per supported scalar type in PyTorch.

diff --git a/aten/src/ATen/Context.cpp b/aten/src/ATen/Context.cpp
@@ -20,9 +20,7 @@
 
 namespace at {
 
-Context::Context()
-    : thc_state(nullptr, [](THCState* p) { /* no-op */ }),
-      thh_state(nullptr, [](THHState* p) { /* no-op */ }) {}
+Context::Context() = default;
 
 // TODO: This could be bad juju if someone calls globalContext() in the
 // destructor of an object with static lifetime.

diff --git a/aten/src/ATen/Context.h b/aten/src/ATen/Context.h
@@ -91,28 +91,19 @@ class TORCH_API Context {
   }
   // defined in header so that getNonVariableType has ability to inline
   // call_once check. getNonVariableType is called fairly frequently
-  THCState* lazyInitCUDA() {
+  void lazyInitCUDA() {
     std::call_once(thc_init,[&] {
-      thc_state = detail::getCUDAHooks().initCUDA();
+      detail::getCUDAHooks().initCUDA();
     });
-    return thc_state.get();
   }
-  THHState* lazyInitHIP() {
+  void lazyInitHIP() {
     std::call_once(thh_init,[&] {
-      thh_state = detail::getHIPHooks().initHIP();
+      detail::getHIPHooks().initHIP();
     });
-    return thh_state.get();
   }
   static const at::cuda::NVRTC& getNVRTC() {
     return detail::getCUDAHooks().nvrtc();
   }
-  THCState* getTHCState() {
-    // AT_ASSERT(thc_state);
-    return thc_state.get();
-  }
-  THHState* getTHHState() {
-    return thh_state.get();
-  }
 
   static bool setFlushDenormal(bool on);
 
@@ -261,8 +252,6 @@ class TORCH_API Context {
   #endif
   bool display_vmap_fallback_warnings_ = false;
   c10::optional<at::QEngine> quantized_engine = c10::nullopt;
-  std::unique_ptr<THCState, void(*)(THCState*)> thc_state;
-  std::unique_ptr<THHState, void(*)(THHState*)> thh_state;
 
   Allocator* prev_allocator_ptr_{nullptr};
 };

diff --git a/aten/src/ATen/cuda/detail/CUDAHooks.cpp b/aten/src/ATen/cuda/detail/CUDAHooks.cpp
@@ -16,8 +16,6 @@
 #include <c10/util/Exception.h>
 #include <c10/cuda/CUDACachingAllocator.h>
 
-#include <THC/THCGeneral.h>  // For THCState
-
 #if AT_CUDNN_ENABLED()
 #include <ATen/cudnn/cudnn-wrapper.h>
 #endif
@@ -57,16 +55,8 @@ void set_magma_init_fn(void (*fn)()) {
 // NB: deleter is dynamic, because we need it to live in a separate
 // compilation unit (alt is to have another method in hooks, but
 // let's not if we don't need to!)
-std::unique_ptr<THCState, void (*)(THCState*)> CUDAHooks::initCUDA() const {
+void CUDAHooks::initCUDA() const {
   C10_LOG_API_USAGE_ONCE("aten.init.cuda");
-  // NOTE: THCState is now an empty struct but this pointer is passed
-  // to every THC function. So we can't remove it before the rest of THC.
-  auto thc_state = std::unique_ptr<THCState, void (*)(THCState*)>(
-      new THCState(),
-      [](THCState* p) {
-        delete p;
-      });
-
   // Force the update to enable unit testing. This code get executed before unit tests
   // have a chance to enable vitals.
   at::vitals::VitalsAPI.setVital("CUDA", "used", "true", /* force = */ true);
@@ -79,8 +69,6 @@ std::unique_ptr<THCState, void (*)(THCState*)> CUDAHooks::initCUDA() const {
   TORCH_INTERNAL_ASSERT(magma_init_fn != nullptr, "Cannot initilaize magma, init routine not set");
   magma_init_fn();
 #endif
-
-  return thc_state;
 }
 
 const Generator& CUDAHooks::getDefaultCUDAGenerator(DeviceIndex device_index) const {

diff --git a/aten/src/ATen/cuda/detail/CUDAHooks.h b/aten/src/ATen/cuda/detail/CUDAHooks.h
@@ -19,7 +19,7 @@ TORCH_CUDA_CPP_API c10::optional<int64_t> getDeviceIndexWithPrimaryContext();
 // The real implementation of CUDAHooksInterface
 struct CUDAHooks : public at::CUDAHooksInterface {
   CUDAHooks(at::CUDAHooksArgs) {}
-  std::unique_ptr<THCState, void(*)(THCState*)> initCUDA() const override;
+  void initCUDA() const override;
   Device getDeviceFromPtr(void* data) const override;
   bool isPinnedPtr(void* data) const override;
   const Generator& getDefaultCUDAGenerator(DeviceIndex device_index = -1) const override;

diff --git a/aten/src/ATen/detail/CUDAHooksInterface.h b/aten/src/ATen/detail/CUDAHooksInterface.h
@@ -10,9 +10,6 @@
 #include <functional>
 #include <memory>
 
-// Forward-declares THCState
-struct THCState;
-
 // Forward-declares at::cuda::NVRTC
 namespace at { namespace cuda {
 struct NVRTC;
@@ -73,7 +70,7 @@ struct TORCH_API CUDAHooksInterface {
   virtual ~CUDAHooksInterface() {}
 
   // Initialize THCState and, transitively, the CUDA state
-  virtual std::unique_ptr<THCState, void (*)(THCState*)> initCUDA() const {
+  virtual void initCUDA() const {
     TORCH_CHECK(false, "Cannot initialize CUDA without ATen_cuda library. ", CUDA_HELP);
   }
 

diff --git a/aten/src/ATen/detail/HIPHooksInterface.h b/aten/src/ATen/detail/HIPHooksInterface.h
@@ -10,9 +10,6 @@
 #include <functional>
 #include <memory>
 
-// Forward-declares THHState
-struct THHState;
-
 namespace at {
 class Context;
 }
@@ -29,8 +26,8 @@ struct TORCH_API HIPHooksInterface {
   // squelch -Werror=non-virtual-dtor
   virtual ~HIPHooksInterface() {}
 
-  // Initialize THHState and, transitively, the HIP state
-  virtual std::unique_ptr<THHState, void (*)(THHState*)> initHIP() const {
+  // Initialize the HIP library state
+  virtual void initHIP() const {
     AT_ERROR("Cannot initialize HIP without ATen_hip library.");
   }
 

diff --git a/aten/src/ATen/miopen/Exceptions.h b/aten/src/ATen/miopen/Exceptions.h
@@ -5,8 +5,6 @@
 #include <stdexcept>
 #include <sstream>
 
-struct THCState;
-
 namespace at { namespace native {
 
 class miopen_exception : public std::runtime_error {

diff --git a/aten/src/ATen/miopen/Utils.h b/aten/src/ATen/miopen/Utils.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <ATen/ATen.h>
-#include <aten/src/THH/THH.h>
 #include <ATen/miopen/miopen-wrapper.h>
 #include <ATen/miopen/Handle.h>
 

diff --git a/aten/src/ATen/native/miopen/Conv_miopen.cpp b/aten/src/ATen/native/miopen/Conv_miopen.cpp
@@ -114,7 +114,7 @@ std::tuple<at::Tensor,at::Tensor,at::Tensor> miopen_depthwise_convolution_backwa
 #include <ATen/native/ConvUtils.h>
 #include <c10/util/irange.h>
 
-#include <c10/cuda/CUDACachingAllocator.h>
+#include <c10/hip/HIPCachingAllocator.h>
 
 #include <functional>
 #include <iterator>

diff --git a/aten/src/ATen/native/miopen/RNN_miopen.cpp b/aten/src/ATen/native/miopen/RNN_miopen.cpp
@@ -37,8 +37,6 @@ namespace at { namespace native {
 
 #else // AT_ROCM_ENABLED()
 
-#include <aten/src/THH/THH.h>
-
 #include <ATen/miopen/miopen-wrapper.h>
 #include <ATen/miopen/Descriptors.h>
 #include <ATen/miopen/Types.h>

diff --git a/aten/src/THC/CMakeLists.txt b/aten/src/THC/CMakeLists.txt
@@ -2,22 +2,8 @@ set(ATen_CUDA_INCLUDE ${ATen_CUDA_INCLUDE}
   "${CMAKE_CURRENT_SOURCE_DIR}"
 PARENT_SCOPE)
 
-set(ATen_CUDA_SRCS ${ATen_CUDA_SRCS}
-  ${CMAKE_CURRENT_SOURCE_DIR}/THCTensor.cpp
-  PARENT_SCOPE)
-
 install(FILES
-          THC.h
-          THCGeneral.h
-          THCGeneral.hpp
-          THCTensor.h
           THCAtomics.cuh
+          THCDeviceUtils.cuh
           THCGenerateByteType.h
-          # See Note [TH abstraction violation]
-          THCTensor.hpp
           DESTINATION "${ATEN_INSTALL_INCLUDE_SUBDIR}/THC")
-
-install(FILES
-          generic/THCTensor.cpp
-          generic/THCTensor.h
-          DESTINATION "${ATEN_INSTALL_INCLUDE_SUBDIR}/THC/generic")
diff --git a/aten/src/THC/THC.h b/aten/src/THC/THC.h
diff --git a/aten/src/THC/THCGeneral.h b/aten/src/THC/THCGeneral.h
diff --git a/aten/src/THC/THCGeneral.hpp b/aten/src/THC/THCGeneral.hpp
diff --git a/aten/src/THC/THCTensor.cpp b/aten/src/THC/THCTensor.cpp
diff --git a/aten/src/THC/THCTensor.h b/aten/src/THC/THCTensor.h
diff --git a/aten/src/THC/THCTensor.hpp b/aten/src/THC/THCTensor.hpp
diff --git a/aten/src/THC/generic/THCTensor.cpp b/aten/src/THC/generic/THCTensor.cpp
diff --git a/aten/src/THC/generic/THCTensor.h b/aten/src/THC/generic/THCTensor.h