Skip to content

fix output_padding in conv #33585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2021
Merged

fix output_padding in conv #33585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c4e062
fix output padding conv
jerrywgz Jun 16, 2021
e3bf12b
add repr unittest for conv
jerrywgz Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions python/paddle/fluid/tests/unittests/test_conv2d_transpose_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import numpy as np

import paddle
import paddle.nn as nn
paddle.enable_static()
import paddle.fluid.core as core
import paddle.fluid as fluid
Expand Down Expand Up @@ -898,5 +899,17 @@ def attr_padding_with_data_format():
self.assertRaises(ValueError, attr_padding_with_data_format)


class TestConv2DTransposeRepr(unittest.TestCase):
def test_case(self):
paddle.disable_static()
x_var = paddle.uniform((2, 4, 8, 8), dtype='float32', min=-1., max=1.)
conv = nn.Conv2DTranspose(4, 6, (3, 3), output_padding=1, stride=2)
print(conv)
y_var = conv(x_var)
y_np = y_var.numpy()
self.assertIsNotNone(y_np)
paddle.enable_static()


if __name__ == '__main__':
unittest.main()
12 changes: 6 additions & 6 deletions python/paddle/nn/layer/conv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def __init__(self,
'kernel_size')
self._padding = padding
self._padding_mode = padding_mode
self._output_padding = output_padding
self.output_padding = output_padding
if dims != 1:
self._updated_padding, self._padding_algorithm = _update_padding_nd(
padding, channel_last, dims)
Expand Down Expand Up @@ -163,8 +163,8 @@ def extra_repr(self):
main_str += ', padding={_padding}'
if self._padding_mode is not 'zeros':
main_str += ', padding_mode={_padding_mode}'
if self._output_padding != 0:
main_str += ', output_padding={_output_padding}'
if self.output_padding != 0:
main_str += ', output_padding={output_padding}'
if self._dilation != [1] * len(self._dilation):
main_str += ', dilation={_dilation}'
if self._groups != 1:
Expand Down Expand Up @@ -508,7 +508,7 @@ def forward(self, x, output_size=None):
self.weight,
bias=self.bias,
output_size=output_size,
output_padding=self._output_padding,
output_padding=self.output_padding,
padding=self._padding,
stride=self._stride,
dilation=self._dilation,
Expand Down Expand Up @@ -824,7 +824,7 @@ def __init__(self,

def forward(self, x, output_size=None):
if output_size is None:
output_padding = self._output_padding
output_padding = self.output_padding
else:
output_padding = 0

Expand Down Expand Up @@ -1161,7 +1161,7 @@ def __init__(self,

def forward(self, x, output_size=None):
if output_size is None:
output_padding = self._output_padding
output_padding = self.output_padding
else:
output_padding = 0

Expand Down