423A35C7/pytorch3d
1
0
Fork 0
mirror of https://github.com/facebookresearch/pytorch3d.git synced 2025-08-02 11:52:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

pytorch TORCH_CHECK_ARG version compatibility

Browse Source 
Summary: Restore compatibility with old C++ after recent torch change. https://github.com/facebookresearch/pytorch3d/issues/995

Reviewed By: patricklabatut

Differential Revision: D33093174

fbshipit-source-id: 841202fb875d601db265e93dcf9cfa4249d02b25
This commit is contained in:
Jeremy Reizenstein 2021-12-15 08:32:49 -08:00 committed by Facebook GitHub Bot
parent 9eec430f1c
commit 069c9fd759
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pytorch3d/csrc/pulsar/cuda/commands.h
View File

@ -208,7 +208,9 @@ __device__ static float atomicMin(float* address, float val) {
#define IABS(a) abs(a) #define IABS(a) abs(a)
// Checks. // 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. // Math.
#define NORM3DF(x, y, z) norm3df(x, y, z) #define NORM3DF(x, y, z) norm3df(x, y, z)

4
pytorch3d/csrc/pulsar/host/commands.h
View File

@ -155,7 +155,9 @@ INLINE void ATOMICADD_F3(T* address, T val) {
#define IABS(a) abs(a) #define IABS(a) abs(a)
// Checks. // 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. // Math.
#define NORM3DF(x, y, z) sqrtf(x* x + y * y + z * z) #define NORM3DF(x, y, z) sqrtf(x* x + y * y + z * z)

6
pytorch3d/csrc/pulsar/pytorch/renderer.cpp
View File

@ -17,6 +17,12 @@
#include <c10/cuda/CUDAGuard.h> #include <c10/cuda/CUDAGuard.h>
#endif #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 PRE = ::pulsar::Renderer;
namespace pulsar { namespace pulsar {