windows compatibility

Summary: Few tweaks to make CUDA build on windows happier, as remarked in #876. Reviewed By: patricklabatut Differential Revision: D31688188 fbshipit-source-id: 20816d6215f2e3ec898f81ae4221b1c2ff24b64f
facebookresearch · Oct 18, 2021 · 1a7442a · 1a7442a
1 parent 16ebf54
commit 1a7442a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pytorch3d/csrc/iou_box3d/iou_utils.cuh b/pytorch3d/csrc/iou_box3d/iou_utils.cuh
@@ -12,7 +12,7 @@
 #include <cstdio>
 #include "utils/float_math.cuh"
 
-const auto kEpsilon = 1e-4;
+__constant__ const float kEpsilon = 1e-4;
 
 /*
 _PLANES and _TRIS define the 4- and 3-connectivity
@@ -473,10 +473,10 @@ __device__ inline int ClipTriByPlane(
   if (isin0 && isin1 && !isin2) {
     return ClipTriByPlaneOneOut(plane, normal, v2, v0, v1, face_verts_out);
   }
-  if (isin0 && not isin1 && isin2) {
+  if (isin0 && !isin1 && isin2) {
     return ClipTriByPlaneOneOut(plane, normal, v1, v0, v2, face_verts_out);
   }
-  if (not isin0 && isin1 && isin2) {
+  if (!isin0 && isin1 && isin2) {
     return ClipTriByPlaneOneOut(plane, normal, v0, v1, v2, face_verts_out);
   }
 

diff --git a/pytorch3d/csrc/iou_box3d/iou_utils.h b/pytorch3d/csrc/iou_box3d/iou_utils.h
@@ -437,10 +437,10 @@ inline face_verts ClipTriByPlane(
   if (isin0 && isin1 && !isin2) {
     return ClipTriByPlaneOneOut(plane, normal, v2, v0, v1);
   }
-  if (isin0 && not isin1 && isin2) {
+  if (isin0 && !isin1 && isin2) {
     return ClipTriByPlaneOneOut(plane, normal, v1, v0, v2);
   }
-  if (not isin0 && isin1 && isin2) {
+  if (!isin0 && isin1 && isin2) {
     return ClipTriByPlaneOneOut(plane, normal, v0, v1, v2);
   }