Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
X2Paddle
提交
2b78942c
X
X2Paddle
项目概览
PaddlePaddle
/
X2Paddle
大约 1 年 前同步成功
通知
328
Star
698
Fork
167
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
26
列表
看板
标记
里程碑
合并请求
4
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
X2Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
26
Issue
26
列表
看板
标记
里程碑
合并请求
4
合并请求
4
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
2b78942c
编写于
4月 29, 2021
作者:
W
WJJ1995
提交者:
GitHub
4月 29, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add BatchToSpaceND and SpaceToBatchND op convert (#557)
* add BatchToSpaceND and SpaceToBatchND op convert * deal with comments
上级
64c41a03
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
438 addition
and
253 deletion
+438
-253
x2paddle/op_mapper/dygraph/tf2paddle/tf_op_mapper.py
x2paddle/op_mapper/dygraph/tf2paddle/tf_op_mapper.py
+221
-136
x2paddle/op_mapper/static/tf2paddle/tf_op_mapper.py
x2paddle/op_mapper/static/tf2paddle/tf_op_mapper.py
+217
-117
未找到文件。
x2paddle/op_mapper/dygraph/tf2paddle/tf_op_mapper.py
浏览文件 @
2b78942c
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
# limitations under the License.
# limitations under the License.
from
x2paddle.decoder.tf_decoder
import
TFGraph
,
TFGraphNode
from
x2paddle.decoder.tf_decoder
import
TFGraph
,
TFGraphNode
from
x2paddle.core.program
import
PaddleGraph
from
x2paddle.core.program
import
PaddleGraph
from
x2paddle.core.op_mapper
import
OpMapper
from
x2paddle.core.op_mapper
import
OpMapper
from
x2paddle.core.util
import
*
from
x2paddle.core.util
import
*
import
traceback
import
traceback
...
@@ -58,8 +58,7 @@ class TFOpMapper(OpMapper):
...
@@ -58,8 +58,7 @@ class TFOpMapper(OpMapper):
'swish_f32'
:
[
'paddle.nn.Swish'
],
'swish_f32'
:
[
'paddle.nn.Swish'
],
'Tanh'
:
[
'paddle.nn.Tanh'
],
'Tanh'
:
[
'paddle.nn.Tanh'
],
'Softplus'
:
[
'paddle.nn.Softplus'
],
'Softplus'
:
[
'paddle.nn.Softplus'
],
'LeakyRelu'
:
[
'paddle.nn.LeakyReLU'
,
'LeakyRelu'
:
[
'paddle.nn.LeakyReLU'
,
dict
(
alpha
=
'negative_slope'
)],
dict
(
alpha
=
'negative_slope'
)],
'Softmax'
:
[
'paddle.nn.Softmax'
],
'Softmax'
:
[
'paddle.nn.Softmax'
],
'Floor'
:
[
'paddle.floor'
],
'Floor'
:
[
'paddle.floor'
],
'Erf'
:
[
'paddle.erf'
],
'Erf'
:
[
'paddle.erf'
],
...
@@ -96,7 +95,8 @@ class TFOpMapper(OpMapper):
...
@@ -96,7 +95,8 @@ class TFOpMapper(OpMapper):
self
.
nn_name2id
=
dict
()
self
.
nn_name2id
=
dict
()
self
.
input_index
=
0
self
.
input_index
=
0
self
.
inputs_info
=
dict
()
self
.
inputs_info
=
dict
()
self
.
paddle_graph
=
PaddleGraph
(
parent_layer
=
None
,
graph_type
=
"dygraph"
,
source_type
=
"tf"
)
self
.
paddle_graph
=
PaddleGraph
(
parent_layer
=
None
,
graph_type
=
"dygraph"
,
source_type
=
"tf"
)
self
.
paddle_graph
.
outputs
=
self
.
graph
.
output_nodes
self
.
paddle_graph
.
outputs
=
self
.
graph
.
output_nodes
not_placeholder
=
list
()
not_placeholder
=
list
()
...
@@ -109,7 +109,7 @@ class TFOpMapper(OpMapper):
...
@@ -109,7 +109,7 @@ class TFOpMapper(OpMapper):
not_placeholder
.
append
(
name
)
not_placeholder
.
append
(
name
)
for
name
in
not_placeholder
:
for
name
in
not_placeholder
:
idx
=
self
.
graph
.
input_nodes
.
index
(
name
)
idx
=
self
.
graph
.
input_nodes
.
index
(
name
)
del
self
.
graph
.
input_nodes
[
idx
]
del
self
.
graph
.
input_nodes
[
idx
]
print
(
"Total nodes: {}"
.
format
(
print
(
"Total nodes: {}"
.
format
(
sum
([
sum
([
...
@@ -134,7 +134,7 @@ class TFOpMapper(OpMapper):
...
@@ -134,7 +134,7 @@ class TFOpMapper(OpMapper):
self
.
paddle_graph
.
set_name
(
self
.
graph
.
graph_name
)
self
.
paddle_graph
.
set_name
(
self
.
graph
.
graph_name
)
self
.
paddle_graph
.
set_parameters
(
self
.
params
)
self
.
paddle_graph
.
set_parameters
(
self
.
params
)
self
.
paddle_graph
.
set_inputs_info
(
self
.
inputs_info
)
self
.
paddle_graph
.
set_inputs_info
(
self
.
inputs_info
)
def
op_checker
(
self
):
def
op_checker
(
self
):
unsupported_ops
=
set
()
unsupported_ops
=
set
()
for
node_name
in
self
.
graph
.
topo_sort
:
for
node_name
in
self
.
graph
.
topo_sort
:
...
@@ -149,11 +149,11 @@ class TFOpMapper(OpMapper):
...
@@ -149,11 +149,11 @@ class TFOpMapper(OpMapper):
return
True
return
True
else
:
else
:
if
len
(
unsupported_ops
)
>
0
:
if
len
(
unsupported_ops
)
>
0
:
print
(
"
\n
========= {} OPs are not supported yet ==========="
.
format
(
print
(
"
\n
========= {} OPs are not supported yet ==========="
.
len
(
unsupported_ops
)))
format
(
len
(
unsupported_ops
)))
for
op
in
unsupported_ops
:
for
op
in
unsupported_ops
:
print
(
"========== {} ============"
.
format
(
op
))
print
(
"========== {} ============"
.
format
(
op
))
return
False
return
False
def
directly_map
(
self
,
node
):
def
directly_map
(
self
,
node
):
inputs
=
node
.
layer
.
input
inputs
=
node
.
layer
.
input
...
@@ -196,8 +196,11 @@ class TFOpMapper(OpMapper):
...
@@ -196,8 +196,11 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
x
.
name
,
inputs
=
{
"x"
:
x
.
name
,
"y"
:
y
.
name
},
"y"
:
y
.
name
},
outputs
=
[
node
.
name
])
outputs
=
[
node
.
name
])
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
def
bool_map
(
self
,
node
):
def
bool_map
(
self
,
node
):
op_type
=
self
.
bool_ops
[
node
.
layer_type
]
op_type
=
self
.
bool_ops
[
node
.
layer_type
]
self
.
elementwise_map
(
node
,
op_type
)
self
.
elementwise_map
(
node
,
op_type
)
...
@@ -208,7 +211,7 @@ class TFOpMapper(OpMapper):
...
@@ -208,7 +211,7 @@ class TFOpMapper(OpMapper):
assert
len
(
shape
)
!=
0
,
"Unknown shape of input nodes[{}]."
.
format
(
assert
len
(
shape
)
!=
0
,
"Unknown shape of input nodes[{}]."
.
format
(
node
.
layer_name
)
node
.
layer_name
)
dtype
=
node
.
dtype
dtype
=
node
.
dtype
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.to_tensor"
,
kernel
=
"paddle.to_tensor"
,
inputs
=
{},
inputs
=
{},
...
@@ -226,15 +229,15 @@ class TFOpMapper(OpMapper):
...
@@ -226,15 +229,15 @@ class TFOpMapper(OpMapper):
if
value
==
float
(
'inf'
):
if
value
==
float
(
'inf'
):
value
=
"float('inf')"
value
=
"float('inf')"
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.full"
,
"paddle.full"
,
inputs
=
{},
inputs
=
{},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
dtype
=
string
(
dtype
),
dtype
=
string
(
dtype
),
shape
=
[
1
],
shape
=
[
1
],
fill_value
=
value
)
fill_value
=
value
)
return
return
self
.
params
[
node
.
name
]
=
node
.
value
self
.
params
[
node
.
name
]
=
node
.
value
if
0
not
in
shape
:
if
0
not
in
shape
:
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"self.create_parameter"
,
"self.create_parameter"
,
...
@@ -244,28 +247,27 @@ class TFOpMapper(OpMapper):
...
@@ -244,28 +247,27 @@ class TFOpMapper(OpMapper):
attr
=
string
(
node
.
name
),
attr
=
string
(
node
.
name
),
dtype
=
string
(
dtype
),
dtype
=
string
(
dtype
),
default_initializer
=
"paddle.nn.initializer.Constant(value=0.0)"
)
default_initializer
=
"paddle.nn.initializer.Constant(value=0.0)"
)
def
Transpose
(
self
,
node
):
def
Transpose
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
perm
=
self
.
graph
.
get_input_node
(
node
,
1
)
perm
=
self
.
graph
.
get_input_node
(
node
,
1
)
if
perm
.
layer_type
==
"Const"
:
if
perm
.
layer_type
==
"Const"
:
perm
=
perm
.
value
.
tolist
()
perm
=
perm
.
value
.
tolist
()
else
:
else
:
perm
=
self
.
decoder
.
infer_tensor
(
perm
,
use_diff_inputs
=
False
).
tolist
()
perm
=
self
.
decoder
.
infer_tensor
(
perm
,
use_diff_inputs
=
False
).
tolist
()
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.transpose"
,
"paddle.transpose"
,
inputs
=
{
"x"
:
input
.
name
},
inputs
=
{
"x"
:
input
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
perm
=
perm
)
perm
=
perm
)
def
Where
(
self
,
node
):
def
Where
(
self
,
node
):
if
len
(
node
.
layer
.
input
)
==
1
:
if
len
(
node
.
layer
.
input
)
==
1
:
cond
=
self
.
graph
.
get_input_node
(
node
,
0
)
cond
=
self
.
graph
.
get_input_node
(
node
,
0
)
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.nonzero"
,
"paddle.nonzero"
,
inputs
=
{
"x"
:
cond
.
name
},
outputs
=
[
node
.
name
])
inputs
=
{
"x"
:
cond
.
name
},
outputs
=
[
node
.
name
])
else
:
else
:
cond
=
self
.
graph
.
get_input_node
(
node
,
0
)
cond
=
self
.
graph
.
get_input_node
(
node
,
0
)
x
=
self
.
graph
.
get_input_node
(
node
,
1
)
x
=
self
.
graph
.
get_input_node
(
node
,
1
)
...
@@ -276,10 +278,10 @@ class TFOpMapper(OpMapper):
...
@@ -276,10 +278,10 @@ class TFOpMapper(OpMapper):
"x"
:
x
.
name
,
"x"
:
x
.
name
,
"y"
:
y
.
name
},
"y"
:
y
.
name
},
outputs
=
[
node
.
name
])
outputs
=
[
node
.
name
])
def
Neg
(
self
,
node
):
def
Neg
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.scale"
,
"paddle.scale"
,
inputs
=
{
"x"
:
input
.
name
},
inputs
=
{
"x"
:
input
.
name
},
...
@@ -300,10 +302,7 @@ class TFOpMapper(OpMapper):
...
@@ -300,10 +302,7 @@ class TFOpMapper(OpMapper):
layer_attrs
[
"fill_value"
]
=
input_value
.
value
layer_attrs
[
"fill_value"
]
=
input_value
.
value
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.full"
,
"paddle.full"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
layer_attrs
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
layer_attrs
)
def
DepthToSpace
(
self
,
node
):
def
DepthToSpace
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
...
@@ -419,7 +418,8 @@ class TFOpMapper(OpMapper):
...
@@ -419,7 +418,8 @@ class TFOpMapper(OpMapper):
if
kernel
.
layer_type
==
'Const'
:
if
kernel
.
layer_type
==
'Const'
:
kernel_value
=
kernel
.
value
kernel_value
=
kernel
.
value
else
:
else
:
kernel_value
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
)
kernel_value
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
)
kernel_weight_name
=
op_name
+
".weight"
kernel_weight_name
=
op_name
+
".weight"
self
.
params
[
kernel_weight_name
]
=
numpy
.
transpose
(
kernel_value
,
self
.
params
[
kernel_weight_name
]
=
numpy
.
transpose
(
kernel_value
,
(
3
,
2
,
0
,
1
))
(
3
,
2
,
0
,
1
))
...
@@ -444,7 +444,6 @@ class TFOpMapper(OpMapper):
...
@@ -444,7 +444,6 @@ class TFOpMapper(OpMapper):
outputs
=
[
input_name
],
outputs
=
[
input_name
],
shape
=
[
0
,
k_size
[
2
],
0
,
0
])
shape
=
[
0
,
k_size
[
2
],
0
,
0
])
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.nn.Conv2D"
,
kernel
=
"paddle.nn.Conv2D"
,
inputs
=
{
"input"
:
input_name
},
inputs
=
{
"input"
:
input_name
},
...
@@ -464,7 +463,7 @@ class TFOpMapper(OpMapper):
...
@@ -464,7 +463,7 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
node
.
name
},
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
perm
=
[
0
,
2
,
3
,
1
])
perm
=
[
0
,
2
,
3
,
1
])
def
Conv3D
(
self
,
node
):
def
Conv3D
(
self
,
node
):
op_name
=
name_generator
(
"conv"
,
self
.
nn_name2id
)
op_name
=
name_generator
(
"conv"
,
self
.
nn_name2id
)
output_name
=
node
.
name
output_name
=
node
.
name
...
@@ -485,7 +484,8 @@ class TFOpMapper(OpMapper):
...
@@ -485,7 +484,8 @@ class TFOpMapper(OpMapper):
if
kernel
.
layer_type
==
'Const'
:
if
kernel
.
layer_type
==
'Const'
:
kernel_value
=
kernel
.
value
kernel_value
=
kernel
.
value
else
:
else
:
kernel_value
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
)
kernel_value
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
)
kernel_weight_name
=
op_name
+
".weight"
kernel_weight_name
=
op_name
+
".weight"
self
.
params
[
kernel_weight_name
]
=
numpy
.
transpose
(
kernel_value
,
self
.
params
[
kernel_weight_name
]
=
numpy
.
transpose
(
kernel_value
,
(
4
,
3
,
0
,
1
,
2
))
(
4
,
3
,
0
,
1
,
2
))
...
@@ -556,7 +556,7 @@ class TFOpMapper(OpMapper):
...
@@ -556,7 +556,7 @@ class TFOpMapper(OpMapper):
assert
moving_mean
.
layer_type
==
"Const"
assert
moving_mean
.
layer_type
==
"Const"
assert
moving_var
.
layer_type
==
"Const"
assert
moving_var
.
layer_type
==
"Const"
input_name
=
input
.
name
input_name
=
input
.
name
if
data_format
==
"NHWC"
:
if
data_format
==
"NHWC"
:
transpose_name
=
gen_name
(
"batch_norm"
,
"transpose"
)
transpose_name
=
gen_name
(
"batch_norm"
,
"transpose"
)
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
...
@@ -567,12 +567,16 @@ class TFOpMapper(OpMapper):
...
@@ -567,12 +567,16 @@ class TFOpMapper(OpMapper):
input_name
=
transpose_name
input_name
=
transpose_name
n
,
h
,
w
,
c
=
input
.
out_shapes
[
0
]
n
,
h
,
w
,
c
=
input
.
out_shapes
[
0
]
else
:
else
:
n
,
c
,
h
,
w
=
input
.
out_shapes
[
0
]
n
,
c
,
h
,
w
=
input
.
out_shapes
[
0
]
self
.
params
[
"{}_{}"
.
format
(
node
.
name
,
gamma
.
name
)]
=
self
.
params
[
gamma
.
name
]
self
.
params
[
"{}_{}"
.
format
(
node
.
name
,
gamma
.
name
)]
=
self
.
params
[
self
.
params
[
"{}_{}"
.
format
(
node
.
name
,
beta
.
name
)]
=
self
.
params
[
beta
.
name
]
gamma
.
name
]
self
.
params
[
"{}_{}"
.
format
(
node
.
name
,
moving_mean
.
name
)]
=
self
.
params
[
moving_mean
.
name
]
self
.
params
[
"{}_{}"
.
format
(
node
.
name
,
beta
.
name
)]
=
self
.
params
[
self
.
params
[
"{}_{}"
.
format
(
node
.
name
,
moving_var
.
name
)]
=
self
.
params
[
moving_var
.
name
]
beta
.
name
]
self
.
params
[
"{}_{}"
.
format
(
node
.
name
,
moving_mean
.
name
)]
=
self
.
params
[
moving_mean
.
name
]
self
.
params
[
"{}_{}"
.
format
(
node
.
name
,
moving_var
.
name
)]
=
self
.
params
[
moving_var
.
name
]
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.nn.BatchNorm"
,
kernel
=
"paddle.nn.BatchNorm"
,
inputs
=
{
"input"
:
input_name
},
inputs
=
{
"input"
:
input_name
},
...
@@ -581,8 +585,10 @@ class TFOpMapper(OpMapper):
...
@@ -581,8 +585,10 @@ class TFOpMapper(OpMapper):
epsilon
=
node
.
get_attr
(
"epsilon"
),
epsilon
=
node
.
get_attr
(
"epsilon"
),
param_attr
=
string
(
"{}_{}"
.
format
(
node
.
name
,
gamma
.
name
)),
param_attr
=
string
(
"{}_{}"
.
format
(
node
.
name
,
gamma
.
name
)),
bias_attr
=
string
(
"{}_{}"
.
format
(
node
.
name
,
beta
.
name
)),
bias_attr
=
string
(
"{}_{}"
.
format
(
node
.
name
,
beta
.
name
)),
moving_mean_name
=
string
(
"{}_{}"
.
format
(
node
.
name
,
moving_mean
.
name
)),
moving_mean_name
=
string
(
"{}_{}"
.
format
(
node
.
name
,
moving_variance_name
=
string
(
"{}_{}"
.
format
(
node
.
name
,
moving_var
.
name
)),
moving_mean
.
name
)),
moving_variance_name
=
string
(
"{}_{}"
.
format
(
node
.
name
,
moving_var
.
name
)),
is_test
=
True
)
is_test
=
True
)
if
data_format
==
"NHWC"
:
if
data_format
==
"NHWC"
:
...
@@ -591,7 +597,7 @@ class TFOpMapper(OpMapper):
...
@@ -591,7 +597,7 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
node
.
name
},
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
perm
=
[
0
,
2
,
3
,
1
])
perm
=
[
0
,
2
,
3
,
1
])
def
FusedBatchNormV3
(
self
,
node
):
def
FusedBatchNormV3
(
self
,
node
):
self
.
FusedBatchNorm
(
node
)
self
.
FusedBatchNorm
(
node
)
...
@@ -655,11 +661,10 @@ class TFOpMapper(OpMapper):
...
@@ -655,11 +661,10 @@ class TFOpMapper(OpMapper):
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
pad
=
paddings
,
pad
=
paddings
,
value
=
constant_values
)
value
=
constant_values
)
def
MirrorPad
(
self
,
node
):
def
MirrorPad
(
self
,
node
):
self
.
Pad
(
node
)
self
.
Pad
(
node
)
def
PadV2
(
self
,
node
):
def
PadV2
(
self
,
node
):
self
.
Pad
(
node
)
self
.
Pad
(
node
)
...
@@ -679,7 +684,7 @@ class TFOpMapper(OpMapper):
...
@@ -679,7 +684,7 @@ class TFOpMapper(OpMapper):
kernel
=
"paddle.shape"
,
kernel
=
"paddle.shape"
,
inputs
=
{
"input"
:
input_name
},
inputs
=
{
"input"
:
input_name
},
outputs
=
[
node
.
name
])
outputs
=
[
node
.
name
])
def
Size
(
self
,
node
):
def
Size
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input_name
=
input
.
name
input_name
=
input
.
name
...
@@ -688,15 +693,12 @@ class TFOpMapper(OpMapper):
...
@@ -688,15 +693,12 @@ class TFOpMapper(OpMapper):
inputs
=
{
"input"
:
input_name
},
inputs
=
{
"input"
:
input_name
},
outputs
=
[
node
.
name
])
outputs
=
[
node
.
name
])
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.prod"
,
kernel
=
"paddle.prod"
,
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
])
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
])
def
Ceil
(
self
,
node
):
def
Ceil
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.ceil"
,
kernel
=
"paddle.ceil"
,
inputs
=
{
"x"
:
input
.
name
},
inputs
=
{
"x"
:
input
.
name
},
outputs
=
[
node
.
name
])
outputs
=
[
node
.
name
])
def
ArgMax
(
self
,
node
):
def
ArgMax
(
self
,
node
):
...
@@ -709,7 +711,7 @@ class TFOpMapper(OpMapper):
...
@@ -709,7 +711,7 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
input
.
name
},
inputs
=
{
"x"
:
input
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
axis
=
axis
)
axis
=
axis
)
def
TopKV2
(
self
,
node
):
def
TopKV2
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
k
=
self
.
graph
.
get_input_node
(
node
,
1
)
k
=
self
.
graph
.
get_input_node
(
node
,
1
)
...
@@ -765,7 +767,6 @@ class TFOpMapper(OpMapper):
...
@@ -765,7 +767,6 @@ class TFOpMapper(OpMapper):
self
.
params
[
kernel_weight_name
]
=
numpy
.
transpose
(
kernel
.
value
,
self
.
params
[
kernel_weight_name
]
=
numpy
.
transpose
(
kernel
.
value
,
(
2
,
3
,
0
,
1
))
(
2
,
3
,
0
,
1
))
input_name
=
input
.
name
input_name
=
input
.
name
if
data_format
==
"NHWC"
:
if
data_format
==
"NHWC"
:
in_shape
=
[
in_shape
[
i
]
for
i
in
[
0
,
3
,
1
,
2
]]
in_shape
=
[
in_shape
[
i
]
for
i
in
[
0
,
3
,
1
,
2
]]
...
@@ -823,7 +824,7 @@ class TFOpMapper(OpMapper):
...
@@ -823,7 +824,7 @@ class TFOpMapper(OpMapper):
op_name
=
name_generator
(
"pool"
,
self
.
nn_name2id
)
op_name
=
name_generator
(
"pool"
,
self
.
nn_name2id
)
output_name
=
node
.
name
output_name
=
node
.
name
layer_outputs
=
[
op_name
,
output_name
]
layer_outputs
=
[
op_name
,
output_name
]
# TODO(syf): The op has diff.
# TODO(syf): The op has diff.
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.nn.AvgPool2D"
,
kernel
=
"paddle.nn.AvgPool2D"
,
...
@@ -833,15 +834,6 @@ class TFOpMapper(OpMapper):
...
@@ -833,15 +834,6 @@ class TFOpMapper(OpMapper):
stride
=
strides
[
2
:
4
],
stride
=
strides
[
2
:
4
],
padding
=
string
(
pad_mode
))
padding
=
string
(
pad_mode
))
# self.paddle_graph.add_layer(
# kernel="fluid.layers.pool2d",
# inputs={"input": input_name},
# outputs=[node.name],
# pool_size=k_size[2:4],
# pool_type=string("avg"),
# pool_stride=strides[2:4],
# pool_padding=string(pad_mode))
if
data_format
==
"NHWC"
:
if
data_format
==
"NHWC"
:
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.transpose"
,
kernel
=
"paddle.transpose"
,
...
@@ -884,7 +876,9 @@ class TFOpMapper(OpMapper):
...
@@ -884,7 +876,9 @@ class TFOpMapper(OpMapper):
axis
=
1
axis
=
1
else
:
else
:
raise
Exception
(
"Unexpected situation happend in Unpack OP"
)
raise
Exception
(
"Unexpected situation happend in Unpack OP"
)
layer_outputs
=
[
"{}_p{}"
.
format
(
node
.
layer_name
,
i
)
for
i
in
range
(
num
)]
layer_outputs
=
[
"{}_p{}"
.
format
(
node
.
layer_name
,
i
)
for
i
in
range
(
num
)
]
if
len
(
layer_outputs
)
==
1
:
if
len
(
layer_outputs
)
==
1
:
layer_outputs
[
0
]
=
"[{}]"
.
format
(
node
.
layer_name
)
layer_outputs
[
0
]
=
"[{}]"
.
format
(
node
.
layer_name
)
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
...
@@ -910,7 +904,7 @@ class TFOpMapper(OpMapper):
...
@@ -910,7 +904,7 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
input_names
},
inputs
=
{
"x"
:
input_names
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
axis
=
axis
)
axis
=
axis
)
def
Concat
(
self
,
node
):
def
Concat
(
self
,
node
):
inputs_list
=
list
()
inputs_list
=
list
()
for
i
in
range
(
1
,
len
(
node
.
inputs
)):
for
i
in
range
(
1
,
len
(
node
.
inputs
)):
...
@@ -920,14 +914,14 @@ class TFOpMapper(OpMapper):
...
@@ -920,14 +914,14 @@ class TFOpMapper(OpMapper):
axis
=
axis
.
value
axis
=
axis
.
value
if
axis
<
0
:
if
axis
<
0
:
axis
+=
len
(
inputs_list
[
0
].
out_shapes
[
0
])
axis
+=
len
(
inputs_list
[
0
].
out_shapes
[
0
])
input_names
=
[
i
.
name
for
i
in
inputs_list
]
input_names
=
[
i
.
name
for
i
in
inputs_list
]
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.concat"
,
kernel
=
"paddle.concat"
,
inputs
=
{
"x"
:
input_names
},
inputs
=
{
"x"
:
input_names
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
axis
=
axis
)
axis
=
axis
)
def
AddN
(
self
,
node
):
def
AddN
(
self
,
node
):
inputs_list
=
list
()
inputs_list
=
list
()
for
i
in
range
(
len
(
node
.
inputs
)
-
1
):
for
i
in
range
(
len
(
node
.
inputs
)
-
1
):
...
@@ -1005,7 +999,7 @@ class TFOpMapper(OpMapper):
...
@@ -1005,7 +999,7 @@ class TFOpMapper(OpMapper):
new_end
.
append
(
999999
)
new_end
.
append
(
999999
)
else
:
else
:
new_end
.
append
(
end
[
i
])
new_end
.
append
(
end
[
i
])
if
input
.
dtype
==
"bool"
:
if
input
.
dtype
==
"bool"
:
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.cast"
,
"paddle.cast"
,
...
@@ -1020,7 +1014,7 @@ class TFOpMapper(OpMapper):
...
@@ -1020,7 +1014,7 @@ class TFOpMapper(OpMapper):
axes
=
[
i
for
i
in
range
(
len
(
new_begin
))],
axes
=
[
i
for
i
in
range
(
len
(
new_begin
))],
starts
=
new_begin
,
starts
=
new_begin
,
ends
=
new_end
)
ends
=
new_end
)
if
input
.
dtype
==
"bool"
:
if
input
.
dtype
==
"bool"
:
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.cast"
,
"paddle.cast"
,
...
@@ -1043,7 +1037,7 @@ class TFOpMapper(OpMapper):
...
@@ -1043,7 +1037,7 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
node
.
name
},
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
axis
=
shrink_axes
)
axis
=
shrink_axes
)
def
Prod
(
self
,
node
):
def
Prod
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
reduction_indices
=
self
.
graph
.
get_input_node
(
node
,
1
)
reduction_indices
=
self
.
graph
.
get_input_node
(
node
,
1
)
...
@@ -1073,7 +1067,7 @@ class TFOpMapper(OpMapper):
...
@@ -1073,7 +1067,7 @@ class TFOpMapper(OpMapper):
],
],
num_or_sections
=
num_split
,
num_or_sections
=
num_split
,
axis
=
dim
)
axis
=
dim
)
def
SplitV
(
self
,
node
):
def
SplitV
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
size_splits
=
self
.
graph
.
get_input_node
(
node
,
1
)
size_splits
=
self
.
graph
.
get_input_node
(
node
,
1
)
...
@@ -1082,12 +1076,13 @@ class TFOpMapper(OpMapper):
...
@@ -1082,12 +1076,13 @@ class TFOpMapper(OpMapper):
dim
=
self
.
graph
.
get_input_node
(
node
,
2
)
dim
=
self
.
graph
.
get_input_node
(
node
,
2
)
assert
dim
.
layer_type
==
"Const"
,
"dim of SplitV OP should be Const"
assert
dim
.
layer_type
==
"Const"
,
"dim of SplitV OP should be Const"
dim
=
dim
.
value
dim
=
dim
.
value
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.split"
,
kernel
=
"paddle.split"
,
inputs
=
{
"x"
:
input
.
name
},
inputs
=
{
"x"
:
input
.
name
},
outputs
=
[
outputs
=
[
"{}_p{}"
.
format
(
node
.
layer_name
,
i
)
for
i
in
range
(
len
(
size_splits
))
"{}_p{}"
.
format
(
node
.
layer_name
,
i
)
for
i
in
range
(
len
(
size_splits
))
],
],
num_or_sections
=
size_splits
,
num_or_sections
=
size_splits
,
axis
=
dim
)
axis
=
dim
)
...
@@ -1103,7 +1098,8 @@ class TFOpMapper(OpMapper):
...
@@ -1103,7 +1098,8 @@ class TFOpMapper(OpMapper):
begin
=
begin
.
value
.
tolist
()
begin
=
begin
.
value
.
tolist
()
attrs
[
'offsets'
]
=
begin
attrs
[
'offsets'
]
=
begin
else
:
else
:
begin
=
self
.
decoder
.
infer_tensor
(
begin
,
use_diff_inputs
=
False
).
tolist
()
begin
=
self
.
decoder
.
infer_tensor
(
begin
,
use_diff_inputs
=
False
).
tolist
()
attrs
[
'offsets'
]
=
begin
attrs
[
'offsets'
]
=
begin
if
size
.
layer_type
==
"Const"
:
if
size
.
layer_type
==
"Const"
:
size
=
size
.
value
.
tolist
()
size
=
size
.
value
.
tolist
()
...
@@ -1118,19 +1114,18 @@ class TFOpMapper(OpMapper):
...
@@ -1118,19 +1114,18 @@ class TFOpMapper(OpMapper):
shape
=
shape
)
shape
=
shape
)
inputs
[
'shape'
]
=
reshape_name
inputs
[
'shape'
]
=
reshape_name
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.crop"
,
kernel
=
"paddle.crop"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attrs
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attrs
)
def
ResizeNearestNeighbor
(
self
,
node
):
def
ResizeNearestNeighbor
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
resize_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
resize_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
data_format
=
"NHWC"
data_format
=
"NHWC"
inputs
=
{
"x"
:
input
.
name
}
inputs
=
{
"x"
:
input
.
name
}
attrs
=
{
"align_corners"
:
node
.
get_attr
(
"align_corners"
),
attrs
=
{
"mode"
:
string
(
"nearest"
),
"align_corners"
:
node
.
get_attr
(
"align_corners"
),
"align_mode"
:
1
}
"mode"
:
string
(
"nearest"
),
"align_mode"
:
1
}
if
resize_shape
.
layer_type
==
"Const"
:
if
resize_shape
.
layer_type
==
"Const"
:
resize_shape
=
resize_shape
.
value
.
tolist
()
resize_shape
=
resize_shape
.
value
.
tolist
()
...
@@ -1166,15 +1161,17 @@ class TFOpMapper(OpMapper):
...
@@ -1166,15 +1161,17 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
node
.
name
},
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
perm
=
[
0
,
2
,
3
,
1
])
perm
=
[
0
,
2
,
3
,
1
])
def
ResizeBilinear
(
self
,
node
):
def
ResizeBilinear
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
resize_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
resize_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
data_format
=
"NHWC"
data_format
=
"NHWC"
inputs
=
{
"x"
:
input
.
name
}
inputs
=
{
"x"
:
input
.
name
}
attrs
=
{
"align_corners"
:
node
.
get_attr
(
"align_corners"
),
attrs
=
{
"mode"
:
string
(
"bilinear"
),
"align_corners"
:
node
.
get_attr
(
"align_corners"
),
"align_mode"
:
1
}
"mode"
:
string
(
"bilinear"
),
"align_mode"
:
1
}
if
resize_shape
.
layer_type
==
"Const"
:
if
resize_shape
.
layer_type
==
"Const"
:
resize_shape
=
resize_shape
.
value
.
tolist
()
resize_shape
=
resize_shape
.
value
.
tolist
()
...
@@ -1279,15 +1276,17 @@ class TFOpMapper(OpMapper):
...
@@ -1279,15 +1276,17 @@ class TFOpMapper(OpMapper):
if
out_shape
.
layer_type
==
"Const"
:
if
out_shape
.
layer_type
==
"Const"
:
out_shape
=
out_shape
.
value
.
tolist
()
out_shape
=
out_shape
.
value
.
tolist
()
else
:
else
:
out_shape
=
self
.
decoder
.
infer_tensor
(
out_shape
,
out_shape
=
self
.
decoder
.
infer_tensor
(
out_shape
=
node
.
out_shapes
[
0
])
out_shape
,
out_shape
=
node
.
out_shapes
[
0
])
in_shape
=
input
.
out_shapes
[
0
]
in_shape
=
input
.
out_shapes
[
0
]
if
in_shape
.
count
(
-
1
)
>
2
:
if
in_shape
.
count
(
-
1
)
>
2
:
in_shape
=
self
.
decoder
.
infer_tensor
(
input
,
use_diff_inputs
=
False
).
shape
in_shape
=
self
.
decoder
.
infer_tensor
(
input
,
use_diff_inputs
=
False
).
shape
k_size
=
kernel
.
out_shapes
[
0
]
k_size
=
kernel
.
out_shapes
[
0
]
if
k_size
.
count
(
-
1
)
>
2
:
if
k_size
.
count
(
-
1
)
>
2
:
k_size
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
).
shape
k_size
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
).
shape
pad_mode
=
node
.
get_attr
(
"padding"
).
decode
()
pad_mode
=
node
.
get_attr
(
"padding"
).
decode
()
strides
=
node
.
get_attr
(
"strides"
)
strides
=
node
.
get_attr
(
"strides"
)
...
@@ -1310,30 +1309,20 @@ class TFOpMapper(OpMapper):
...
@@ -1310,30 +1309,20 @@ class TFOpMapper(OpMapper):
perm
=
[
0
,
3
,
1
,
2
])
perm
=
[
0
,
3
,
1
,
2
])
input_name
=
transpose_name
input_name
=
transpose_name
# TODO(syf): The output_size is not set.
# self.paddle_graph.add_layer(
# kernel="paddle.nn.Conv2DTranspose",
# inputs={"input": input_name},
# outputs=layer_outputs,
# weight_attr=string(kernel_name),
# bias_attr=False,
# in_channels=k_size[3],
# out_channels=k_size[2],
# kernel_size=k_size[0:2],
# stride=strides[2:4],
# dilation=dilations[2:4],
# padding=string(pad_mode))
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"self.create_parameter"
,
"self.create_parameter"
,
inputs
=
{},
inputs
=
{},
outputs
=
[
"{}_{}"
.
format
(
node
.
name
,
kernel_name
).
replace
(
"."
,
"_"
)],
outputs
=
[
"{}_{}"
.
format
(
node
.
name
,
kernel_name
).
replace
(
"."
,
"_"
)],
shape
=
self
.
params
[
kernel_name
].
shape
,
shape
=
self
.
params
[
kernel_name
].
shape
,
attr
=
string
(
kernel_name
))
attr
=
string
(
kernel_name
))
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.nn.functional.conv2d_transpose"
,
kernel
=
"paddle.nn.functional.conv2d_transpose"
,
inputs
=
{
"x"
:
input_name
,
inputs
=
{
"weight"
:
"{}_{}"
.
format
(
node
.
name
,
kernel_name
).
replace
(
"."
,
"_"
)},
"x"
:
input_name
,
"weight"
:
"{}_{}"
.
format
(
node
.
name
,
kernel_name
).
replace
(
"."
,
"_"
)
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
bias
=
None
,
bias
=
None
,
stride
=
strides
[
2
:
4
],
stride
=
strides
[
2
:
4
],
...
@@ -1361,10 +1350,7 @@ class TFOpMapper(OpMapper):
...
@@ -1361,10 +1350,7 @@ class TFOpMapper(OpMapper):
inputs
[
"repeat_times"
]
=
repeat_times
.
name
inputs
[
"repeat_times"
]
=
repeat_times
.
name
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.tile"
,
kernel
=
"paddle.tile"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
def
Range
(
self
,
node
):
def
Range
(
self
,
node
):
start
=
self
.
graph
.
get_input_node
(
node
,
0
)
start
=
self
.
graph
.
get_input_node
(
node
,
0
)
...
@@ -1379,7 +1365,7 @@ class TFOpMapper(OpMapper):
...
@@ -1379,7 +1365,7 @@ class TFOpMapper(OpMapper):
if
start
.
layer_type
==
"Const"
:
if
start
.
layer_type
==
"Const"
:
attr
[
"start"
]
=
start
.
value
attr
[
"start"
]
=
start
.
value
else
:
else
:
inputs
[
"start"
]
=
start
.
name
inputs
[
"start"
]
=
start
.
name
if
limit
.
dtype
.
startswith
(
'float'
):
if
limit
.
dtype
.
startswith
(
'float'
):
dtype
=
limit
.
dtype
dtype
=
limit
.
dtype
...
@@ -1397,10 +1383,7 @@ class TFOpMapper(OpMapper):
...
@@ -1397,10 +1383,7 @@ class TFOpMapper(OpMapper):
attr
[
"dtype"
]
=
string
(
node
.
dtype
)
attr
[
"dtype"
]
=
string
(
node
.
dtype
)
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.arange"
,
kernel
=
"paddle.arange"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
def
SquaredDifference
(
self
,
node
):
def
SquaredDifference
(
self
,
node
):
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
...
@@ -1411,14 +1394,20 @@ class TFOpMapper(OpMapper):
...
@@ -1411,14 +1394,20 @@ class TFOpMapper(OpMapper):
# TODO(syf)
# TODO(syf)
layer_id
=
self
.
paddle_graph
.
add_layer
(
layer_id
=
self
.
paddle_graph
.
add_layer
(
"paddle.subtract"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
])
"paddle.subtract"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
])
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
inputs
=
{
"x"
:
node
.
name
,
"y"
:
node
.
name
}
inputs
=
{
"x"
:
node
.
name
,
"y"
:
node
.
name
}
x_shape
=
node
.
out_shapes
[
0
]
x_shape
=
node
.
out_shapes
[
0
]
y_shape
=
node
.
out_shapes
[
0
]
y_shape
=
node
.
out_shapes
[
0
]
layer_id
=
self
.
paddle_graph
.
add_layer
(
layer_id
=
self
.
paddle_graph
.
add_layer
(
"paddle.multiply"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
])
"paddle.multiply"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
])
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
def
OneHot
(
self
,
node
):
def
OneHot
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
...
@@ -1472,10 +1461,7 @@ class TFOpMapper(OpMapper):
...
@@ -1472,10 +1461,7 @@ class TFOpMapper(OpMapper):
outputs
=
[
input_name
],
outputs
=
[
input_name
],
dtype
=
string
(
"bool"
))
dtype
=
string
(
"bool"
))
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.all"
,
"paddle.all"
,
inputs
=
{
"x"
:
input_name
},
outputs
=
[
node
.
name
],
**
attr
)
inputs
=
{
"x"
:
input_name
},
outputs
=
[
node
.
name
],
**
attr
)
node
.
layer
.
attr
[
'dtype'
].
type
=
10
node
.
layer
.
attr
[
'dtype'
].
type
=
10
...
@@ -1496,10 +1482,7 @@ class TFOpMapper(OpMapper):
...
@@ -1496,10 +1482,7 @@ class TFOpMapper(OpMapper):
shape
=
[
-
1
])
shape
=
[
-
1
])
inputs
=
{
'x'
:
embeddings
.
name
,
'index'
:
index_name
}
inputs
=
{
'x'
:
embeddings
.
name
,
'index'
:
index_name
}
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.gather"
,
"paddle.gather"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
axis
=
axis
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
axis
=
axis
)
if
len
(
index
.
out_shapes
[
0
])
!=
1
:
if
len
(
index
.
out_shapes
[
0
])
!=
1
:
out_shape
=
node
.
out_shapes
[
0
]
out_shape
=
node
.
out_shapes
[
0
]
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
...
@@ -1507,15 +1490,13 @@ class TFOpMapper(OpMapper):
...
@@ -1507,15 +1490,13 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
node
.
name
},
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
shape
=
out_shape
)
shape
=
out_shape
)
def
GatherNd
(
self
,
node
):
def
GatherNd
(
self
,
node
):
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
index
=
self
.
graph
.
get_input_node
(
node
,
1
)
index
=
self
.
graph
.
get_input_node
(
node
,
1
)
inputs
=
{
'x'
:
x
.
name
,
'index'
:
index
.
name
}
inputs
=
{
'x'
:
x
.
name
,
'index'
:
index
.
name
}
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.gather_nd"
,
"paddle.gather_nd"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
])
inputs
=
inputs
,
outputs
=
[
node
.
name
])
def
ExpandDims
(
self
,
node
):
def
ExpandDims
(
self
,
node
):
x
=
self
.
graph
.
get_input_node
(
node
,
0
,
copy
=
True
)
x
=
self
.
graph
.
get_input_node
(
node
,
0
,
copy
=
True
)
...
@@ -1530,11 +1511,8 @@ class TFOpMapper(OpMapper):
...
@@ -1530,11 +1511,8 @@ class TFOpMapper(OpMapper):
else
:
else
:
inputs
[
'axis'
]
=
y
.
name
inputs
[
'axis'
]
=
y
.
name
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.unsqueeze"
,
"paddle.unsqueeze"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
def
ReverseV2
(
self
,
node
):
def
ReverseV2
(
self
,
node
):
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
axis
=
self
.
graph
.
get_input_node
(
node
,
1
)
axis
=
self
.
graph
.
get_input_node
(
node
,
1
)
...
@@ -1548,7 +1526,114 @@ class TFOpMapper(OpMapper):
...
@@ -1548,7 +1526,114 @@ class TFOpMapper(OpMapper):
else
:
else
:
inputs
[
'axis'
]
=
axis
.
name
inputs
[
'axis'
]
=
axis
.
name
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.flip"
,
"paddle.flip"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
inputs
=
inputs
,
def
BatchToSpaceND
(
self
,
node
):
'''
reshape->transpose->reshape->crop
'''
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
block_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
crops
=
self
.
graph
.
get_input_node
(
node
,
2
)
if
block_shape
.
layer_type
==
"Const"
:
block_shape
=
block_shape
.
value
.
tolist
()
if
crops
.
layer_type
==
"Const"
:
crops
=
crops
.
value
.
tolist
()
data_format
=
x
.
get_attr
(
"data_format"
).
decode
()
if
data_format
==
"NHWC"
:
n
,
h
,
w
,
c
=
x
.
out_shapes
[
0
]
else
:
n
,
c
,
h
,
w
=
x
.
out_shapes
[
0
]
input_name
=
x
.
name
#reshape
shape
=
block_shape
+
[
-
1
,
h
,
w
,
c
]
reshape_name
=
gen_name
(
"batch_to_space"
,
"reshape"
)
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.reshape"
,
inputs
=
{
"x"
:
input_name
},
outputs
=
[
reshape_name
],
shape
=
shape
)
#transpose
perm
=
[
len
(
block_shape
)]
+
list
(
j
for
i
in
range
(
len
(
block_shape
))
for
j
in
(
i
+
len
(
block_shape
)
+
1
,
i
))
+
\
list
(
i
+
2
*
len
(
block_shape
)
+
1
for
i
in
range
(
len
(
x
.
out_shapes
[
0
])
-
len
(
block_shape
)
-
1
))
transpose_name
=
gen_name
(
"batch_to_space"
,
"transpose"
)
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.transpose"
,
inputs
=
{
"x"
:
reshape_name
},
outputs
=
[
transpose_name
],
perm
=
perm
)
#reshape
shape
=
[
-
1
]
+
list
(
i
*
j
for
i
,
j
in
zip
(
block_shape
,
x
.
out_shapes
[
0
][
1
:]))
+
x
.
out_shapes
[
0
][
1
+
len
(
block_shape
):]
reshape_name
=
gen_name
(
"batch_to_space"
,
"reshape"
)
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.reshape"
,
inputs
=
{
"x"
:
transpose_name
},
outputs
=
[
reshape_name
],
shape
=
shape
)
#crop
attrs
=
{}
crop_shape
=
shape
crop_offsets
=
[
0
]
*
len
(
shape
)
for
i
in
range
(
len
(
crops
)):
crop_shape
[
i
+
1
]
=
crop_shape
[
i
+
1
]
-
crops
[
i
][
0
]
-
crops
[
i
][
1
]
crop_offsets
[
i
+
1
]
=
crops
[
i
][
0
]
attrs
[
'shape'
]
=
crop_shape
attrs
[
'offsets'
]
=
crop_offsets
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.crop"
,
inputs
=
{
"x"
:
reshape_name
},
outputs
=
[
node
.
name
],
**
attrs
)
def
SpaceToBatchND
(
self
,
node
):
'''
zero-pad->reshape->transpose->reshape
'''
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
block_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
paddings
=
self
.
graph
.
get_input_node
(
node
,
2
)
if
block_shape
.
layer_type
==
"Const"
:
block_shape
=
block_shape
.
value
.
tolist
()
if
paddings
.
layer_type
==
"Const"
:
paddings
=
paddings
.
value
.
flatten
().
tolist
()
input_name
=
x
.
name
#zero-pad
constant_values
=
0
pad_name
=
gen_name
(
"space_to_batch"
,
"pad"
)
paddings
=
[
0
,
0
]
+
paddings
+
[
0
,
0
]
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.nn.functional.pad"
,
inputs
=
{
"x"
:
input_name
},
outputs
=
[
pad_name
],
pad
=
paddings
,
value
=
constant_values
)
#reshape
n
,
h
,
w
,
c
=
x
.
out_shapes
[
0
]
h
=
h
+
paddings
[
2
]
+
paddings
[
3
]
w
=
w
+
paddings
[
4
]
+
paddings
[
5
]
shape
=
[
n
,
h
//
block_shape
[
0
],
block_shape
[
0
],
w
//
block_shape
[
1
],
block_shape
[
1
],
c
]
reshape_name
=
gen_name
(
"space_to_batch"
,
"reshape"
)
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.reshape"
,
inputs
=
{
"x"
:
pad_name
},
outputs
=
[
reshape_name
],
shape
=
shape
)
#transpose
transpose_name
=
gen_name
(
"space_to_batch"
,
"transpose"
)
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.transpose"
,
inputs
=
{
"x"
:
reshape_name
},
outputs
=
[
transpose_name
],
perm
=
[
2
,
4
,
0
,
1
,
3
,
5
])
#reshape
shape
=
[
-
1
,
h
//
block_shape
[
0
],
w
//
block_shape
[
1
],
c
]
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.reshape"
,
inputs
=
{
"x"
:
transpose_name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
**
attr
)
shape
=
shape
)
x2paddle/op_mapper/static/tf2paddle/tf_op_mapper.py
浏览文件 @
2b78942c
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
# limitations under the License.
# limitations under the License.
from
x2paddle.decoder.tf_decoder
import
TFGraph
,
TFGraphNode
from
x2paddle.decoder.tf_decoder
import
TFGraph
,
TFGraphNode
from
x2paddle.core.program
import
PaddleGraph
from
x2paddle.core.program
import
PaddleGraph
from
x2paddle.core.op_mapper
import
OpMapper
from
x2paddle.core.op_mapper
import
OpMapper
from
x2paddle.core.util
import
*
from
x2paddle.core.util
import
*
from
x2paddle
import
program
from
x2paddle
import
program
...
@@ -60,8 +60,8 @@ class TFOpMapper(OpMapper):
...
@@ -60,8 +60,8 @@ class TFOpMapper(OpMapper):
'swish_f32'
:
[
'paddle.nn.functional.swish'
],
'swish_f32'
:
[
'paddle.nn.functional.swish'
],
'Tanh'
:
[
'paddle.tanh'
],
'Tanh'
:
[
'paddle.tanh'
],
'Softplus'
:
[
'paddle.nn.functional.softplus'
],
'Softplus'
:
[
'paddle.nn.functional.softplus'
],
'LeakyRelu'
:
[
'paddle.nn.functional.leaky_relu'
,
'LeakyRelu'
:
dict
(
alpha
=
'negative_slope'
)],
[
'paddle.nn.functional.leaky_relu'
,
dict
(
alpha
=
'negative_slope'
)],
'Floor'
:
[
'paddle.floor'
],
'Floor'
:
[
'paddle.floor'
],
'Erf'
:
[
'paddle.erf'
],
'Erf'
:
[
'paddle.erf'
],
'Square'
:
[
'paddle.square'
]
'Square'
:
[
'paddle.square'
]
...
@@ -95,7 +95,8 @@ class TFOpMapper(OpMapper):
...
@@ -95,7 +95,8 @@ class TFOpMapper(OpMapper):
if
not
self
.
op_checker
():
if
not
self
.
op_checker
():
raise
Exception
(
"Model is not supported yet."
)
raise
Exception
(
"Model is not supported yet."
)
self
.
params
=
dict
()
self
.
params
=
dict
()
self
.
paddle_graph
=
PaddleGraph
(
parent_layer
=
None
,
graph_type
=
"static"
,
source_type
=
"tf"
)
self
.
paddle_graph
=
PaddleGraph
(
parent_layer
=
None
,
graph_type
=
"static"
,
source_type
=
"tf"
)
self
.
params_output2id
=
dict
()
self
.
params_output2id
=
dict
()
not_placeholder
=
list
()
not_placeholder
=
list
()
...
@@ -135,7 +136,7 @@ class TFOpMapper(OpMapper):
...
@@ -135,7 +136,7 @@ class TFOpMapper(OpMapper):
print
(
"
\n
Nodes converted."
)
print
(
"
\n
Nodes converted."
)
self
.
paddle_graph
.
set_name
(
self
.
graph
.
graph_name
)
self
.
paddle_graph
.
set_name
(
self
.
graph
.
graph_name
)
self
.
paddle_graph
.
set_parameters
(
self
.
params
)
self
.
paddle_graph
.
set_parameters
(
self
.
params
)
def
op_checker
(
self
):
def
op_checker
(
self
):
unsupported_ops
=
set
()
unsupported_ops
=
set
()
for
node_name
in
self
.
graph
.
topo_sort
:
for
node_name
in
self
.
graph
.
topo_sort
:
...
@@ -150,8 +151,8 @@ class TFOpMapper(OpMapper):
...
@@ -150,8 +151,8 @@ class TFOpMapper(OpMapper):
return
True
return
True
else
:
else
:
if
len
(
unsupported_ops
)
>
0
:
if
len
(
unsupported_ops
)
>
0
:
print
(
"
\n
========= {} OPs are not supported yet ==========="
.
format
(
print
(
"
\n
========= {} OPs are not supported yet ==========="
.
len
(
unsupported_ops
)))
format
(
len
(
unsupported_ops
)))
for
op
in
unsupported_ops
:
for
op
in
unsupported_ops
:
print
(
"========== {} ============"
.
format
(
op
))
print
(
"========== {} ============"
.
format
(
op
))
return
False
return
False
...
@@ -186,8 +187,11 @@ class TFOpMapper(OpMapper):
...
@@ -186,8 +187,11 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
x
.
name
,
inputs
=
{
"x"
:
x
.
name
,
"y"
:
y
.
name
},
"y"
:
y
.
name
},
outputs
=
[
node
.
name
])
outputs
=
[
node
.
name
])
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
def
bool_map
(
self
,
node
):
def
bool_map
(
self
,
node
):
op_type
=
self
.
bool_ops
[
node
.
layer_type
]
op_type
=
self
.
bool_ops
[
node
.
layer_type
]
self
.
elementwise_map
(
node
,
op_type
)
self
.
elementwise_map
(
node
,
op_type
)
...
@@ -241,7 +245,8 @@ class TFOpMapper(OpMapper):
...
@@ -241,7 +245,8 @@ class TFOpMapper(OpMapper):
if
perm
.
layer_type
==
"Const"
:
if
perm
.
layer_type
==
"Const"
:
perm
=
perm
.
value
.
tolist
()
perm
=
perm
.
value
.
tolist
()
else
:
else
:
perm
=
self
.
decoder
.
infer_tensor
(
perm
,
use_diff_inputs
=
False
).
tolist
()
perm
=
self
.
decoder
.
infer_tensor
(
perm
,
use_diff_inputs
=
False
).
tolist
()
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.transpose"
,
kernel
=
"paddle.transpose"
,
...
@@ -263,10 +268,7 @@ class TFOpMapper(OpMapper):
...
@@ -263,10 +268,7 @@ class TFOpMapper(OpMapper):
attr
[
"fill_value"
]
=
input_value
.
value
attr
[
"fill_value"
]
=
input_value
.
value
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.full"
,
"paddle.full"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
if
dims
.
layer_type
!=
"Const"
:
if
dims
.
layer_type
!=
"Const"
:
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.reshape"
,
"paddle.reshape"
,
...
@@ -328,14 +330,12 @@ class TFOpMapper(OpMapper):
...
@@ -328,14 +330,12 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
node
.
name
},
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
perm
=
[
0
,
2
,
3
,
1
])
perm
=
[
0
,
2
,
3
,
1
])
def
Where
(
self
,
node
):
def
Where
(
self
,
node
):
if
len
(
node
.
layer
.
input
)
==
1
:
if
len
(
node
.
layer
.
input
)
==
1
:
cond
=
self
.
graph
.
get_input_node
(
node
,
0
)
cond
=
self
.
graph
.
get_input_node
(
node
,
0
)
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.nonzero"
,
"paddle.nonzero"
,
inputs
=
{
"x"
:
cond
.
name
},
outputs
=
[
node
.
name
])
inputs
=
{
"x"
:
cond
.
name
},
outputs
=
[
node
.
name
])
else
:
else
:
cond
=
self
.
graph
.
get_input_node
(
node
,
0
)
cond
=
self
.
graph
.
get_input_node
(
node
,
0
)
x
=
self
.
graph
.
get_input_node
(
node
,
1
)
x
=
self
.
graph
.
get_input_node
(
node
,
1
)
...
@@ -346,10 +346,10 @@ class TFOpMapper(OpMapper):
...
@@ -346,10 +346,10 @@ class TFOpMapper(OpMapper):
"x"
:
x
.
name
,
"x"
:
x
.
name
,
"y"
:
y
.
name
},
"y"
:
y
.
name
},
outputs
=
[
node
.
name
])
outputs
=
[
node
.
name
])
def
Neg
(
self
,
node
):
def
Neg
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.scale"
,
"paddle.scale"
,
inputs
=
{
"x"
:
input
.
name
},
inputs
=
{
"x"
:
input
.
name
},
...
@@ -409,7 +409,8 @@ class TFOpMapper(OpMapper):
...
@@ -409,7 +409,8 @@ class TFOpMapper(OpMapper):
kernel_value
=
kernel
.
value
kernel_value
=
kernel
.
value
kernel_weight_name
=
kernel
.
name
.
replace
(
'/'
,
'_'
)
kernel_weight_name
=
kernel
.
name
.
replace
(
'/'
,
'_'
)
else
:
else
:
kernel_value
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
)
kernel_value
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
)
if
kernel
.
layer_type
==
'Split'
:
if
kernel
.
layer_type
==
'Split'
:
kernel_weight_name
=
"{}_{}_kernel"
.
format
(
node
.
name
,
kernel_weight_name
=
"{}_{}_kernel"
.
format
(
node
.
name
,
kernel
.
name
)
kernel
.
name
)
...
@@ -424,7 +425,7 @@ class TFOpMapper(OpMapper):
...
@@ -424,7 +425,7 @@ class TFOpMapper(OpMapper):
shape
=
self
.
params
[
kernel_weight_name
].
shape
,
shape
=
self
.
params
[
kernel_weight_name
].
shape
,
dtype
=
string
(
str
(
self
.
params
[
kernel_weight_name
].
dtype
)),
dtype
=
string
(
str
(
self
.
params
[
kernel_weight_name
].
dtype
)),
name
=
string
(
kernel_weight_name
))
name
=
string
(
kernel_weight_name
))
input_name
=
input
.
name
input_name
=
input
.
name
if
data_format
==
"NHWC"
:
if
data_format
==
"NHWC"
:
strides
=
[
strides
[
i
]
for
i
in
[
0
,
3
,
1
,
2
]]
strides
=
[
strides
[
i
]
for
i
in
[
0
,
3
,
1
,
2
]]
...
@@ -447,7 +448,8 @@ class TFOpMapper(OpMapper):
...
@@ -447,7 +448,8 @@ class TFOpMapper(OpMapper):
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.nn.functional.conv2d"
,
kernel
=
"paddle.nn.functional.conv2d"
,
inputs
=
{
"x"
:
input_name
,
"weight"
:
kernel_weight_name
},
inputs
=
{
"x"
:
input_name
,
"weight"
:
kernel_weight_name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
bias
=
None
,
bias
=
None
,
stride
=
strides
[
2
:
4
],
stride
=
strides
[
2
:
4
],
...
@@ -460,7 +462,7 @@ class TFOpMapper(OpMapper):
...
@@ -460,7 +462,7 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
node
.
name
},
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
perm
=
[
0
,
2
,
3
,
1
])
perm
=
[
0
,
2
,
3
,
1
])
def
Conv3D
(
self
,
node
):
def
Conv3D
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
kernel
=
self
.
graph
.
get_input_node
(
node
,
1
)
kernel
=
self
.
graph
.
get_input_node
(
node
,
1
)
...
@@ -479,7 +481,8 @@ class TFOpMapper(OpMapper):
...
@@ -479,7 +481,8 @@ class TFOpMapper(OpMapper):
kernel_value
=
kernel
.
value
kernel_value
=
kernel
.
value
kernel_weight_name
=
kernel
.
name
.
replace
(
'/'
,
'_'
)
kernel_weight_name
=
kernel
.
name
.
replace
(
'/'
,
'_'
)
else
:
else
:
kernel_value
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
)
kernel_value
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
)
if
kernel
.
layer_type
==
'Split'
:
if
kernel
.
layer_type
==
'Split'
:
kernel_weight_name
=
"{}_{}_kernel"
.
format
(
node
.
name
,
kernel_weight_name
=
"{}_{}_kernel"
.
format
(
node
.
name
,
kernel
.
name
)
kernel
.
name
)
...
@@ -494,7 +497,7 @@ class TFOpMapper(OpMapper):
...
@@ -494,7 +497,7 @@ class TFOpMapper(OpMapper):
shape
=
self
.
params
[
kernel_weight_name
].
shape
,
shape
=
self
.
params
[
kernel_weight_name
].
shape
,
dtype
=
string
(
str
(
self
.
params
[
kernel_weight_name
].
dtype
)),
dtype
=
string
(
str
(
self
.
params
[
kernel_weight_name
].
dtype
)),
name
=
string
(
kernel_weight_name
))
name
=
string
(
kernel_weight_name
))
input_name
=
input
.
name
input_name
=
input
.
name
if
data_format
==
"NDHWC"
:
if
data_format
==
"NDHWC"
:
strides
=
[
strides
[
i
]
for
i
in
[
0
,
4
,
1
,
2
,
3
]]
strides
=
[
strides
[
i
]
for
i
in
[
0
,
4
,
1
,
2
,
3
]]
...
@@ -513,11 +516,12 @@ class TFOpMapper(OpMapper):
...
@@ -513,11 +516,12 @@ class TFOpMapper(OpMapper):
kernel
=
"paddle.reshape"
,
kernel
=
"paddle.reshape"
,
inputs
=
{
"x"
:
input_name
},
inputs
=
{
"x"
:
input_name
},
outputs
=
[
input_name
],
outputs
=
[
input_name
],
shape
=
[
0
,
k_size
[
2
],
0
,
0
,
0
])
shape
=
[
0
,
k_size
[
2
],
0
,
0
,
0
])
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.nn.functional.conv3d"
,
kernel
=
"paddle.nn.functional.conv3d"
,
inputs
=
{
"x"
:
input_name
,
"weight"
:
kernel_weight_name
},
inputs
=
{
"x"
:
input_name
,
"weight"
:
kernel_weight_name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
bias
=
None
,
bias
=
None
,
stride
=
strides
[
2
:
5
],
stride
=
strides
[
2
:
5
],
...
@@ -565,11 +569,13 @@ class TFOpMapper(OpMapper):
...
@@ -565,11 +569,13 @@ class TFOpMapper(OpMapper):
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.nn.functional.batch_norm"
,
kernel
=
"paddle.nn.functional.batch_norm"
,
inputs
=
{
"x"
:
input_name
,
inputs
=
{
"running_mean"
:
moving_mean
.
name
,
"x"
:
input_name
,
"running_var"
:
moving_var
.
name
,
"running_mean"
:
moving_mean
.
name
,
"weight"
:
gamma
.
name
,
"running_var"
:
moving_var
.
name
,
"bias"
:
beta
.
name
},
"weight"
:
gamma
.
name
,
"bias"
:
beta
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
epsilon
=
node
.
get_attr
(
"epsilon"
))
epsilon
=
node
.
get_attr
(
"epsilon"
))
...
@@ -579,7 +585,7 @@ class TFOpMapper(OpMapper):
...
@@ -579,7 +585,7 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
node
.
name
},
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
perm
=
[
0
,
2
,
3
,
1
])
perm
=
[
0
,
2
,
3
,
1
])
def
FusedBatchNormV3
(
self
,
node
):
def
FusedBatchNormV3
(
self
,
node
):
self
.
FusedBatchNorm
(
node
)
self
.
FusedBatchNorm
(
node
)
...
@@ -643,11 +649,10 @@ class TFOpMapper(OpMapper):
...
@@ -643,11 +649,10 @@ class TFOpMapper(OpMapper):
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
pad
=
paddings
,
pad
=
paddings
,
value
=
constant_values
)
value
=
constant_values
)
def
MirrorPad
(
self
,
node
):
def
MirrorPad
(
self
,
node
):
self
.
Pad
(
node
)
self
.
Pad
(
node
)
def
PadV2
(
self
,
node
):
def
PadV2
(
self
,
node
):
self
.
Pad
(
node
)
self
.
Pad
(
node
)
...
@@ -676,15 +681,12 @@ class TFOpMapper(OpMapper):
...
@@ -676,15 +681,12 @@ class TFOpMapper(OpMapper):
inputs
=
{
"input"
:
input_name
},
inputs
=
{
"input"
:
input_name
},
outputs
=
[
node
.
name
])
outputs
=
[
node
.
name
])
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.prod"
,
kernel
=
"paddle.prod"
,
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
])
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
])
def
Ceil
(
self
,
node
):
def
Ceil
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.ceil"
,
kernel
=
"paddle.ceil"
,
inputs
=
{
"x"
:
input
.
name
},
inputs
=
{
"x"
:
input
.
name
},
outputs
=
[
node
.
name
])
outputs
=
[
node
.
name
])
def
ArgMax
(
self
,
node
):
def
ArgMax
(
self
,
node
):
...
@@ -697,7 +699,7 @@ class TFOpMapper(OpMapper):
...
@@ -697,7 +699,7 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
input
.
name
},
inputs
=
{
"x"
:
input
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
axis
=
axis
)
axis
=
axis
)
def
TopKV2
(
self
,
node
):
def
TopKV2
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
k
=
self
.
graph
.
get_input_node
(
node
,
1
)
k
=
self
.
graph
.
get_input_node
(
node
,
1
)
...
@@ -748,8 +750,8 @@ class TFOpMapper(OpMapper):
...
@@ -748,8 +750,8 @@ class TFOpMapper(OpMapper):
if
len
(
kernel
.
outputs
)
==
1
:
if
len
(
kernel
.
outputs
)
==
1
:
self
.
params
[
kernel
.
name
]
=
numpy
.
transpose
(
self
.
params
[
kernel
.
name
],
self
.
params
[
kernel
.
name
]
=
numpy
.
transpose
(
self
.
params
[
kernel
.
name
],
(
2
,
3
,
0
,
1
))
(
2
,
3
,
0
,
1
))
layer
=
self
.
paddle_graph
.
layers
[
self
.
params_output2id
[
kernel
.
name
]]
layer
=
self
.
paddle_graph
.
layers
[
self
.
params_output2id
[
kernel
.
name
]]
layer
.
attrs
[
"shape"
]
=
self
.
params
[
kernel
.
name
].
shape
layer
.
attrs
[
"shape"
]
=
self
.
params
[
kernel
.
name
].
shape
else
:
else
:
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
...
@@ -808,7 +810,7 @@ class TFOpMapper(OpMapper):
...
@@ -808,7 +810,7 @@ class TFOpMapper(OpMapper):
strides
=
[
strides
[
i
]
for
i
in
[
0
,
3
,
1
,
2
]]
strides
=
[
strides
[
i
]
for
i
in
[
0
,
3
,
1
,
2
]]
k_size
=
[
k_size
[
i
]
for
i
in
[
0
,
3
,
1
,
2
]]
k_size
=
[
k_size
[
i
]
for
i
in
[
0
,
3
,
1
,
2
]]
input_name
=
transpose_name
input_name
=
transpose_name
# TODO(syf): The op has diff.
# TODO(syf): The op has diff.
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
...
@@ -861,7 +863,9 @@ class TFOpMapper(OpMapper):
...
@@ -861,7 +863,9 @@ class TFOpMapper(OpMapper):
axis
=
1
axis
=
1
else
:
else
:
raise
Exception
(
"Unexpected situation happend in Unpack OP"
)
raise
Exception
(
"Unexpected situation happend in Unpack OP"
)
layer_outputs
=
[
"{}_p{}"
.
format
(
node
.
layer_name
,
i
)
for
i
in
range
(
num
)]
layer_outputs
=
[
"{}_p{}"
.
format
(
node
.
layer_name
,
i
)
for
i
in
range
(
num
)
]
if
len
(
layer_outputs
)
==
1
:
if
len
(
layer_outputs
)
==
1
:
layer_outputs
[
0
]
=
"[{}]"
.
format
(
node
.
layer_name
)
layer_outputs
[
0
]
=
"[{}]"
.
format
(
node
.
layer_name
)
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
...
@@ -887,7 +891,7 @@ class TFOpMapper(OpMapper):
...
@@ -887,7 +891,7 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
input_names
},
inputs
=
{
"x"
:
input_names
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
axis
=
axis
)
axis
=
axis
)
def
Concat
(
self
,
node
):
def
Concat
(
self
,
node
):
inputs_list
=
list
()
inputs_list
=
list
()
for
i
in
range
(
1
,
len
(
node
.
inputs
)):
for
i
in
range
(
1
,
len
(
node
.
inputs
)):
...
@@ -897,14 +901,14 @@ class TFOpMapper(OpMapper):
...
@@ -897,14 +901,14 @@ class TFOpMapper(OpMapper):
axis
=
axis
.
value
axis
=
axis
.
value
if
axis
<
0
:
if
axis
<
0
:
axis
+=
len
(
inputs_list
[
0
].
out_shapes
[
0
])
axis
+=
len
(
inputs_list
[
0
].
out_shapes
[
0
])
input_names
=
[
i
.
name
for
i
in
inputs_list
]
input_names
=
[
i
.
name
for
i
in
inputs_list
]
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.concat"
,
kernel
=
"paddle.concat"
,
inputs
=
{
"x"
:
input_names
},
inputs
=
{
"x"
:
input_names
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
axis
=
axis
)
axis
=
axis
)
def
AddN
(
self
,
node
):
def
AddN
(
self
,
node
):
inputs_list
=
list
()
inputs_list
=
list
()
for
i
in
range
(
len
(
node
.
inputs
)
-
1
):
for
i
in
range
(
len
(
node
.
inputs
)
-
1
):
...
@@ -982,7 +986,7 @@ class TFOpMapper(OpMapper):
...
@@ -982,7 +986,7 @@ class TFOpMapper(OpMapper):
new_end
.
append
(
999999
)
new_end
.
append
(
999999
)
else
:
else
:
new_end
.
append
(
end
[
i
])
new_end
.
append
(
end
[
i
])
if
input
.
dtype
==
"bool"
:
if
input
.
dtype
==
"bool"
:
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.cast"
,
"paddle.cast"
,
...
@@ -997,7 +1001,7 @@ class TFOpMapper(OpMapper):
...
@@ -997,7 +1001,7 @@ class TFOpMapper(OpMapper):
axes
=
[
i
for
i
in
range
(
len
(
new_begin
))],
axes
=
[
i
for
i
in
range
(
len
(
new_begin
))],
starts
=
new_begin
,
starts
=
new_begin
,
ends
=
new_end
)
ends
=
new_end
)
if
input
.
dtype
==
"bool"
:
if
input
.
dtype
==
"bool"
:
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.cast"
,
"paddle.cast"
,
...
@@ -1020,7 +1024,7 @@ class TFOpMapper(OpMapper):
...
@@ -1020,7 +1024,7 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
node
.
name
},
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
axis
=
shrink_axes
)
axis
=
shrink_axes
)
def
Prod
(
self
,
node
):
def
Prod
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
reduction_indices
=
self
.
graph
.
get_input_node
(
node
,
1
)
reduction_indices
=
self
.
graph
.
get_input_node
(
node
,
1
)
...
@@ -1050,7 +1054,7 @@ class TFOpMapper(OpMapper):
...
@@ -1050,7 +1054,7 @@ class TFOpMapper(OpMapper):
],
],
num_or_sections
=
num_split
,
num_or_sections
=
num_split
,
axis
=
dim
)
axis
=
dim
)
def
SplitV
(
self
,
node
):
def
SplitV
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
size_splits
=
self
.
graph
.
get_input_node
(
node
,
1
)
size_splits
=
self
.
graph
.
get_input_node
(
node
,
1
)
...
@@ -1059,12 +1063,13 @@ class TFOpMapper(OpMapper):
...
@@ -1059,12 +1063,13 @@ class TFOpMapper(OpMapper):
dim
=
self
.
graph
.
get_input_node
(
node
,
2
)
dim
=
self
.
graph
.
get_input_node
(
node
,
2
)
assert
dim
.
layer_type
==
"Const"
,
"dim of SplitV OP should be Const"
assert
dim
.
layer_type
==
"Const"
,
"dim of SplitV OP should be Const"
dim
=
dim
.
value
dim
=
dim
.
value
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.split"
,
kernel
=
"paddle.split"
,
inputs
=
{
"x"
:
input
.
name
},
inputs
=
{
"x"
:
input
.
name
},
outputs
=
[
outputs
=
[
"{}_p{}"
.
format
(
node
.
layer_name
,
i
)
for
i
in
range
(
len
(
size_splits
))
"{}_p{}"
.
format
(
node
.
layer_name
,
i
)
for
i
in
range
(
len
(
size_splits
))
],
],
num_or_sections
=
size_splits
,
num_or_sections
=
size_splits
,
axis
=
dim
)
axis
=
dim
)
...
@@ -1080,15 +1085,8 @@ class TFOpMapper(OpMapper):
...
@@ -1080,15 +1085,8 @@ class TFOpMapper(OpMapper):
begin
=
begin
.
value
.
tolist
()
begin
=
begin
.
value
.
tolist
()
attrs
[
'offsets'
]
=
begin
attrs
[
'offsets'
]
=
begin
else
:
else
:
# shape = begin.out_shapes[0]
begin
=
self
.
decoder
.
infer_tensor
(
# reshape_name = gen_name("slice", "reshape")
begin
,
use_diff_inputs
=
False
).
tolist
()
# self.paddle_graph.add_layer(
# kernel="fluid.layers.reshape",
# inputs={"x": begin.name},
# outputs=[reshape_name],
# shape=shape)
# inputs['offsets'] = reshape_name
begin
=
self
.
decoder
.
infer_tensor
(
begin
,
use_diff_inputs
=
False
).
tolist
()
attrs
[
'offsets'
]
=
begin
attrs
[
'offsets'
]
=
begin
if
size
.
layer_type
==
"Const"
:
if
size
.
layer_type
==
"Const"
:
size
=
size
.
value
.
tolist
()
size
=
size
.
value
.
tolist
()
...
@@ -1103,19 +1101,18 @@ class TFOpMapper(OpMapper):
...
@@ -1103,19 +1101,18 @@ class TFOpMapper(OpMapper):
shape
=
shape
)
shape
=
shape
)
inputs
[
'shape'
]
=
reshape_name
inputs
[
'shape'
]
=
reshape_name
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.crop"
,
kernel
=
"paddle.crop"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attrs
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attrs
)
def
ResizeNearestNeighbor
(
self
,
node
):
def
ResizeNearestNeighbor
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
resize_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
resize_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
data_format
=
"NHWC"
data_format
=
"NHWC"
inputs
=
{
"x"
:
input
.
name
}
inputs
=
{
"x"
:
input
.
name
}
attrs
=
{
"align_corners"
:
node
.
get_attr
(
"align_corners"
),
attrs
=
{
"mode"
:
string
(
"nearest"
),
"align_corners"
:
node
.
get_attr
(
"align_corners"
),
"align_mode"
:
1
}
"mode"
:
string
(
"nearest"
),
"align_mode"
:
1
}
if
resize_shape
.
layer_type
==
"Const"
:
if
resize_shape
.
layer_type
==
"Const"
:
resize_shape
=
resize_shape
.
value
.
tolist
()
resize_shape
=
resize_shape
.
value
.
tolist
()
...
@@ -1157,9 +1154,11 @@ class TFOpMapper(OpMapper):
...
@@ -1157,9 +1154,11 @@ class TFOpMapper(OpMapper):
resize_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
resize_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
data_format
=
"NHWC"
data_format
=
"NHWC"
inputs
=
{
"x"
:
input
.
name
}
inputs
=
{
"x"
:
input
.
name
}
attrs
=
{
"align_corners"
:
node
.
get_attr
(
"align_corners"
),
attrs
=
{
"mode"
:
string
(
"bilinear"
),
"align_corners"
:
node
.
get_attr
(
"align_corners"
),
"align_mode"
:
1
}
"mode"
:
string
(
"bilinear"
),
"align_mode"
:
1
}
if
resize_shape
.
layer_type
==
"Const"
:
if
resize_shape
.
layer_type
==
"Const"
:
resize_shape
=
resize_shape
.
value
.
tolist
()
resize_shape
=
resize_shape
.
value
.
tolist
()
...
@@ -1261,15 +1260,17 @@ class TFOpMapper(OpMapper):
...
@@ -1261,15 +1260,17 @@ class TFOpMapper(OpMapper):
if
out_shape
.
layer_type
==
"Const"
:
if
out_shape
.
layer_type
==
"Const"
:
out_shape
=
out_shape
.
value
.
tolist
()
out_shape
=
out_shape
.
value
.
tolist
()
else
:
else
:
out_shape
=
self
.
decoder
.
infer_tensor
(
out_shape
,
out_shape
=
self
.
decoder
.
infer_tensor
(
out_shape
=
node
.
out_shapes
[
0
])
out_shape
,
out_shape
=
node
.
out_shapes
[
0
])
in_shape
=
input
.
out_shapes
[
0
]
in_shape
=
input
.
out_shapes
[
0
]
if
in_shape
.
count
(
-
1
)
>
2
:
if
in_shape
.
count
(
-
1
)
>
2
:
in_shape
=
self
.
decoder
.
infer_tensor
(
input
,
use_diff_inputs
=
False
).
shape
in_shape
=
self
.
decoder
.
infer_tensor
(
input
,
use_diff_inputs
=
False
).
shape
k_size
=
kernel
.
out_shapes
[
0
]
k_size
=
kernel
.
out_shapes
[
0
]
if
k_size
.
count
(
-
1
)
>
2
:
if
k_size
.
count
(
-
1
)
>
2
:
k_size
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
).
shape
k_size
=
self
.
decoder
.
infer_tensor
(
kernel
,
use_diff_inputs
=
False
).
shape
pad_mode
=
node
.
get_attr
(
"padding"
).
decode
()
pad_mode
=
node
.
get_attr
(
"padding"
).
decode
()
strides
=
node
.
get_attr
(
"strides"
)
strides
=
node
.
get_attr
(
"strides"
)
...
@@ -1299,11 +1300,14 @@ class TFOpMapper(OpMapper):
...
@@ -1299,11 +1300,14 @@ class TFOpMapper(OpMapper):
dtype
=
string
(
str
(
self
.
params
[
kernel_name
].
dtype
)),
dtype
=
string
(
str
(
self
.
params
[
kernel_name
].
dtype
)),
shape
=
self
.
params
[
kernel_name
].
shape
,
shape
=
self
.
params
[
kernel_name
].
shape
,
name
=
string
(
kernel_name
))
name
=
string
(
kernel_name
))
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.nn.functional.conv2d_transpose"
,
kernel
=
"paddle.nn.functional.conv2d_transpose"
,
inputs
=
{
"x"
:
input_name
,
inputs
=
{
"weight"
:
"{}_{}"
.
format
(
node
.
name
,
kernel_name
).
replace
(
"."
,
"_"
)},
"x"
:
input_name
,
"weight"
:
"{}_{}"
.
format
(
node
.
name
,
kernel_name
).
replace
(
"."
,
"_"
)
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
bias
=
None
,
bias
=
None
,
stride
=
strides
[
2
:
4
],
stride
=
strides
[
2
:
4
],
...
@@ -1328,14 +1332,12 @@ class TFOpMapper(OpMapper):
...
@@ -1328,14 +1332,12 @@ class TFOpMapper(OpMapper):
attr
[
"repeat_times"
]
=
repeat_times
attr
[
"repeat_times"
]
=
repeat_times
else
:
else
:
inputs
[
"repeat_times"
]
=
repeat_times
.
name
inputs
[
"repeat_times"
]
=
repeat_times
.
name
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.tile"
,
kernel
=
"paddle.tile"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
if
not
isinstance
(
repeat_times
,
**
attr
)
list
)
and
repeat_times
.
layer_type
!=
"Const"
:
if
not
isinstance
(
repeat_times
,
list
)
and
repeat_times
.
layer_type
!=
"Const"
:
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.reshape"
,
kernel
=
"paddle.reshape"
,
inputs
=
{
"x"
:
node
.
name
},
inputs
=
{
"x"
:
node
.
name
},
...
@@ -1372,10 +1374,7 @@ class TFOpMapper(OpMapper):
...
@@ -1372,10 +1374,7 @@ class TFOpMapper(OpMapper):
attr
[
"dtype"
]
=
string
(
node
.
dtype
)
attr
[
"dtype"
]
=
string
(
node
.
dtype
)
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.arange"
,
kernel
=
"paddle.arange"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
if
start
.
layer_type
!=
"Const"
or
\
if
start
.
layer_type
!=
"Const"
or
\
limit
.
layer_type
!=
"Const"
or
\
limit
.
layer_type
!=
"Const"
or
\
delta
.
layer_type
!=
"Const"
:
delta
.
layer_type
!=
"Const"
:
...
@@ -1394,14 +1393,20 @@ class TFOpMapper(OpMapper):
...
@@ -1394,14 +1393,20 @@ class TFOpMapper(OpMapper):
# TODO(syf)
# TODO(syf)
layer_id
=
self
.
paddle_graph
.
add_layer
(
layer_id
=
self
.
paddle_graph
.
add_layer
(
"paddle.subtract"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
])
"paddle.subtract"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
])
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
inputs
=
{
"x"
:
node
.
name
,
"y"
:
node
.
name
}
inputs
=
{
"x"
:
node
.
name
,
"y"
:
node
.
name
}
x_shape
=
node
.
out_shapes
[
0
]
x_shape
=
node
.
out_shapes
[
0
]
y_shape
=
node
.
out_shapes
[
0
]
y_shape
=
node
.
out_shapes
[
0
]
layer_id
=
self
.
paddle_graph
.
add_layer
(
layer_id
=
self
.
paddle_graph
.
add_layer
(
"paddle.multiply"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
])
"paddle.multiply"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
])
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
self
.
paddle_graph
.
layers
[
layer_id
].
input_shapes
=
{
"x"
:
x_shape
,
"y"
:
y_shape
}
def
OneHot
(
self
,
node
):
def
OneHot
(
self
,
node
):
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
input
=
self
.
graph
.
get_input_node
(
node
,
0
)
...
@@ -1455,10 +1460,7 @@ class TFOpMapper(OpMapper):
...
@@ -1455,10 +1460,7 @@ class TFOpMapper(OpMapper):
outputs
=
[
input_name
],
outputs
=
[
input_name
],
dtype
=
string
(
"bool"
))
dtype
=
string
(
"bool"
))
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.all"
,
"paddle.all"
,
inputs
=
{
"x"
:
input_name
},
outputs
=
[
node
.
name
],
**
attr
)
inputs
=
{
"x"
:
input_name
},
outputs
=
[
node
.
name
],
**
attr
)
node
.
layer
.
attr
[
'dtype'
].
type
=
10
node
.
layer
.
attr
[
'dtype'
].
type
=
10
...
@@ -1479,10 +1481,7 @@ class TFOpMapper(OpMapper):
...
@@ -1479,10 +1481,7 @@ class TFOpMapper(OpMapper):
shape
=
[
-
1
])
shape
=
[
-
1
])
inputs
=
{
'x'
:
embeddings
.
name
,
'index'
:
index_name
}
inputs
=
{
'x'
:
embeddings
.
name
,
'index'
:
index_name
}
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.gather"
,
"paddle.gather"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
axis
=
axis
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
axis
=
axis
)
if
len
(
index
.
out_shapes
[
0
])
!=
1
:
if
len
(
index
.
out_shapes
[
0
])
!=
1
:
out_shape
=
node
.
out_shapes
[
0
]
out_shape
=
node
.
out_shapes
[
0
]
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
...
@@ -1490,15 +1489,13 @@ class TFOpMapper(OpMapper):
...
@@ -1490,15 +1489,13 @@ class TFOpMapper(OpMapper):
inputs
=
{
"x"
:
node
.
name
},
inputs
=
{
"x"
:
node
.
name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
shape
=
out_shape
)
shape
=
out_shape
)
def
GatherNd
(
self
,
node
):
def
GatherNd
(
self
,
node
):
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
index
=
self
.
graph
.
get_input_node
(
node
,
1
)
index
=
self
.
graph
.
get_input_node
(
node
,
1
)
inputs
=
{
'x'
:
x
.
name
,
'index'
:
index
.
name
}
inputs
=
{
'x'
:
x
.
name
,
'index'
:
index
.
name
}
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.gather_nd"
,
"paddle.gather_nd"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
])
inputs
=
inputs
,
outputs
=
[
node
.
name
])
def
ExpandDims
(
self
,
node
):
def
ExpandDims
(
self
,
node
):
x
=
self
.
graph
.
get_input_node
(
node
,
0
,
copy
=
True
)
x
=
self
.
graph
.
get_input_node
(
node
,
0
,
copy
=
True
)
...
@@ -1513,11 +1510,8 @@ class TFOpMapper(OpMapper):
...
@@ -1513,11 +1510,8 @@ class TFOpMapper(OpMapper):
else
:
else
:
inputs
[
'axis'
]
=
y
.
name
inputs
[
'axis'
]
=
y
.
name
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.unsqueeze"
,
"paddle.unsqueeze"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
def
ReverseV2
(
self
,
node
):
def
ReverseV2
(
self
,
node
):
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
axis
=
self
.
graph
.
get_input_node
(
node
,
1
)
axis
=
self
.
graph
.
get_input_node
(
node
,
1
)
...
@@ -1531,8 +1525,114 @@ class TFOpMapper(OpMapper):
...
@@ -1531,8 +1525,114 @@ class TFOpMapper(OpMapper):
else
:
else
:
inputs
[
'axis'
]
=
axis
.
name
inputs
[
'axis'
]
=
axis
.
name
self
.
paddle_graph
.
add_layer
(
self
.
paddle_graph
.
add_layer
(
"paddle.flip"
,
"paddle.flip"
,
inputs
=
inputs
,
outputs
=
[
node
.
name
],
**
attr
)
inputs
=
inputs
,
def
BatchToSpaceND
(
self
,
node
):
'''
reshape->transpose->reshape->crop
'''
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
block_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
crops
=
self
.
graph
.
get_input_node
(
node
,
2
)
if
block_shape
.
layer_type
==
"Const"
:
block_shape
=
block_shape
.
value
.
tolist
()
if
crops
.
layer_type
==
"Const"
:
crops
=
crops
.
value
.
tolist
()
data_format
=
x
.
get_attr
(
"data_format"
).
decode
()
if
data_format
==
"NHWC"
:
n
,
h
,
w
,
c
=
x
.
out_shapes
[
0
]
else
:
n
,
c
,
h
,
w
=
x
.
out_shapes
[
0
]
input_name
=
x
.
name
#reshape
shape
=
block_shape
+
[
-
1
,
h
,
w
,
c
]
reshape_name
=
gen_name
(
"batch_to_space"
,
"reshape"
)
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.reshape"
,
inputs
=
{
"x"
:
input_name
},
outputs
=
[
reshape_name
],
shape
=
shape
)
#transpose
perm
=
[
len
(
block_shape
)]
+
list
(
j
for
i
in
range
(
len
(
block_shape
))
for
j
in
(
i
+
len
(
block_shape
)
+
1
,
i
))
+
\
list
(
i
+
2
*
len
(
block_shape
)
+
1
for
i
in
range
(
len
(
x
.
out_shapes
[
0
])
-
len
(
block_shape
)
-
1
))
transpose_name
=
gen_name
(
"batch_to_space"
,
"transpose"
)
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.transpose"
,
inputs
=
{
"x"
:
reshape_name
},
outputs
=
[
transpose_name
],
perm
=
perm
)
#reshape
shape
=
[
-
1
]
+
list
(
i
*
j
for
i
,
j
in
zip
(
block_shape
,
x
.
out_shapes
[
0
][
1
:]))
+
x
.
out_shapes
[
0
][
1
+
len
(
block_shape
):]
reshape_name
=
gen_name
(
"batch_to_space"
,
"reshape"
)
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.reshape"
,
inputs
=
{
"x"
:
transpose_name
},
outputs
=
[
reshape_name
],
shape
=
shape
)
#crop
attrs
=
{}
crop_shape
=
shape
crop_offsets
=
[
0
]
*
len
(
shape
)
for
i
in
range
(
len
(
crops
)):
crop_shape
[
i
+
1
]
=
crop_shape
[
i
+
1
]
-
crops
[
i
][
0
]
-
crops
[
i
][
1
]
crop_offsets
[
i
+
1
]
=
crops
[
i
][
0
]
attrs
[
'shape'
]
=
crop_shape
attrs
[
'offsets'
]
=
crop_offsets
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.crop"
,
inputs
=
{
"x"
:
reshape_name
},
outputs
=
[
node
.
name
],
outputs
=
[
node
.
name
],
**
attr
)
**
attr
s
)
def
SpaceToBatchND
(
self
,
node
):
'''
zero-pad->reshape->transpose->reshape
'''
x
=
self
.
graph
.
get_input_node
(
node
,
0
)
block_shape
=
self
.
graph
.
get_input_node
(
node
,
1
)
paddings
=
self
.
graph
.
get_input_node
(
node
,
2
)
if
block_shape
.
layer_type
==
"Const"
:
block_shape
=
block_shape
.
value
.
tolist
()
if
paddings
.
layer_type
==
"Const"
:
paddings
=
paddings
.
value
.
flatten
().
tolist
()
input_name
=
x
.
name
#zero-pad
constant_values
=
0
pad_name
=
gen_name
(
"space_to_batch"
,
"pad"
)
paddings
=
[
0
,
0
]
+
paddings
+
[
0
,
0
]
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.nn.functional.pad"
,
inputs
=
{
"x"
:
input_name
},
outputs
=
[
pad_name
],
pad
=
paddings
,
value
=
constant_values
)
#reshape
n
,
h
,
w
,
c
=
x
.
out_shapes
[
0
]
h
=
h
+
paddings
[
2
]
+
paddings
[
3
]
w
=
w
+
paddings
[
4
]
+
paddings
[
5
]
shape
=
[
n
,
h
//
block_shape
[
0
],
block_shape
[
0
],
w
//
block_shape
[
1
],
block_shape
[
1
],
c
]
reshape_name
=
gen_name
(
"space_to_batch"
,
"reshape"
)
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.reshape"
,
inputs
=
{
"x"
:
pad_name
},
outputs
=
[
reshape_name
],
shape
=
shape
)
#transpose
transpose_name
=
gen_name
(
"space_to_batch"
,
"transpose"
)
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.transpose"
,
inputs
=
{
"x"
:
reshape_name
},
outputs
=
[
transpose_name
],
perm
=
[
2
,
4
,
0
,
1
,
3
,
5
])
#reshape
shape
=
[
-
1
,
h
//
block_shape
[
0
],
w
//
block_shape
[
1
],
c
]
self
.
paddle_graph
.
add_layer
(
kernel
=
"paddle.reshape"
,
inputs
=
{
"x"
:
transpose_name
},
outputs
=
[
node
.
name
],
shape
=
shape
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录