Skip to content

Commit f8fe9a2

Browse files
peterbell10facebook-github-bot
authored andcommitted
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
1 parent d049cd2 commit f8fe9a2

File tree

4 files changed

+93
-97
lines changed

4 files changed

+93
-97
lines changed

pytorch3d/csrc/pulsar/cuda/commands.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,7 @@ __device__ static float atomicMin(float* address, float val) {
208208
#define IABS(a) abs(a)
209209

210210
// Checks.
211-
#define CHECKOK C10_CUDA_CHECK
212-
#define ARGCHECK THArgCheck
211+
#define ARGCHECK TORCH_CHECK_ARG
213212

214213
// Math.
215214
#define NORM3DF(x, y, z) norm3df(x, y, z)

pytorch3d/csrc/pulsar/host/commands.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ INLINE void ATOMICADD_F3(T* address, T val) {
155155
#define IABS(a) abs(a)
156156

157157
// Checks.
158-
#define CHECKOK THCheck
159-
#define ARGCHECK THArgCheck
158+
#define ARGCHECK TORCH_CHECK_ARG
160159

161160
// Math.
162161
#define NORM3DF(x, y, z) sqrtf(x* x + y * y + z * z)

pytorch3d/csrc/pulsar/include/commands.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424
// #pragma diag_suppress = 68
2525
#include <ATen/cuda/CUDAContext.h>
2626
// #pragma pop
27-
#include <TH/TH.h>
2827
#include "../cuda/commands.h"
2928
#else
3029
#pragma clang diagnostic push
3130
#pragma clang diagnostic ignored "-Weverything"
32-
#include <TH/TH.h>
3331
#pragma clang diagnostic pop
3432
#include "../host/commands.h"
3533
#endif

0 commit comments

Comments
 (0)