Skip to content

X
X2Paddle

PaddlePaddle / X2Paddle
大约 1 年 前同步成功

通知 328
Star 698
Fork 167
X
X2Paddle
未验证 提交 379ce426 编写于 作者: W WJJ1995 提交者： GitHub
浏览文件
操作

Add solar_trace support (#642)

上级 efcd3d94
隐藏空白更改
内联 并排
Showing with 21 addition and 37 deletion
x2paddle/op_mapper/pytorch2paddle/aten.py
浏览文件 @ 379ce426
...@@ -988,8 +988,8 @@ def aten_constant_pad_nd(mapper, graph, node): ...@@ -988,8 +988,8 @@ def aten_constant_pad_nd(mapper, graph, node):
if inputs_name[1] in mapper.attrs: if inputs_name[1] in mapper.attrs:
layer_attrs["padding"] = mapper.attrs[inputs_name[1]] layer_attrs["padding"] = mapper.attrs[inputs_name[1]]
else: else:
mapper._check_input(graph, inputs_node[1], inputs_name[1], current_outputs, mapper._check_input(graph, inputs_node[1], inputs_name[1],
scope_name) current_outputs, scope_name)
layer_inputs["pad"] = inputs_name[1] layer_inputs["pad"] = inputs_name[1]
is_padding_tensor = True is_padding_tensor = True
# 获取当前节点输入的list # 获取当前节点输入的list
...@@ -1021,8 +1021,7 @@ def aten_constant_pad_nd(mapper, graph, node): ...@@ -1021,8 +1021,7 @@ def aten_constant_pad_nd(mapper, graph, node):
outputs=[inputs_name[0] + "_if", output_name], outputs=[inputs_name[0] + "_if", output_name],
scope_name=scope_name) scope_name=scope_name)
if_layer = graph.layers[list(graph.layers.keys())[-1]] if_layer = graph.layers[list(graph.layers.keys())[-1]]
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
block.add_layer( block.add_layer(
"prim.sub", "prim.sub",
inputs={"y": inputs_name[0] + "_len"}, inputs={"y": inputs_name[0] + "_len"},
...@@ -1054,8 +1053,7 @@ def aten_constant_pad_nd(mapper, graph, node): ...@@ -1054,8 +1053,7 @@ def aten_constant_pad_nd(mapper, graph, node):
outputs=[output_name], outputs=[output_name],
scope_name=scope_name) scope_name=scope_name)
if_layer.add_block(block) if_layer.add_block(block)
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
layer_inputs["input"] = inputs_name[0] layer_inputs["input"] = inputs_name[0]
block.add_layer( block.add_layer(
kernel, kernel,
...@@ -1860,11 +1858,10 @@ def aten_expand_as(mapper, graph, node): ...@@ -1860,11 +1858,10 @@ def aten_expand_as(mapper, graph, node):
y=paddle_dtypes.t_bool) y=paddle_dtypes.t_bool)
graph.add_layer( graph.add_layer(
"prim.if", {'input': inputs_name[0] + "_cond"}, "prim.if", {'input': inputs_name[0] + "_cond"},
outputs=[inputs_name[0] + "_if1"], outputs=[inputs_name[0] + "_if1", inputs_name[0]],
scope_name=scope_name) scope_name=scope_name)
if_layer = graph.layers[list(graph.layers.keys())[-1]] if_layer = graph.layers[list(graph.layers.keys())[-1]]
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
block.add_layer( block.add_layer(
"prim.type", "prim.type",
inputs={"input": inputs_name[1]}, inputs={"input": inputs_name[1]},
...@@ -1877,8 +1874,7 @@ def aten_expand_as(mapper, graph, node): ...@@ -1877,8 +1874,7 @@ def aten_expand_as(mapper, graph, node):
scope_name=scope_name, scope_name=scope_name,
dtype=inputs_name[1] + "_type") dtype=inputs_name[1] + "_type")
if_layer.add_block(block) if_layer.add_block(block)
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
if_layer.add_block(block) if_layer.add_block(block)
if_layer.inputs["input-0"] = inputs_name[0] if_layer.inputs["input-0"] = inputs_name[0]
if_layer.inputs["input-1"] = inputs_name[1] if_layer.inputs["input-1"] = inputs_name[1]
...@@ -1889,11 +1885,10 @@ def aten_expand_as(mapper, graph, node): ...@@ -1889,11 +1885,10 @@ def aten_expand_as(mapper, graph, node):
scope_name=scope_name) scope_name=scope_name)
graph.add_layer( graph.add_layer(
"prim.if", {'input': inputs_name[0] + "_cond"}, "prim.if", {'input': inputs_name[0] + "_cond"},
outputs=[inputs_name[0] + "_if2"], outputs=[inputs_name[0] + "_if2", output_name],
scope_name=scope_name) scope_name=scope_name)
if_layer = graph.layers[list(graph.layers.keys())[-1]] if_layer = graph.layers[list(graph.layers.keys())[-1]]
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
block.add_layer( block.add_layer(
"paddle.cast", "paddle.cast",
inputs={"x": layer_outputs[0]}, inputs={"x": layer_outputs[0]},
...@@ -1901,8 +1896,7 @@ def aten_expand_as(mapper, graph, node): ...@@ -1901,8 +1896,7 @@ def aten_expand_as(mapper, graph, node):
scope_name=scope_name, scope_name=scope_name,
dtype=string("bool")) dtype=string("bool"))
if_layer.add_block(block) if_layer.add_block(block)
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
if_layer.add_block(block) if_layer.add_block(block)
if_layer.inputs["input-0"] = layer_outputs[0] if_layer.inputs["input-0"] = layer_outputs[0]
# TODO(syf): check expand_as # TODO(syf): check expand_as
...@@ -2104,16 +2098,14 @@ def aten_floor(mapper, graph, node): ...@@ -2104,16 +2098,14 @@ def aten_floor(mapper, graph, node):
outputs=[inputs_name[0] + "_if"], outputs=[inputs_name[0] + "_if"],
scope_name=scope_name) scope_name=scope_name)
if_layer = graph.layers[list(graph.layers.keys())[-1]] if_layer = graph.layers[list(graph.layers.keys())[-1]]
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
block.add_layer( block.add_layer(
"paddle.floor", "paddle.floor",
inputs=copy.deepcopy(layer_inputs), inputs=copy.deepcopy(layer_inputs),
outputs=copy.deepcopy(layer_outputs), outputs=copy.deepcopy(layer_outputs),
scope_name=scope_name) scope_name=scope_name)
if_layer.add_block(block) if_layer.add_block(block)
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
block.add_layer( block.add_layer(
"prim.floor", "prim.floor",
inputs=copy.deepcopy(layer_inputs), inputs=copy.deepcopy(layer_inputs),
...@@ -3210,16 +3202,14 @@ def aten_masked_fill_(mapper, graph, node): ...@@ -3210,16 +3202,14 @@ def aten_masked_fill_(mapper, graph, node):
outputs=[inputs_name[2] + "_if"], outputs=[inputs_name[2] + "_if"],
scope_name=scope_name) scope_name=scope_name)
if_layer = graph.layers[list(graph.layers.keys())[-1]] if_layer = graph.layers[list(graph.layers.keys())[-1]]
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
block.add_layer( block.add_layer(
"prim.equal", "prim.equal",
inputs={"input": inputs_name[1] + "_mask"}, inputs={"input": inputs_name[1] + "_mask"},
outputs=[inputs_name[2] + "_1"], outputs=[inputs_name[2] + "_1"],
scope_name=scope_name) scope_name=scope_name)
if_layer.add_block(block) if_layer.add_block(block)
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
block.add_layer( block.add_layer(
"prim.mul", "prim.mul",
inputs={"x": inputs_name[1] + "_mask", inputs={"x": inputs_name[1] + "_mask",
...@@ -3322,16 +3312,14 @@ def aten_masked_fill(mapper, graph, node): ...@@ -3322,16 +3312,14 @@ def aten_masked_fill(mapper, graph, node):
outputs=[inputs_name[2] + "_if"], outputs=[inputs_name[2] + "_if"],
scope_name=scope_name) scope_name=scope_name)
if_layer = graph.layers[list(graph.layers.keys())[-1]] if_layer = graph.layers[list(graph.layers.keys())[-1]]
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
block.add_layer( block.add_layer(
"prim.equal", "prim.equal",
inputs={"input": inputs_name[1] + "_mask"}, inputs={"input": inputs_name[1] + "_mask"},
outputs=[inputs_name[2] + "_1"], outputs=[inputs_name[2] + "_1"],
scope_name=scope_name) scope_name=scope_name)
if_layer.add_block(block) if_layer.add_block(block)
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
block.add_layer( block.add_layer(
"prim.mul", "prim.mul",
inputs={"x": inputs_name[1] + "_mask", inputs={"x": inputs_name[1] + "_mask",
...@@ -4234,7 +4222,7 @@ def aten_remainder(mapper, graph, node): ...@@ -4234,7 +4222,7 @@ def aten_remainder(mapper, graph, node):
layer_inputs["y"] = inputs_name[1] layer_inputs["y"] = inputs_name[1]
# 获取当前节点输入、输出的list # 获取当前节点输入、输出的list
current_inputs = list(layer_inputs.values()) current_inputs = list(layer_inputs.values())
graph.add_layer( graph.add_layer(
"prim.remainder", "prim.remainder",
inputs=layer_inputs, inputs=layer_inputs,
...@@ -5436,16 +5424,14 @@ def aten_upsample_bilinear2d(mapper, graph, node): ...@@ -5436,16 +5424,14 @@ def aten_upsample_bilinear2d(mapper, graph, node):
outputs=[inputs_name[0] + "_if1"], outputs=[inputs_name[0] + "_if1"],
scope_name=scope_name) scope_name=scope_name)
if_layer = graph.layers[list(graph.layers.keys())[-1]] if_layer = graph.layers[list(graph.layers.keys())[-1]]
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
block.add_layer( block.add_layer(
"prim.var2list", "prim.var2list",
inputs={"input": inputs_name[1]}, inputs={"input": inputs_name[1]},
outputs=[inputs_name[1]], outputs=[inputs_name[1]],
scope_name=scope_name) scope_name=scope_name)
if_layer.add_block(block) if_layer.add_block(block)
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
if_layer.add_block(block) if_layer.add_block(block)
if_layer.inputs["input-0"] = inputs_name[1] if_layer.inputs["input-0"] = inputs_name[1]
# 处理输入2，即%5421 # 处理输入2，即%5421
...@@ -5516,16 +5502,14 @@ def aten_upsample_nearest2d(mapper, graph, node): ...@@ -5516,16 +5502,14 @@ def aten_upsample_nearest2d(mapper, graph, node):
outputs=[inputs_name[0] + "_if1"], outputs=[inputs_name[0] + "_if1"],
scope_name=scope_name) scope_name=scope_name)
if_layer = graph.layers[list(graph.layers.keys())[-1]] if_layer = graph.layers[list(graph.layers.keys())[-1]]
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
block.add_layer( block.add_layer(
"prim.var2list", "prim.var2list",
inputs={"input": inputs_name[1]}, inputs={"input": inputs_name[1]},
outputs=[inputs_name[1]], outputs=[inputs_name[1]],
scope_name=scope_name) scope_name=scope_name)
if_layer.add_block(block) if_layer.add_block(block)
block = PaddleGraph( block = PaddleGraph(source_type="pytorch", parent_layer=if_layer)
source_type="pytorch", parent_layer=if_layer)
if_layer.add_block(block) if_layer.add_block(block)
if_layer.inputs["input-0"] = inputs_name[1] if_layer.inputs["input-0"] = inputs_name[1]
if "size" in layer_attrs and layer_attrs["size"] is None: if "size" in layer_attrs and layer_attrs["size"] is None:
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或