diff --git a/python/paddle/fluid/layers/nn.py b/python/paddle/fluid/layers/nn.py index ef309ac1b040ff49de38eb584b1b5f68fd9baea8..ead7041b7b20c7036bbea3da544f3b422c9f31fa 100644 --- a/python/paddle/fluid/layers/nn.py +++ b/python/paddle/fluid/layers/nn.py @@ -1431,8 +1431,8 @@ def sequence_last_step(input): def pool2d(input, - pool_size, - pool_type, + pool_size=-1, + pool_type="max", pool_stride=1, pool_padding=0, global_pooling=False, @@ -1447,6 +1447,11 @@ def pool2d(input, "Unknown pool_type: '%s'. It can only be 'max' or 'avg'.", str(pool_type)) + if global_pooling is False and pool_size == -1: + raise ValueError( + "When the global_pooling is False, pool_size must be passed " + "and be a valid value. Received pool_size: " + str(pool_size)) + pool_size = utils.convert_to_list(pool_size, 2, 'pool_size') pool_padding = utils.convert_to_list(pool_padding, 2, 'pool_padding') pool_stride = utils.convert_to_list(pool_stride, 2, 'pool_stride') diff --git a/python/paddle/v2/fluid/layers/utils.py b/python/paddle/fluid/layers/utils.py similarity index 96% rename from python/paddle/v2/fluid/layers/utils.py rename to python/paddle/fluid/layers/utils.py index d04f2f86ac7c5b931a14c3b03fc1735e839aa289..d79e8078ff415f22443a9c1f302604a004819e35 100644 --- a/python/paddle/v2/fluid/layers/utils.py +++ b/python/paddle/fluid/layers/utils.py @@ -47,7 +47,7 @@ def convert_to_list(value, n, name): int(single_value) except (ValueError, TypeError): raise ValueError( - "The " + name + "'s must be a list or tuple of " + str( + "The " + name + "'s type must be a list or tuple of " + str( n) + " integers. Received: " + str(value) + " " "including element " + str(single_value) + " of type" + " " + str(type(single_value)))