remove conv2d num_channel parameter; test=develop (#2378)

dygraph/mnist/mnist_dygraph.py

@@ -59,7 +59,6 @@ class SimpleImgConvPool(fluid.dygraph.Layer):
 
         self._conv2d = Conv2D(
             self.full_name(),
-            num_channels=num_channels,
             num_filters=num_filters,
             filter_size=filter_size,
             stride=conv_stride,

dygraph/ocr_recognition/train.py

@@ -107,7 +107,6 @@ class ConvBNPool(fluid.dygraph.Layer):
 
         self.conv_0_layer = Conv2D(
             self.full_name(),
-            channels[0],
             out_ch[0],
             3,
             padding=1,
@@ -119,7 +118,6 @@ class ConvBNPool(fluid.dygraph.Layer):
             self.full_name(), out_ch[0], act=act, is_test=is_test)
         self.conv_1_layer = Conv2D(
             self.full_name(),
-            num_channels=channels[1],
             num_filters=out_ch[1],
             filter_size=3,
             padding=1,

dygraph/resnet/train.py

@@ -81,7 +81,6 @@ class ConvBNLayer(fluid.dygraph.Layer):
 
         self._conv = Conv2D(
             self.full_name(),
-            num_channels=num_channels,
             num_filters=num_filters,
             filter_size=filter_size,
             stride=stride,

dygraph/sentiment/nets.py

@@ -19,7 +19,6 @@ from paddle.fluid.dygraph.base import to_variable
 class SimpleConvPool(fluid.dygraph.Layer):
     def __init__(self,
                  name_scope,
-                 num_channels,
                  num_filters,
                  filter_size,
                  use_cudnn=False,
@@ -28,7 +27,6 @@ class SimpleConvPool(fluid.dygraph.Layer):
         self.batch_size = batch_size
         self._conv2d = Conv2D(
             self.full_name(),
-            num_channels=num_channels,
             num_filters=num_filters,
             filter_size=filter_size,
             padding=[1, 1],
@@ -61,7 +59,6 @@ class CNN(fluid.dygraph.Layer):
 
         self._simple_conv_pool_1 = SimpleConvPool(
             self.full_name(),
-            1,
             self.hid_dim,
             self.win_size,
             batch_size=self.batch_size)
@@ -90,4 +87,4 @@ class CNN(fluid.dygraph.Layer):
 
             return avg_cost, prediction, acc
         else:
-            return prediction
\ No newline at end of file
+            return prediction