Skip to content

Commit a779b42

Browse files
committed
follow comments
1 parent 7cf2c05 commit a779b42

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

paddle/fluid/operators/conv_op.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ void ConvOp::InferShape(framework::InferShapeContext* ctx) const {
5454

5555
std::vector<int64_t> output_shape({in_dims[0], filter_dims[0]});
5656
for (size_t i = 0; i < strides.size(); ++i) {
57-
PADDLE_ENFORCE(in_dims[i + 2] + 2 * paddings[i] -
58-
(dilations[i] * (filter_dims[i + 2] - 1) + 1) >=
59-
0,
60-
"Due to the settings of paddings, filter_dims and "
61-
"dilations, the output size is less than 0, please check "
62-
"again.");
6357
output_shape.push_back(ConvOutputSize(in_dims[i + 2], filter_dims[i + 2],
6458
dilations[i], paddings[i],
6559
strides[i]));

paddle/fluid/operators/conv_op.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,14 @@ using Tensor = framework::Tensor;
3131
inline int ConvOutputSize(int input_size, int filter_size, int dilation,
3232
int padding, int stride) {
3333
const int dkernel = dilation * (filter_size - 1) + 1;
34-
const int output_size = (input_size + 2 * padding - dkernel) / stride + 1;
34+
int output_size = (input_size + 2 * padding - dkernel) / stride + 1;
35+
PADDLE_ENFORCE(
36+
output_size > 0,
37+
"Due to the settings of padding(%d), filter_size(%d), dilation(%d) and "
38+
"stride(%d), the output size is less than 0, please check "
39+
"again. Input_size:%d",
40+
padding, filter_size, dilation, stride, input_size);
41+
3542
return output_size;
3643
}
3744
inline bool IsExpand(std::vector<int64_t>& filter_dim,

paddle/fluid/operators/pool_op.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ namespace operators {
1919

2020
int PoolOutputSize(int input_size, int filter_size, int padding, int stride) {
2121
int output_size = (input_size - filter_size + 2 * padding) / stride + 1;
22+
PADDLE_ENFORCE(output_size > 0,
23+
"Due to the settings of padding(%d), filter_size(%d) and "
24+
"stride(%d), the output size is less than 0, please check "
25+
"again. Input_size:%d",
26+
padding, filter_size, stride, input_size);
2227
return output_size;
2328
}
2429

0 commit comments

Comments
 (0)