Add up, down, left and right padding for im2col. #4887
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chengduoZH
changed the title
qingqing01
reviewed
Oct 23, 2017
paddle/operators/math/im2col.cc
Outdated
| if ((im_row_idx - padding_up) < 0 || | ||
| (im_row_idx - padding_up) >= input_height || | ||
| (im_col_idx - padding_left) < 0 || | ||
| (im_col_idx - padding_left) >= input_width) { |
There was a problem hiding this comment.
int im_row_idx = h * stride_height + h_offset - padding_up;
int im_col_idx = w * stride_width + w_offset - padding_left;
if (im_row_idx < 0 || im_row_idx >= input_height || im_col_idx < 0 || ...) {
} else {
im_row_idx += c_im * input_height;
col_data[...] = ...
}
paddle/operators/math/im2col.cc
Outdated
| (im_col_idx - padding_left) >= 0 && | ||
| (im_col_idx - padding_left) < input_width) { | ||
| im_row_idx += c_im * input_height - padding_up; | ||
| im_col_idx -= padding_left; |
There was a problem hiding this comment.
同上，可以在line 127, line 128分别减padding_up, padding_left吧。
paddle/operators/math/im2col.cc
Outdated
| @@ -222,10 +262,10 @@ class Col2ImFunctor<paddle::operators::math::ColFormat::kOCF, | |||
| ++filter_row_idx) { | |||
| for (int filter_col_idx = 0; filter_col_idx < filter_width; | |||
| ++filter_col_idx) { | |||
| int im_row_offset = | |||
| col_row_idx * stride_height + filter_row_idx - padding_height; | |||
| int im_row_offset = // change or not ？？？ | |||
There was a problem hiding this comment.
What is the comment mean?
There was a problem hiding this comment.
Nothing.
has been removed.
paddle/operators/math/im2col_test.cc
Outdated
| if (paddle::platform::is_cpu_place(*place)) { | ||
| input = input_tmp; | ||
| } else { | ||
| input.CopyFrom<float>(input_tmp, *place, *context); |
There was a problem hiding this comment.
CopyFrom remove the template T.
paddle/operators/math/im2col.cc
Outdated
| @@ -41,6 +41,16 @@ class Im2ColFunctor<paddle::operators::math::ColFormat::kCFO, | |||
| int filter_width = col.dims()[2]; | |||
| int output_height = col.dims()[3]; | |||
| int output_width = col.dims()[4]; | |||
|
|
|||
| PADDLE_ENFORCE((input_height + padding_up + padding_down - filter_height) / | |||
There was a problem hiding this comment.
PADDLE_ENFORCE -> PADDLE_ENFORCE_EQ, 貌似PADDLE_ENFORCE_EQ的报错信息较好一些。 下同。
… fix_im2col_kocf_for_sequence
chengduoZH
force-pushed
the
fix_im2col_kocf_for_sequence
branch
from
b9d50e8 to
09662da
Compare
qingqing01
approved these changes
Oct 24, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #4995