diff --git a/.gitignore b/.gitignore index 6aae076a49012b032b8fc0f1dc02c2714fb7b4a3..ee7c6ec370cd7c1f3435b41d915e24023c456af7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ build/ .project .cproject .pydevproject +.settings/ Makefile .test_env/ third_party/ diff --git a/python/paddle/trainer/config_parser.py b/python/paddle/trainer/config_parser.py index e9f5d53678cfadd1ec57e09d35a7e24949a6cdb1..1394773b4ff12aa751b8659a4461f94ee706892e 100644 --- a/python/paddle/trainer/config_parser.py +++ b/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, diff --git a/python/paddle/trainer_config_helpers/tests/configs/protostr/projections.protostr b/python/paddle/trainer_config_helpers/tests/configs/protostr/projections.protostr index fed3790043658c7ed0d543dea5d5280cb17af070..2afc3afef6d39ce9b8eef05948861284775d5011 100644 --- a/python/paddle/trainer_config_helpers/tests/configs/protostr/projections.protostr +++ b/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