diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2015-09-19 14:00:14 -0700 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2015-09-19 14:42:55 -0700 |
| commit | ec77358c2d2e05b3aa39221bd3ec093789bd40f6 (patch) | |
| tree | 21aec00b6157d6d965e9e3699733b84b01d0c54a | |
| parent | 328df2450c534119f239ce1d606f8502922c6825 (diff) | |
| download | caffeonacl-ec77358c2d2e05b3aa39221bd3ec093789bd40f6.tar.gz caffeonacl-ec77358c2d2e05b3aa39221bd3ec093789bd40f6.tar.bz2 caffeonacl-ec77358c2d2e05b3aa39221bd3ec093789bd40f6.zip | |
harmonize the im2col_{cpu,gpu} assignment
| -rw-r--r-- | src/caffe/util/im2col.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/caffe/util/im2col.cpp b/src/caffe/util/im2col.cpp index afeb5e5d..018ff0cd 100644 --- a/src/caffe/util/im2col.cpp +++ b/src/caffe/util/im2col.cpp @@ -25,11 +25,9 @@ void im2col_cpu(const Dtype* data_im, const int channels, for (int w_col = 0; w_col < width_col; ++w_col) { int h_im = h_col * stride_h - pad_h + h_offset; int w_im = w_col * stride_w - pad_w + w_offset; - if (h_im >= 0 && h_im < height && w_im >= 0 && w_im < width) - data_col[(c_col * height_col + h_col) * width_col + w_col] = - data_im[(c_im * height + h_im) * width + w_im]; - else - data_col[(c_col * height_col + h_im) * width_col + w_im] = 0; + data_col[(c_col * height_col + h_col) * width_col + w_col] = + (h_im >= 0 && w_im >= 0 && h_im < height && w_im < width) ? + data_im[(c_im * height + h_im) * width + w_im] : 0; } } } |