Merge pull request #1693 from wangyang59/cudnnDeconv

fixed a bug in conv_projection issue #1681

.gitignore

@@ -7,6 +7,7 @@ build/
 .project
 .cproject
 .pydevproject
+.settings/
 Makefile
 .test_env/
 third_party/

python/paddle/trainer/config_parser.py

@@ -724,7 +724,8 @@ class ConvProjection(ConvBaseProjection):
                  num_filters=None,
                  conv_conf=None,
                  **xargs):
-        super(ConvProjection, self).__init__(input_layer_name, **xargs)
+        super(ConvProjection, self).__init__(input_layer_name, num_filters,
+                                             conv_conf, **xargs)
 
         parse_conv(conv_conf, self.input_layer_name, self.proj_conf.conv_conf,
                    num_filters)
@@ -742,7 +743,8 @@ class ConvTransProjection(ConvBaseProjection):
                  num_filters=None,
                  conv_conf=None,
                  **xargs):
-        super(ConvTransProjection, self).__init__(input_layer_name, **xargs)
+        super(ConvTransProjection, self).__init__(input_layer_name, num_filters,
+                                                  conv_conf, **xargs)
 
         parse_conv(
             conv_conf,

python/paddle/trainer_config_helpers/tests/configs/protostr/projections.protostr

@@ -156,6 +156,7 @@ layers {
   }
   inputs {
     input_layer_name: "img"
+    input_parameter_name: "___mixed_6__.w1"
     proj_conf {
       type: "conv"
       name: "___mixed_6__.w1"
@@ -177,6 +178,7 @@ layers {
         output_y: 30
         img_size_y: 32
       }
+      num_filters: 64
     }
   }
   inputs {
@@ -218,6 +220,7 @@ layers {
   }
   inputs {
     input_layer_name: "img"
+    input_parameter_name: "___mixed_7__.w1"
     proj_conf {
       type: "convt"
       name: "___mixed_7__.w1"
@@ -239,6 +242,7 @@ layers {
         output_y: 32
         img_size_y: 63
       }
+      num_filters: 64
     }
   }
   inputs {
@@ -377,6 +381,22 @@ parameters {
   initial_strategy: 0
   initial_smart: true
 }
+parameters {
+  name: "___mixed_6__.w1"
+  size: 576
+  initial_mean: 0.0
+  initial_std: 0.471404520791
+  initial_strategy: 0
+  initial_smart: false
+}
+parameters {
+  name: "___mixed_7__.w1"
+  size: 576
+  initial_mean: 0.0
+  initial_std: 0.471404520791
+  initial_strategy: 0
+  initial_smart: false
+}
 parameters {
   name: "___mixed_8__.w0"
   size: 30000