Remove THGeneral (#69041)

Summary: Pull Request resolved: pytorch/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
facebookresearch · Dec 14, 2021 · f8fe9a2 · f8fe9a2
1 parent d049cd2
commit f8fe9a2
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 97 deletions.
diff --git a/pytorch3d/csrc/pulsar/cuda/commands.h b/pytorch3d/csrc/pulsar/cuda/commands.h
@@ -208,8 +208,7 @@ __device__ static float atomicMin(float* address, float val) {
 #define IABS(a) abs(a)
 
 // Checks.
-#define CHECKOK C10_CUDA_CHECK
-#define ARGCHECK THArgCheck
+#define ARGCHECK TORCH_CHECK_ARG
 
 // Math.
 #define NORM3DF(x, y, z) norm3df(x, y, z)

diff --git a/pytorch3d/csrc/pulsar/host/commands.h b/pytorch3d/csrc/pulsar/host/commands.h
@@ -155,8 +155,7 @@ INLINE void ATOMICADD_F3(T* address, T val) {
 #define IABS(a) abs(a)
 
 // Checks.
-#define CHECKOK THCheck
-#define ARGCHECK THArgCheck
+#define ARGCHECK TORCH_CHECK_ARG
 
 // Math.
 #define NORM3DF(x, y, z) sqrtf(x* x + y * y + z * z)

diff --git a/pytorch3d/csrc/pulsar/include/commands.h b/pytorch3d/csrc/pulsar/include/commands.h
@@ -24,12 +24,10 @@
 // #pragma diag_suppress = 68
 #include <ATen/cuda/CUDAContext.h>
 // #pragma pop
-#include <TH/TH.h>
 #include "../cuda/commands.h"
 #else
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Weverything"
-#include <TH/TH.h>
 #pragma clang diagnostic pop
 #include "../host/commands.h"
 #endif