From 8fa7678614f5ee8d3275dc50e600096915e8515b Mon Sep 17 00:00:00 2001
From: Jeremy Reizenstein <reizenstein@fb.com>
Date: Tue, 24 Mar 2020 05:00:42 -0700
Subject: [PATCH] fix CPU-only hiding of cuda calls

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

Reviewed By: nikhilaravi

Differential Revision: D20598014

fbshipit-source-id: df098ec4c6c93d38515172805fe57cac7463c506
---
 pytorch3d/csrc/compositing/alpha_composite.h   |  8 ++++----
 pytorch3d/csrc/compositing/norm_weighted_sum.h | 10 +++++-----
 pytorch3d/csrc/compositing/weighted_sum.h      |  7 +++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pytorch3d/csrc/compositing/alpha_composite.h b/pytorch3d/csrc/compositing/alpha_composite.h
index ea8ace14..7ec7115c 100644
--- a/pytorch3d/csrc/compositing/alpha_composite.h
+++ b/pytorch3d/csrc/compositing/alpha_composite.h
@@ -63,10 +63,10 @@ torch::Tensor alphaCompositeForward(
     CHECK_CONTIGUOUS_CUDA(features);
     CHECK_CONTIGUOUS_CUDA(alphas);
     CHECK_CONTIGUOUS_CUDA(points_idx);
+    return alphaCompositeCudaForward(features, alphas, points_idx);
 #else
     AT_ERROR("Not compiled with GPU support");
 #endif
-    return alphaCompositeCudaForward(features, alphas, points_idx);
   } else {
     CHECK_CONTIGUOUS(features);
     CHECK_CONTIGUOUS(alphas);
@@ -92,12 +92,12 @@ std::tuple<torch::Tensor, torch::Tensor> alphaCompositeBackward(
     CHECK_CONTIGUOUS_CUDA(features);
     CHECK_CONTIGUOUS_CUDA(alphas);
     CHECK_CONTIGUOUS_CUDA(points_idx);
-#else
-    AT_ERROR("Not compiled with GPU support");
-#endif
 
     return alphaCompositeCudaBackward(
         grad_outputs, features, alphas, points_idx);
+#else
+    AT_ERROR("Not compiled with GPU support");
+#endif
   } else {
     CHECK_CONTIGUOUS(grad_outputs);
     CHECK_CONTIGUOUS(features);
diff --git a/pytorch3d/csrc/compositing/norm_weighted_sum.h b/pytorch3d/csrc/compositing/norm_weighted_sum.h
index 964b268b..339b56fa 100644
--- a/pytorch3d/csrc/compositing/norm_weighted_sum.h
+++ b/pytorch3d/csrc/compositing/norm_weighted_sum.h
@@ -61,11 +61,11 @@ torch::Tensor weightedSumNormForward(
     CHECK_CONTIGUOUS_CUDA(features);
     CHECK_CONTIGUOUS_CUDA(alphas);
     CHECK_CONTIGUOUS_CUDA(points_idx);
+
+    return weightedSumNormCudaForward(features, alphas, points_idx);
 #else
     AT_ERROR("Not compiled with GPU support");
 #endif
-
-    return weightedSumNormCudaForward(features, alphas, points_idx);
   } else {
     CHECK_CONTIGUOUS(features);
     CHECK_CONTIGUOUS(alphas);
@@ -91,12 +91,12 @@ std::tuple<torch::Tensor, torch::Tensor> weightedSumNormBackward(
     CHECK_CONTIGUOUS_CUDA(features);
     CHECK_CONTIGUOUS_CUDA(alphas);
     CHECK_CONTIGUOUS_CUDA(points_idx);
-#else
-    AT_ERROR("Not compiled with GPU support");
-#endif
 
     return weightedSumNormCudaBackward(
         grad_outputs, features, alphas, points_idx);
+#else
+    AT_ERROR("Not compiled with GPU support");
+#endif
   } else {
     CHECK_CONTIGUOUS(grad_outputs);
     CHECK_CONTIGUOUS(features);
diff --git a/pytorch3d/csrc/compositing/weighted_sum.h b/pytorch3d/csrc/compositing/weighted_sum.h
index fb978297..9c96e38c 100644
--- a/pytorch3d/csrc/compositing/weighted_sum.h
+++ b/pytorch3d/csrc/compositing/weighted_sum.h
@@ -61,11 +61,10 @@ torch::Tensor weightedSumForward(
     CHECK_CONTIGUOUS_CUDA(features);
     CHECK_CONTIGUOUS_CUDA(alphas);
     CHECK_CONTIGUOUS_CUDA(points_idx);
+    return weightedSumCudaForward(features, alphas, points_idx);
 #else
     AT_ERROR("Not compiled with GPU support");
 #endif
-
-    return weightedSumCudaForward(features, alphas, points_idx);
   } else {
     CHECK_CONTIGUOUS(features);
     CHECK_CONTIGUOUS(alphas);
@@ -91,11 +90,11 @@ std::tuple<torch::Tensor, torch::Tensor> weightedSumBackward(
     CHECK_CONTIGUOUS_CUDA(features);
     CHECK_CONTIGUOUS_CUDA(alphas);
     CHECK_CONTIGUOUS_CUDA(points_idx);
+
+    return weightedSumCudaBackward(grad_outputs, features, alphas, points_idx);
 #else
     AT_ERROR("Not compiled with GPU support");
 #endif
-
-    return weightedSumCudaBackward(grad_outputs, features, alphas, points_idx);
   } else {
     CHECK_CONTIGUOUS(grad_outputs);
     CHECK_CONTIGUOUS(features);