提交 4af3caec 编写于 作者: M mamingjie-China

fix bug in paddle1.8.3

上级 2913eea1
...@@ -333,16 +333,15 @@ class TFOpMapperNHWC(OpMapper): ...@@ -333,16 +333,15 @@ class TFOpMapperNHWC(OpMapper):
"dilation": dilations[2:4], "dilation": dilations[2:4],
"padding": string(pad_mode) "padding": string(pad_mode)
} }
if hasattr(node, 'dilation') and attr['dilation'] == [1, 1]: if hasattr(node, 'dilation') and attr['dilation'] == [1, 1]:
if len(node.dilation) == 1: if len(node.dilation) == 1:
attr['dilation'] = [1, node.dilation[0]] attr['dilation'] = [1, node.dilation[0]]
if c == -1: if c == -1:
reshape_attr = {"shape": [0, k_size[2], 0, 0]} reshape_attr = {"shape": [0, k_size[2], 0, 0]}
node.fluid_code.add_layer( node.fluid_code.add_layer(
"reshape", inputs=input, output=input, param_attr=reshape_attr) "reshape", inputs=input, output=input, param_attr=reshape_attr)
node.fluid_code.add_layer( node.fluid_code.add_layer(
"conv2d", inputs=input, output=node, param_attr=attr) "conv2d", inputs=input, output=node, param_attr=attr)
if not channel_first: if not channel_first:
...@@ -759,6 +758,7 @@ class TFOpMapperNHWC(OpMapper): ...@@ -759,6 +758,7 @@ class TFOpMapperNHWC(OpMapper):
begin = begin.value.tolist() begin = begin.value.tolist()
else: else:
begin = self.decoder.infer_tensor(begin).tolist() begin = self.decoder.infer_tensor(begin).tolist()
# shape = begin.out_shapes[0] # shape = begin.out_shapes[0]
# attr = {"shape": shape} # attr = {"shape": shape}
# node.fluid_code.add_layer( # node.fluid_code.add_layer(
...@@ -1101,4 +1101,3 @@ class TFOpMapperNHWC(OpMapper): ...@@ -1101,4 +1101,3 @@ class TFOpMapperNHWC(OpMapper):
output = "{}[{}]".format(node.layer_name, i) output = "{}[{}]".format(node.layer_name, i)
node.fluid_code.add_layer( node.fluid_code.add_layer(
"data", inputs=None, output=output, param_attr=attr) "data", inputs=None, output=output, param_attr=attr)
...@@ -863,7 +863,7 @@ class TFOptimizer(object): ...@@ -863,7 +863,7 @@ class TFOptimizer(object):
weight = numpy.expand_dims(weight, 2) weight = numpy.expand_dims(weight, 2)
weight = numpy.expand_dims(weight, 3) weight = numpy.expand_dims(weight, 3)
self.op_mapper.weights[in_nodes3[0].layer_name] = weight self.op_mapper.weights[in_nodes3[0].layer_name] = weight
# fix bug in Paddle1.8.3 and may change in next version # fix bug in Paddle1.8.3 and may change in next version.
self.op_mapper.weights[in_nodes3[0].layer_name + self.op_mapper.weights[in_nodes3[0].layer_name +
'_1'] = weight.reshape(1, -1) '_1'] = weight.reshape(1, -1)
in_nodes3[0].fluid_code.layers[0].param_attr["shape"] = [ in_nodes3[0].fluid_code.layers[0].param_attr["shape"] = [
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册