From 45530c772e484d5033ceee90a034278f09ada6ba Mon Sep 17 00:00:00 2001
From: yuyang18 <reyoung@126.com>
Date: Wed, 30 May 2018 13:45:09 +0800
Subject: [PATCH] Fix GPU compile

---
 paddle/fluid/operators/random_crop_op.cu | 1 +
 paddle/fluid/operators/random_crop_op.h  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/paddle/fluid/operators/random_crop_op.cu b/paddle/fluid/operators/random_crop_op.cu
index 2782911b4f..6fc9bedc55 100644
--- a/paddle/fluid/operators/random_crop_op.cu
+++ b/paddle/fluid/operators/random_crop_op.cu
@@ -14,6 +14,7 @@
 
 #include "paddle/fluid/operators/random_crop_op.h"
 
+namespace ops = paddle::operators;
 template <typename T>
 using Kernel = ops::RandomCropKernel<paddle::platform::CUDADeviceContext, T>;
 REGISTER_OP_CUDA_KERNEL(random_crop, Kernel<float>, Kernel<int>, Kernel<double>,
diff --git a/paddle/fluid/operators/random_crop_op.h b/paddle/fluid/operators/random_crop_op.h
index a34294f5ee..e0e24a7d1f 100644
--- a/paddle/fluid/operators/random_crop_op.h
+++ b/paddle/fluid/operators/random_crop_op.h
@@ -60,7 +60,7 @@ HOSTDEVICE inline void StridedMemcpy(const T* x, const size_t* x_dims, T* out,
   size_t offset_i = offsets[i];
 
   if (i == rank - 1) {
-    PADDLE_ENFORCE(x_stride == 1 && out_stride == 1);
+    PADDLE_ASSERT(x_stride == 1 && out_stride == 1);
     x += offset_i;
     for (size_t j = 0; j < out_dim_i; ++j) {
       *out++ = *x++;
@@ -105,12 +105,12 @@ struct RandomCropFunctor {
     prod_batchsize_dims_ = 1;
     prod_x_ins_dims_ = 1;
     prod_out_ins_dims_ = 1;
-    for (size_t i = 0; i < rank_; ++i) {
+    for (size_t i = 0; i < static_cast<size_t>(rank_); ++i) {
       size_t x_dim_i = x_dims[i];
       size_t out_dim_i = out_dims[i];
       x_dims_[i] = x_dim_i;
       out_dims_[i] = out_dim_i;
-      if (i < num_batchsize_dims_) {
+      if (i < static_cast<size_t>(num_batchsize_dims_)) {
         PADDLE_ENFORCE_EQ(x_dim_i, out_dim_i);
         prod_batchsize_dims_ *= x_dim_i;
       } else {
-- 
GitLab