diff --git a/x2paddle/decoder/caffe_decoder.py b/x2paddle/decoder/caffe_decoder.py index f3fab9ac67b9237c6011494fa0531efcc1066462..fee1abd017b6723548d133af0cb42a06f36bf965 100644 --- a/x2paddle/decoder/caffe_decoder.py +++ b/x2paddle/decoder/caffe_decoder.py @@ -253,6 +253,7 @@ class CaffeDecoder(object): else: c_o, c_i, h, w = map(int, [1] * (4 - len(dims)) \ + list(dims)) + else: c_o = blob.num c_i = blob.channels diff --git a/x2paddle/op_mapper/caffe_custom_layer/normalize.py b/x2paddle/op_mapper/caffe_custom_layer/normalize.py index 3ec1ef91a5ab1c2677445024a493a62da8547e65..577a674f7e70aebee78735611c11e7202b2ccf7e 100644 --- a/x2paddle/op_mapper/caffe_custom_layer/normalize.py +++ b/x2paddle/op_mapper/caffe_custom_layer/normalize.py @@ -12,12 +12,10 @@ 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][1]], dtype=input.dtype, attr=name + '_scale') scale_param = fluid.layers.reshape(x=scale_param, \