diff --git a/x2paddle/decoder/caffe_decoder.py b/x2paddle/decoder/caffe_decoder.py index 33b203cebb71eb16675e884b095d508596fcd57c..f3fab9ac67b9237c6011494fa0531efcc1066462 100644 --- a/x2paddle/decoder/caffe_decoder.py +++ b/x2paddle/decoder/caffe_decoder.py @@ -246,6 +246,10 @@ class CaffeDecoder(object): if layer.type == 'PReLU': c_o, c_i, h, w = map(int, [1] + \ list(dims) + [1]* (3 - len(dims))) + elif layer.type == 'Normalize': + data = np.asarray(list(blob.data), dtype=np.float32) + transformed.append(data) + continue else: c_o, c_i, h, w = map(int, [1] * (4 - len(dims)) \ + list(dims)) diff --git a/x2paddle/op_mapper/caffe_custom_layer/normalize.py b/x2paddle/op_mapper/caffe_custom_layer/normalize.py index a63dc62cf9b9fc0dcd0badb5b189e66cbc7e0cd3..3ec1ef91a5ab1c2677445024a493a62da8547e65 100644 --- a/x2paddle/op_mapper/caffe_custom_layer/normalize.py +++ b/x2paddle/op_mapper/caffe_custom_layer/normalize.py @@ -17,11 +17,11 @@ def normalize_layer(inputs, 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][0], 1, 1, input_shape[0][1]], + if channel_shared else [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][0], 1, 1, input_shape[0][1]]) + shape=[1] if channel_shared else [input_shape[0][1]]) out = fluid.layers.elementwise_mul(x=l2_norm, y=scale_param, axis=-1 if channel_shared else 1)