Merge pull request #32 from PaddlePaddle/develop

update

x2paddle/__init__.py

-__version__ = "0.5.0"
+__version__ = "0.6.0"

x2paddle/op_mapper/caffe_custom_layer/normalize.py

@@ -12,14 +12,16 @@ def normalize_layer(inputs,
                     input_shape=None,
                     name=None):
     assert across_spatial == False, "Only support across_spatial == False for Normalize"
+
     input = inputs[0]
     l2_norm = fluid.layers.l2_normalize(input, axis=1, name=name + '_l2')
     scale_param = fluid.layers.create_parameter(
-        shape=[1] if channel_shared else [input_shape[0][1]],
+        shape=[1]
+        if channel_shared else [input_shape[0][0], 1, 1, input_shape[0][1]],
         dtype=input.dtype,
         attr=name + '_scale')
     scale_param = fluid.layers.reshape(x=scale_param, \
-                  shape=[1] if channel_shared else [input_shape[0][1]])
+                  shape=[1] if channel_shared else [input_shape[0][0], 1, 1, input_shape[0][1]])
     out = fluid.layers.elementwise_mul(x=l2_norm,
                                        y=scale_param,
                                        axis=-1 if channel_shared else 1)