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

fix CPU-only hiding of cuda calls

Browse Source 
Summary: CPU-only builds should be fixed by this change

Reviewed By: nikhilaravi

Differential Revision: D20598014

fbshipit-source-id: df098ec4c6c93d38515172805fe57cac7463c506
This commit is contained in:
Jeremy Reizenstein 2020-03-24 05:00:42 -07:00 committed by Facebook GitHub Bot
parent 595aca27ea
commit 8fa7678614
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pytorch3d/csrc/compositing/alpha_composite.h
View File

@ -63,10 +63,10 @@ torch::Tensor alphaCompositeForward(
CHECK_CONTIGUOUS_CUDA(features); CHECK_CONTIGUOUS_CUDA(features);
CHECK_CONTIGUOUS_CUDA(alphas); CHECK_CONTIGUOUS_CUDA(alphas);
CHECK_CONTIGUOUS_CUDA(points_idx); CHECK_CONTIGUOUS_CUDA(points_idx);
return alphaCompositeCudaForward(features, alphas, points_idx);
#else #else
AT_ERROR("Not compiled with GPU support"); AT_ERROR("Not compiled with GPU support");
#endif #endif
return alphaCompositeCudaForward(features, alphas, points_idx);
} else { } else {
CHECK_CONTIGUOUS(features); CHECK_CONTIGUOUS(features);
CHECK_CONTIGUOUS(alphas); CHECK_CONTIGUOUS(alphas);
@ -92,12 +92,12 @@ std::tuple<torch::Tensor, torch::Tensor> alphaCompositeBackward(
CHECK_CONTIGUOUS_CUDA(features); CHECK_CONTIGUOUS_CUDA(features);
CHECK_CONTIGUOUS_CUDA(alphas); CHECK_CONTIGUOUS_CUDA(alphas);
CHECK_CONTIGUOUS_CUDA(points_idx); CHECK_CONTIGUOUS_CUDA(points_idx);
#else
AT_ERROR("Not compiled with GPU support");
#endif
return alphaCompositeCudaBackward( return alphaCompositeCudaBackward(
grad_outputs, features, alphas, points_idx); grad_outputs, features, alphas, points_idx);
#else
AT_ERROR("Not compiled with GPU support");
#endif
} else { } else {
CHECK_CONTIGUOUS(grad_outputs); CHECK_CONTIGUOUS(grad_outputs);
CHECK_CONTIGUOUS(features); CHECK_CONTIGUOUS(features);

10
pytorch3d/csrc/compositing/norm_weighted_sum.h
View File

@ -61,11 +61,11 @@ torch::Tensor weightedSumNormForward(
CHECK_CONTIGUOUS_CUDA(features); CHECK_CONTIGUOUS_CUDA(features);
CHECK_CONTIGUOUS_CUDA(alphas); CHECK_CONTIGUOUS_CUDA(alphas);
CHECK_CONTIGUOUS_CUDA(points_idx); CHECK_CONTIGUOUS_CUDA(points_idx);
return weightedSumNormCudaForward(features, alphas, points_idx);
#else #else
AT_ERROR("Not compiled with GPU support"); AT_ERROR("Not compiled with GPU support");
#endif #endif
return weightedSumNormCudaForward(features, alphas, points_idx);
} else { } else {
CHECK_CONTIGUOUS(features); CHECK_CONTIGUOUS(features);
CHECK_CONTIGUOUS(alphas); CHECK_CONTIGUOUS(alphas);
@ -91,12 +91,12 @@ std::tuple<torch::Tensor, torch::Tensor> weightedSumNormBackward(
CHECK_CONTIGUOUS_CUDA(features); CHECK_CONTIGUOUS_CUDA(features);
CHECK_CONTIGUOUS_CUDA(alphas); CHECK_CONTIGUOUS_CUDA(alphas);
CHECK_CONTIGUOUS_CUDA(points_idx); CHECK_CONTIGUOUS_CUDA(points_idx);
#else
AT_ERROR("Not compiled with GPU support");
#endif
return weightedSumNormCudaBackward( return weightedSumNormCudaBackward(
grad_outputs, features, alphas, points_idx); grad_outputs, features, alphas, points_idx);
#else
AT_ERROR("Not compiled with GPU support");
#endif
} else { } else {
CHECK_CONTIGUOUS(grad_outputs); CHECK_CONTIGUOUS(grad_outputs);
CHECK_CONTIGUOUS(features); CHECK_CONTIGUOUS(features);

7
pytorch3d/csrc/compositing/weighted_sum.h
View File

@ -61,11 +61,10 @@ torch::Tensor weightedSumForward(
CHECK_CONTIGUOUS_CUDA(features); CHECK_CONTIGUOUS_CUDA(features);
CHECK_CONTIGUOUS_CUDA(alphas); CHECK_CONTIGUOUS_CUDA(alphas);
CHECK_CONTIGUOUS_CUDA(points_idx); CHECK_CONTIGUOUS_CUDA(points_idx);
return weightedSumCudaForward(features, alphas, points_idx);
#else #else
AT_ERROR("Not compiled with GPU support"); AT_ERROR("Not compiled with GPU support");
#endif #endif
return weightedSumCudaForward(features, alphas, points_idx);
} else { } else {
CHECK_CONTIGUOUS(features); CHECK_CONTIGUOUS(features);
CHECK_CONTIGUOUS(alphas); CHECK_CONTIGUOUS(alphas);
@ -91,11 +90,11 @@ std::tuple<torch::Tensor, torch::Tensor> weightedSumBackward(
CHECK_CONTIGUOUS_CUDA(features); CHECK_CONTIGUOUS_CUDA(features);
CHECK_CONTIGUOUS_CUDA(alphas); CHECK_CONTIGUOUS_CUDA(alphas);
CHECK_CONTIGUOUS_CUDA(points_idx); CHECK_CONTIGUOUS_CUDA(points_idx);
return weightedSumCudaBackward(grad_outputs, features, alphas, points_idx);
#else #else
AT_ERROR("Not compiled with GPU support"); AT_ERROR("Not compiled with GPU support");
#endif #endif
return weightedSumCudaBackward(grad_outputs, features, alphas, points_idx);
} else { } else {
CHECK_CONTIGUOUS(grad_outputs); CHECK_CONTIGUOUS(grad_outputs);
CHECK_CONTIGUOUS(features); CHECK_CONTIGUOUS(features);