From f1ab13bd0e42005bc3cc1163ef0d8f9c6125c128 Mon Sep 17 00:00:00 2001
From: chengduoZH <zhaochengduo@163.com>
Date: Tue, 19 Dec 2017 19:16:14 +0800
Subject: [PATCH] refine

---
 paddle/operators/elementwise_op_function.h |  6 +++---
 paddle/operators/math/im2col.cc            | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/paddle/operators/elementwise_op_function.h b/paddle/operators/elementwise_op_function.h
index 65484f318e..9edfacd6df 100644
--- a/paddle/operators/elementwise_op_function.h
+++ b/paddle/operators/elementwise_op_function.h
@@ -105,8 +105,8 @@ class MidWiseTransformIterator<T, platform::CPUDeviceContext> {
     ++j_;
     if (UNLIKELY(j_ == post_)) {
       ++i_;
+      j_ = 0;
       if (UNLIKELY(i_ == n_)) {
-        j_ = 0;
         i_ = 0;
       }
     }
@@ -127,10 +127,10 @@ class MidWiseTransformIterator<T, platform::CPUDeviceContext> {
 
  private:
   const T* ptr_;
-  int i_;
+  int64_t i_;
   int64_t j_;
   int64_t n_;
-  int post_;
+  int64_t post_;
 };
 
 #ifdef __NVCC__
diff --git a/paddle/operators/math/im2col.cc b/paddle/operators/math/im2col.cc
index a746c267b6..d11a6afe9b 100644
--- a/paddle/operators/math/im2col.cc
+++ b/paddle/operators/math/im2col.cc
@@ -66,10 +66,10 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO,
     int c_im = 0;
     for (int c = 0; c < channels_col; ++c) {
       ++w_offset;
-      if (UNLIKELY(w_offset == filter_width)) {
+      if (w_offset == filter_width) {
         w_offset = 0;
         ++h_offset;
-        if (UNLIKELY(h_offset == filter_height)) {
+        if (h_offset == filter_height) {
           h_offset = 0;
           ++c_im;
         }
@@ -140,10 +140,10 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kCFO,
     int c_im = 0;
     for (int c = 0; c < channels_col; ++c) {
       ++w_offset;
-      if (UNLIKELY(w_offset == filter_width)) {
+      if (w_offset == filter_width) {
         w_offset = 0;
         ++h_offset;
-        if (UNLIKELY(h_offset == filter_height)) {
+        if (h_offset == filter_height) {
           h_offset = 0;
           ++c_im;
         }
@@ -214,12 +214,13 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kOCF,
         for (int channel = 0; channel < im_channels; ++channel) {
           for (int filter_row_idx = 0; filter_row_idx < filter_height;
                ++filter_row_idx) {
+            int im_row_offset =
+                col_row_idx * stride[0] + filter_row_idx - padding[0];
             for (int filter_col_idx = 0; filter_col_idx < filter_width;
                  ++filter_col_idx) {
-              int im_row_offset =
-                  col_row_idx * stride[0] + filter_row_idx - padding[0];
               int im_col_offset =
                   col_col_idx * stride[1] + filter_col_idx - padding[1];
+
               int col_offset =
                   ((((col_row_idx)*col_width + col_col_idx) * im_channels +
                     channel) *
@@ -286,12 +287,13 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF,
         for (int channel = 0; channel < im_channels; ++channel) {
           for (int filter_row_idx = 0; filter_row_idx < filter_height;
                ++filter_row_idx) {
+            int im_row_offset =
+                col_row_idx * stride[0] + filter_row_idx - padding[0];
             for (int filter_col_idx = 0; filter_col_idx < filter_width;
                  ++filter_col_idx) {
-              int im_row_offset =
-                  col_row_idx * stride[0] + filter_row_idx - padding[0];
               int im_col_offset =
                   col_col_idx * stride[1] + filter_col_idx - padding[1];
+
               int col_offset =
                   (((col_row_idx * col_width + col_col_idx) * im_channels +
                     channel) *
@@ -299,6 +301,7 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF,
                    filter_row_idx) *
                       filter_width +
                   filter_col_idx;
+
               if (im_row_offset >= 0 && im_row_offset < im_height &&
                   im_col_offset >= 0 && im_col_offset < im_width) {
                 int im_offset =
-- 
GitLab