Merge pull request #1256 from luotao1/maxout

remove usused arguments for maxout_layer, refine notes for pad_layer

python/paddle/trainer_config_helpers/layers.py

@@ -3677,7 +3677,7 @@ def pad_layer(input,
 
     For example,
 
-    .. code-block::
+    .. code-block:: python
 
        input(2,2,2,3)  = [
                            [ [[1,2,3], [3,4,5]],
@@ -3687,6 +3687,7 @@ def pad_layer(input,
                          ]
 
        pad_c=[1,1], pad_h=[0,0], pad_w=[0,0]
+
        output(2,4,2,3) = [
                            [ [[0,0,0], [0,0,0]],
                              [[1,2,3], [3,4,5]],
@@ -4191,13 +4192,7 @@ def block_expand_layer(input,
 
 @wrap_name_default()
 @layer_support()
-def maxout_layer(input,
+def maxout_layer(input, groups, num_channels=None, name=None, layer_attr=None):
-                 groups,
-                 num_channels=None,
-                 size_x=None,
-                 size_y=None,
-                 name=None,
-                 layer_attr=None):
     """
     A layer to do max out on conv layer output.
       - Input: output of a conv layer.
@@ -4227,12 +4222,6 @@ def maxout_layer(input,
     :type num_channels: int|None
     :param groups: The group number of input layer.
     :type groups: int
-    :param size_x: conv output width. If None will be set
-                   automatically from previous output.
-    :type size_x: int|None
-    :param size_y: conv output height. If None will be set
-                   automatically from previous output.
-    :type size_y: int|None
     :param name: The name of this layer, which can not specify.
     :type name: None|basestring.
     :param layer_attr: Extra Layer attribute.