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

ignore cuda for cpu only installation

Browse Source 
Summary:
Added if `WITH_CUDA` checks for points/mesh rasterization. If installing on cpu only then this causes `Undefined symbol` errors when trying to import pytorch3d.

We had these checks for all the other cuda files but not the rasterization files.

Thanks ppwwyyxx for the tip!

Reviewed By: ppwwyyxx, gkioxari

Differential Revision: D19801495

fbshipit-source-id: 20e7adccfdb33ac731c00a89414b2beaf0a35529
This commit is contained in:
Nikhila Ravi
2020-02-08 09:13:08 -08:00
committed by Facebook Github Bot
parent ca588a59d7
commit dcb094800f
2 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pytorch3d/csrc/rasterize_points/rasterize_points.h
View File

@@ -15,13 +15,14 @@ std::tuple<torch::Tensor, torch::Tensor, torch::Tensor> RasterizePointsNaiveCpu(
const float radius,
const int points_per_pixel);
#ifdef WITH_CUDA
std::tuple<torch::Tensor, torch::Tensor, torch::Tensor>
RasterizePointsNaiveCuda(
const torch::Tensor& points,
const int image_size,
const float radius,
const int points_per_pixel);
#endif
// Naive (forward) pointcloud rasterization: For each pixel, for each point,
// check whether that point hits the pixel.
//
@@ -47,8 +48,12 @@ std::tuple<torch::Tensor, torch::Tensor, torch::Tensor> RasterizePointsNaive(
const float radius,
const int points_per_pixel) {
if (points.type().is_cuda()) {
#ifdef WITH_CUDA
return RasterizePointsNaiveCuda(
points, image_size, radius, points_per_pixel);
#else
AT_ERROR("Not compiled with GPU support");
#endif
} else {
return RasterizePointsNaiveCpu(
points, image_size, radius, points_per_pixel);
@@ -66,13 +71,14 @@ torch::Tensor RasterizePointsCoarseCpu(
const int bin_size,
const int max_points_per_bin);
#ifdef WITH_CUDA
torch::Tensor RasterizePointsCoarseCuda(
const torch::Tensor& points,
const int image_size,
const float radius,
const int bin_size,
const int max_points_per_bin);
#endif
// Args:
// points: Tensor of shape (N, P, 3)
// radius: Radius of points to rasterize (in NDC units)
@@ -91,8 +97,12 @@ torch::Tensor RasterizePointsCoarse(
const int bin_size,
const int max_points_per_bin) {
if (points.type().is_cuda()) {
#ifdef WITH_CUDA
return RasterizePointsCoarseCuda(
points, image_size, radius, bin_size, max_points_per_bin);
#else
AT_ERROR("Not compiled with GPU support");
#endif
} else {
return RasterizePointsCoarseCpu(
points, image_size, radius, bin_size, max_points_per_bin);
@@ -103,6 +113,7 @@ torch::Tensor RasterizePointsCoarse(
// * FINE RASTERIZATION *
// ****************************************************************************
#ifdef WITH_CUDA
std::tuple<torch::Tensor, torch::Tensor, torch::Tensor> RasterizePointsFineCuda(
const torch::Tensor& points,
const torch::Tensor& bin_points,
@@ -110,7 +121,7 @@ std::tuple<torch::Tensor, torch::Tensor, torch::Tensor> RasterizePointsFineCuda(
const float radius,
const int bin_size,
const int points_per_pixel);
#endif
// Args:
// points: float32 Tensor of shape (N, P, 3)
// bin_points: int32 Tensor of shape (N, B, B, M) giving the indices of points
@@ -137,8 +148,12 @@ std::tuple<torch::Tensor, torch::Tensor, torch::Tensor> RasterizePointsFine(
const int bin_size,
const int points_per_pixel) {
if (points.type().is_cuda()) {
#ifdef WITH_CUDA
return RasterizePointsFineCuda(
points, bin_points, image_size, radius, bin_size, points_per_pixel);
#else
AT_ERROR("Not compiled with GPU support");
#endif
} else {
AT_ERROR("NOT IMPLEMENTED");
}
@@ -154,12 +169,13 @@ torch::Tensor RasterizePointsBackwardCpu(
const torch::Tensor& grad_zbuf,
const torch::Tensor& grad_dists);
#ifdef WITH_CUDA
torch::Tensor RasterizePointsBackwardCuda(
const torch::Tensor& points,
const torch::Tensor& idxs,
const torch::Tensor& grad_zbuf,
const torch::Tensor& grad_dists);
#endif
// Args:
// points: float32 Tensor of shape (N, P, 3)
// idxs: int32 Tensor of shape (N, H, W, K) (from forward pass)
@@ -178,7 +194,11 @@ torch::Tensor RasterizePointsBackward(
const torch::Tensor& grad_zbuf,
const torch::Tensor& grad_dists) {
if (points.type().is_cuda()) {
#ifdef WITH_CUDA
return RasterizePointsBackwardCuda(points, idxs, grad_zbuf, grad_dists);
#else
AT_ERROR("Not compiled with GPU support");
#endif
} else {
return RasterizePointsBackwardCpu(points, idxs, grad_zbuf, grad_dists);
}