Skip to content
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

Fix Python IndexError of case13: paddle.static.nn.batch_norm #50011

Merged
merged 4 commits into from
Jan 31, 2023
+11 −1
Merged

Fix Python IndexError of case13: paddle.static.nn.batch_norm #50011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8270b1
add channel_num check for paddle.static.nn.batch_norm
ccsuzzh Jan 22, 2023
9bc8b2f
fix bugs
ccsuzzh Jan 23, 2023
95fc769
fix bugs
ccsuzzh Jan 25, 2023
7edaa3c
Merge branch 'PaddlePaddle:develop' into batch_norm
ccsuzzh Jan 27, 2023
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
4 changes: 4 additions & 0 deletions python/paddle/fluid/tests/unittests/test_batch_norm_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,10 @@ def test_errors(self):
)
self.assertRaises(TypeError, paddle.static.nn.batch_norm, x2)

# the first dimension of input for batch_norm must between [2d, 5d].
x3 = paddle.static.data("", shape=[0], dtype="float32")
self.assertRaises(ValueError, paddle.static.nn.batch_norm, x3)


class TestDygraphBatchNormAPIError(unittest.TestCase):
def test_errors(self):
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/fluid/tests/unittests/test_fold_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def test_errors(self):
with program_guard(Program(), Program()):

def test_input_shape():
# input_shpae must be 3-D
# input_shape must be 3-D
x = paddle.randn(shape=[2, 3, 6, 7], dtype="float32")
out = fold(x, output_sizes=[2, 3], kernel_sizes=[2, 2])

Expand Down
6 changes: 6 additions & 0 deletions python/paddle/static/nn/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2726,6 +2726,12 @@ def batch_norm(
dtype = core.VarDesc.VarType.FP32

input_shape = input.shape
if len(input.shape) < 2 or len(input.shape) > 5:
raise ValueError(
'expected 2D or 3D or 4D or 5D input (got {}D input, input shape is: {})'.format(
len(input.shape), input_shape
)
)
if data_layout == 'NCHW':
channel_num = input_shape[1]
else:
Expand Down