pytorch TORCH_CHECK_ARG version compatibility

bottler · facebook-github-bot · commit 069c9fd75946 · 2021-12-15T08:34:10.000-08:00
Summary: Restore compatibility with old C++ after recent torch change. #995 Reviewed By: patricklabatut Differential Revision: D33093174 fbshipit-source-id: 841202fb875d601db265e93dcf9cfa4249d02b25
diff --git a/pytorch3d/csrc/pulsar/cuda/commands.h b/pytorch3d/csrc/pulsar/cuda/commands.h
@@ -208,7 +208,9 @@ __device__ static float atomicMin(float* address, float val) {
 #define IABS(a) abs(a)
 
 // Checks.
-#define ARGCHECK TORCH_CHECK_ARG
+// like TORCH_CHECK_ARG in PyTorch > 1.10
+#define ARGCHECK(cond, argN, ...) \
+  TORCH_CHECK(cond, "invalid argument ", argN, ": ", __VA_ARGS__)
 
 // 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,7 +155,9 @@ INLINE void ATOMICADD_F3(T* address, T val) {
 #define IABS(a) abs(a)
 
 // Checks.
-#define ARGCHECK TORCH_CHECK_ARG
+// like TORCH_CHECK_ARG in PyTorch > 1.10
+#define ARGCHECK(cond, argN, ...) \
+  TORCH_CHECK(cond, "invalid argument ", argN, ": ", __VA_ARGS__)
 
 // Math.
 #define NORM3DF(x, y, z) sqrtf(x* x + y * y + z * z)
diff --git a/pytorch3d/csrc/pulsar/pytorch/renderer.cpp b/pytorch3d/csrc/pulsar/pytorch/renderer.cpp
@@ -17,6 +17,12 @@
 #include <c10/cuda/CUDAGuard.h>
 #endif
 
+#ifndef TORCH_CHECK_ARG
+// torch <= 1.10
+#define TORCH_CHECK_ARG(cond, argN, ...) \
+  TORCH_CHECK(cond, "invalid argument ", argN, ": ", __VA_ARGS__)
+#endif
+
 namespace PRE = ::pulsar::Renderer;
 
 namespace pulsar {
