diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2015-10-16 18:09:00 -0700 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2015-10-16 18:09:00 -0700 |
| commit | dfcdb721c6286b7ff40aba3589df1d8e9d281bd9 (patch) | |
| tree | 635e812aee00c5cbe6440f2bde7c83a1849f01a0 /include | |
| parent | 5d5d5f21bcf6acf4d34f380e1f031e028c7a5ec6 (diff) | |
| parent | d292a162b3659685b5f4399b8adf743bdcac49a1 (diff) | |
| download | caffeonacl-dfcdb721c6286b7ff40aba3589df1d8e9d281bd9.tar.gz caffeonacl-dfcdb721c6286b7ff40aba3589df1d8e9d281bd9.tar.bz2 caffeonacl-dfcdb721c6286b7ff40aba3589df1d8e9d281bd9.zip | |
Merge pull request #3089 from shelhamer/groom-conv
[style] groom im2col + col2im for clarity
Diffstat (limited to 'include')
| -rw-r--r-- | include/caffe/util/im2col.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/caffe/util/im2col.hpp b/include/caffe/util/im2col.hpp index 531fd29c..d3eb6ccd 100644 --- a/include/caffe/util/im2col.hpp +++ b/include/caffe/util/im2col.hpp @@ -23,7 +23,7 @@ void col2im_nd_cpu(const Dtype* data_col, const int num_spatial_axes, template <typename Dtype> void col2im_cpu(const Dtype* data_col, const int channels, - const int height, const int width, const int patch_h, const int patch_w, + const int height, const int width, const int kernel_h, const int kernel_w, const int pad_h, const int pad_w, const int stride_h, const int stride_w, Dtype* data_im); @@ -47,7 +47,7 @@ void col2im_nd_gpu(const Dtype* data_col, const int num_spatial_axes, template <typename Dtype> void col2im_gpu(const Dtype* data_col, const int channels, - const int height, const int width, const int patch_h, const int patch_w, + const int height, const int width, const int kernel_h, const int kernel_w, const int pad_h, const int pad_w, const int stride_h, const int stride_w, Dtype* data_im); |