Remove THGeneral (pytorch#69041)

Summary: Pull Request resolved: pytorch#69041 `TH_CONCAT_{N}` is still being used by THP so I've moved that into it's own header but all the compiled code is gone. Test Plan: Imported from OSS Reviewed By: anjali411 Differential Revision: D32872477 Pulled By: ngimel fbshipit-source-id: 06c82d8f96dbcee0715be407c61dfc7d7e8be47a
bmedishe · Dec 14, 2021 · b08d642 · b08d642
1 parent 8dfdc3d
commit b08d642
Show file tree

Hide file tree

Showing 24 changed files with 33 additions and 336 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -347,13 +347,6 @@ filegroup(
     ),
 )
 
-filegroup(
-    name = "th_srcs",
-    srcs = [
-        "aten/src/TH/THGeneral.cpp",
-    ],
-)
-
 filegroup(
     name = "aten_cuda_srcs",
     srcs = [
@@ -510,14 +503,6 @@ header_template_rule(
     },
 )
 
-header_template_rule(
-    name = "aten_src_TH_THGeneral",
-    src = "aten/src/TH/THGeneral.h.in",
-    out = "aten/src/TH/THGeneral.h",
-    substitutions = {
-    },
-)
-
 cc_library(
     name = "aten_headers",
     hdrs = [
@@ -541,7 +526,6 @@ cc_library(
     ],
     deps = [
         ":c10_headers",
-        ":aten_src_TH_THGeneral",
     ],
 )
 
@@ -565,20 +549,6 @@ intern_build_aten_ops(
     ],
 )
 
-cc_library(
-    name = "th",
-    srcs = [
-        ":th_srcs",
-    ],
-    copts = ATEN_COPTS + [
-        "-mavx",
-    ],
-    deps = [
-        ":aten_headers",
-        "@fbgemm",
-    ],
-)
-
 cc_library(
     name = "aten",
     srcs = [
@@ -606,7 +576,6 @@ cc_library(
         ":ATen_CPU",
         ":aten_headers",
         ":caffe2_for_aten_headers",
-        ":th",
         ":torch_headers",
         "@fbgemm",
         "@ideep",

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -242,10 +242,6 @@ into the repo directory.
   directly.)
 * [aten](aten) - C++ tensor library for PyTorch (no autograd support)
   * [src](aten/src) - [README](aten/src/README.md)
-    * [TH](aten/src/TH)
-      * generic - Contains actual implementations of operators,
-        parametrized over `scalar_t`. Files here get compiled N times
-        per supported scalar type in PyTorch.
     * [ATen](aten/src/ATen)
       * [core](aten/src/ATen/core) - Core functionality of ATen. This
         is migrating to top-level c10 folder.

diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt
@@ -149,7 +149,6 @@ if(BUILD_LITE_INTERPRETER)
   append_filelist("jit_core_sources" all_cpu_cpp)
   append_filelist("aten_cpu_source_non_codegen_list" all_cpu_cpp)
   append_filelist("aten_native_source_non_codegen_list" all_cpu_cpp)
-  list(APPEND all_cpu_cpp ${Aten_TH_AVX_extra_src})
 else()
   set(
     all_cpu_cpp ${base_cpp} ${ATen_CORE_SRCS} ${native_cpp}

diff --git a/aten/src/TH/CMakeLists.txt b/aten/src/TH/CMakeLists.txt
@@ -1,37 +1,13 @@
-set(Aten_TH_AVX_extra_src)
-
-set(hdr
-  THGeneral.h THHalf.h THTensor.h)
-
-set(ATen_TH_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/THGeneral.cpp
-  )
-# Remember that PARENT_SCOPE variables are not in the current scope
-set(ATen_TH_SRCS ${ATen_TH_SRCS} PARENT_SCOPE)
-set(ATen_CPU_SRCS ${ATen_CPU_SRCS} ${ATen_TH_SRCS} PARENT_SCOPE)
-
-# Aten_TH_AVX_extra_src is used in aten/src/ATen/CMakeLists.txt
-# when built with BUILD_LITE_INTERPRETER=1
-set(Aten_TH_AVX_extra_src ${Aten_TH_AVX_extra_src} PARENT_SCOPE)
-######################################################
-
 
 set(ATen_CPU_INCLUDE ${ATen_CPU_INCLUDE}
-  ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 PARENT_SCOPE)
 
 set(ATen_CUDA_INCLUDE ${ATen_CUDA_INCLUDE}
-  ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 PARENT_SCOPE)
 
-configure_file(THGeneral.h.in "${CMAKE_CURRENT_BINARY_DIR}/THGeneral.h")
-
 
 install(FILES
-  TH.h
-  ${CMAKE_CURRENT_BINARY_DIR}/THGeneral.h
   THGenerateByteType.h
-  THHalf.h
   DESTINATION "${ATEN_INSTALL_INCLUDE_SUBDIR}/TH")
diff --git a/aten/src/TH/TH.h b/aten/src/TH/TH.h
diff --git a/aten/src/TH/THGeneral.cpp b/aten/src/TH/THGeneral.cpp
diff --git a/aten/src/TH/THGeneral.h.in b/aten/src/TH/THGeneral.h.in
diff --git a/aten/src/TH/THHalf.h b/aten/src/TH/THHalf.h
diff --git a/c10/util/Exception.h b/c10/util/Exception.h
@@ -551,6 +551,11 @@ namespace detail {
     _TORCH_WARN_ONCE(__VA_ARGS__);        \
   }
 
+// Report an error with a specific argument
+// NOTE: using the argument name in TORCH_CHECK's message is preferred
+#define TORCH_CHECK_ARG(cond, argN, ...)                            \
+  TORCH_CHECK(cond,  "invalid argument ", argN, ": ", __VA_ARGS__)
+
 // ----------------------------------------------------------------------------
 // Deprecated macros
 // ----------------------------------------------------------------------------