More guards

apache · Jun 26, 2020 · d889bdc · d889bdc
1 parent e7ad72b
commit d889bdc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/operator/nn/layer_norm-inl.h b/src/operator/nn/layer_norm-inl.h
@@ -145,7 +145,7 @@ void LayerNormComputeGeneral(const nnvm::NodeAttrs& attrs,
     BinaryBroadcastRTCCompute {"sub"}(attrs, ctx,
                                       {inputs[0], outputs[layernorm::kMean]},
                                       {kWriteTo}, {outputs[0]});
-#endif
+#endif  // MXNET_USE_CUDA
   }
   // Calculate std
   const TBlob centered_out = outputs[0].reshape(red_src_shape);
@@ -190,7 +190,7 @@ void LayerNormComputeGeneral(const nnvm::NodeAttrs& attrs,
     BinaryBroadcastRTCCompute {"add"}(attrs, ctx,
                                       {outputs[0], beta},
                                       {kWriteTo}, {outputs[0]});
-#endif
+#endif  // MXNET_USE_CUDA
   }
 }
 
@@ -289,7 +289,7 @@ void LayerNormGradComputeGeneral(const nnvm::NodeAttrs& attrs,
     BinaryBroadcastRTCCompute {"div"}(attrs, ctx,
                                       {normalized_data, std},
                                       {kWriteTo}, {normalized_data});
-#endif
+#endif  // MXNET_USE_CUDA
   }
   // Calculate grad_beta
   bool safe_acc = dmlc::GetEnv("MXNET_SAFE_ACCUMULATION", false);
@@ -313,8 +313,10 @@ void LayerNormGradComputeGeneral(const nnvm::NodeAttrs& attrs,
     ElemwiseBinaryOp::Compute<xpu, op::mshadow_op::mul>(attrs, ctx, {normalized_data, ograd},
                                                         {kWriteTo}, {ograd_mult});
   } else {
+#if MXNET_USE_CUDA
     ElemwiseBinaryRTCCompute {"mul"}(attrs, ctx, {normalized_data, ograd},
                                      {kWriteTo}, {ograd_mult});
+#endif  // MXNET_USE_CUDA
   }
   if (req[1] != kNullOp) {
     MSHADOW_REAL_TYPE_SWITCH(outputs[1].type_flag_, DType, {
@@ -351,7 +353,7 @@ void LayerNormGradComputeGeneral(const nnvm::NodeAttrs& attrs,
       BinaryBroadcastRTCCompute {"div"}(attrs, ctx,
                                         {ograd_mult, std},
                                         {kWriteTo}, {ograd_mult});
-#endif
+#endif  // MXNET_USE_CUDA
     }
     MSHADOW_REAL_TYPE_SWITCH(outputs[0].type_flag_, DType, {
       BROADCAST_NDIM_SWITCH(red_dst_shape.ndim(), NDim, {
@@ -375,11 +377,13 @@ void LayerNormGradComputeGeneral(const nnvm::NodeAttrs& attrs,
       ElemwiseBinaryOp::Compute<xpu, op::mshadow_op::mul>(attrs, ctx, {ograd_mult, normalized_data},
                                                           {kWriteTo}, {ograd_mult});
     } else {
+#if MXNET_USE_CUDA
       BinaryBroadcastRTCCompute {"sub"}(attrs, ctx,
                                         {ograd_mult, red_out},
                                         {req[0]}, {outputs[0]});
       ElemwiseBinaryRTCCompute {"mul"}(attrs, ctx, {ograd_mult, normalized_data},
                                        {kWriteTo}, {ograd_mult});
+#endif  // MXNET_USE_CUDA
     }
     MSHADOW_REAL_TYPE_SWITCH(outputs[0].type_flag_, DType, {
       BROADCAST_NDIM_SWITCH(red_dst_shape.ndim(), NDim, {
@@ -405,7 +409,7 @@ void LayerNormGradComputeGeneral(const nnvm::NodeAttrs& attrs,
       BinaryBroadcastRTCCompute {"mul"}(attrs, ctx,
                                         {normalized_data, red_out},
                                         {kAddTo}, {outputs[0]});
-#endif
+#endif  // MXNET_USE_CUDA
     }
   }
 }

diff --git a/src/operator/tensor/elemwise_unary_op.h b/src/operator/tensor/elemwise_unary_op.h
@@ -111,7 +111,7 @@ void inline CopyBlob(mshadow::Stream<xpu> *s,
  * \param dest Destination sparse NDArray
  * \param clone_from sparse NDArray from which to clone storage attributes
  */
-void AllocateGeometry(const NDArray *dest,
+void inline AllocateGeometry(const NDArray *dest,
                              const OpReqType req,
                              const NDArray* clone_from = nullptr) {
   if (req != kNullOp) {