windows compatibility

bottler · facebook-github-bot · commit 1a7442a483ef · 2021-10-18T03:38:11.000-07:00
Summary: Few tweaks to make CUDA build on windows happier, as remarked in #876. Reviewed By: patricklabatut Differential Revision: D31688188 fbshipit-source-id: 20816d6215f2e3ec898f81ae4221b1c2ff24b64f
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);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#include <cstdio>`
`13`	`13`	`#include "utils/float_math.cuh"`
`14`	`14`
`15`		`-const auto kEpsilon = 1e-4;`
	`15`	`+__constant__ const float kEpsilon = 1e-4;`
`16`	`16`
`17`	`17`	`/*`
`18`	`18`	`_PLANES and _TRIS define the 4- and 3-connectivity`
`@@ -473,10 +473,10 @@ __device__ inline int ClipTriByPlane(`
`473`	`473`	`if (isin0 && isin1 && !isin2) {`
`474`	`474`	`return ClipTriByPlaneOneOut(plane, normal, v2, v0, v1, face_verts_out);`
`475`	`475`	`}`
`476`		`- if (isin0 && not isin1 && isin2) {`
	`476`	`+ if (isin0 && !isin1 && isin2) {`
`477`	`477`	`return ClipTriByPlaneOneOut(plane, normal, v1, v0, v2, face_verts_out);`
`478`	`478`	`}`
`479`		`- if (not isin0 && isin1 && isin2) {`
	`479`	`+ if (!isin0 && isin1 && isin2) {`
`480`	`480`	`return ClipTriByPlaneOneOut(plane, normal, v0, v1, v2, face_verts_out);`
`481`	`481`	`}`
`482`	`482`
Original file line number	Diff line number	Diff line change
`@@ -437,10 +437,10 @@ inline face_verts ClipTriByPlane(`
`437`	`437`	`if (isin0 && isin1 && !isin2) {`
`438`	`438`	`return ClipTriByPlaneOneOut(plane, normal, v2, v0, v1);`
`439`	`439`	`}`
`440`		`- if (isin0 && not isin1 && isin2) {`
	`440`	`+ if (isin0 && !isin1 && isin2) {`
`441`	`441`	`return ClipTriByPlaneOneOut(plane, normal, v1, v0, v2);`
`442`	`442`	`}`
`443`		`- if (not isin0 && isin1 && isin2) {`
	`443`	`+ if (!isin0 && isin1 && isin2) {`
`444`	`444`	`return ClipTriByPlaneOneOut(plane, normal, v0, v1, v2);`
`445`	`445`	`}`
`446`	`446`