Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
X2Paddle
提交
9ab7285a
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看板
体验新版 GitCode,发现更多精彩内容 >>
You need to sign in or sign up before continuing.
提交
9ab7285a
编写于
7月 07, 2020
作者:
C
Channingss
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Paddle2ONNX] add swish op
上级
05bb5a0c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
40 addition
and
13 deletion
+40
-13
x2paddle/convert.py
x2paddle/convert.py
+3
-9
x2paddle/op_mapper/paddle_op_mapper.py
x2paddle/op_mapper/paddle_op_mapper.py
+37
-4
未找到文件。
x2paddle/convert.py
浏览文件 @
9ab7285a
...
@@ -75,12 +75,6 @@ def arg_parser():
...
@@ -75,12 +75,6 @@ def arg_parser():
action
=
"store_true"
,
action
=
"store_true"
,
default
=
False
,
default
=
False
,
help
=
"define input shape for tf model"
)
help
=
"define input shape for tf model"
)
parser
.
add_argument
(
"--onnx_opset"
,
"-oo"
,
type
=
int
,
default
=
10
,
help
=
"when paddle2onnx set onnx opset version to export"
)
parser
.
add_argument
(
parser
.
add_argument
(
"--params_merge"
,
"--params_merge"
,
"-pm"
,
"-pm"
,
...
@@ -192,12 +186,12 @@ def onnx2paddle(model_path, save_dir, params_merge=False):
...
@@ -192,12 +186,12 @@ def onnx2paddle(model_path, save_dir, params_merge=False):
print
(
"Paddle model and code generated."
)
print
(
"Paddle model and code generated."
)
def
paddle2onnx
(
model_path
,
save_dir
,
opset
):
def
paddle2onnx
(
model_path
,
save_dir
):
from
x2paddle.decoder.paddle_decoder
import
PaddleDecoder
from
x2paddle.decoder.paddle_decoder
import
PaddleDecoder
from
x2paddle.op_mapper.paddle_op_mapper
import
PaddleOpMapper
from
x2paddle.op_mapper.paddle_op_mapper
import
PaddleOpMapper
model
=
PaddleDecoder
(
model_path
,
'__model__'
,
'__params__'
)
model
=
PaddleDecoder
(
model_path
,
'__model__'
,
'__params__'
)
mapper
=
PaddleOpMapper
()
mapper
=
PaddleOpMapper
()
mapper
.
convert
(
model
.
program
,
save_dir
,
opset
)
mapper
.
convert
(
model
.
program
,
save_dir
)
def
main
():
def
main
():
...
@@ -264,7 +258,7 @@ def main():
...
@@ -264,7 +258,7 @@ def main():
elif
args
.
framework
==
"paddle2onnx"
:
elif
args
.
framework
==
"paddle2onnx"
:
assert
args
.
model
is
not
None
,
"--model should be defined while translating paddle model to onnx"
assert
args
.
model
is
not
None
,
"--model should be defined while translating paddle model to onnx"
paddle2onnx
(
args
.
model
,
args
.
save_dir
,
args
.
onnx_opset
)
paddle2onnx
(
args
.
model
,
args
.
save_dir
)
else
:
else
:
raise
Exception
(
raise
Exception
(
...
...
x2paddle/op_mapper/paddle_op_mapper.py
浏览文件 @
9ab7285a
...
@@ -37,7 +37,7 @@ class PaddleOpMapper(object):
...
@@ -37,7 +37,7 @@ class PaddleOpMapper(object):
self
.
name_counter
=
dict
()
self
.
name_counter
=
dict
()
def
convert
(
self
,
program
,
save_dir
,
opset
=
10
):
def
convert
(
self
,
program
,
save_dir
):
weight_nodes
=
self
.
convert_weights
(
program
)
weight_nodes
=
self
.
convert_weights
(
program
)
op_nodes
=
list
()
op_nodes
=
list
()
input_nodes
=
list
()
input_nodes
=
list
()
...
@@ -80,9 +80,7 @@ class PaddleOpMapper(object):
...
@@ -80,9 +80,7 @@ class PaddleOpMapper(object):
initializer
=
[],
initializer
=
[],
inputs
=
input_nodes
,
inputs
=
input_nodes
,
outputs
=
output_nodes
)
outputs
=
output_nodes
)
opset_imports
=
[
helper
.
make_opsetid
(
""
,
opset
)]
model
=
helper
.
make_model
(
graph
,
producer_name
=
'X2Paddle'
)
model
=
helper
.
make_model
(
graph
,
producer_name
=
'X2Paddle'
,
opset_imports
=
opset_imports
)
onnx
.
checker
.
check_model
(
model
)
onnx
.
checker
.
check_model
(
model
)
if
not
os
.
path
.
isdir
(
save_dir
):
if
not
os
.
path
.
isdir
(
save_dir
):
...
@@ -184,6 +182,41 @@ class PaddleOpMapper(object):
...
@@ -184,6 +182,41 @@ class PaddleOpMapper(object):
alpha
=
op
.
attr
(
'alpha'
))
alpha
=
op
.
attr
(
'alpha'
))
return
node
return
node
def
swish
(
self
,
op
,
block
):
"""
The activation swish, y = x / (1 + exp(-beta * x))
"""
beta
=
op
.
attr
(
'beta'
)
beta_name
=
self
.
get_name
(
op
.
type
,
'beta'
)
beta_node
=
onnx
.
helper
.
make_node
(
'Constant'
,
name
=
beta_name
,
inputs
=
[],
outputs
=
[
beta_name
],
value
=
onnx
.
helper
.
make_tensor
(
name
=
beta_name
,
data_type
=
onnx
.
TensorProto
.
FLOAT
,
dims
=
(),
vals
=
[
beta
]))
beta_x_name
=
self
.
get_name
(
op
.
type
,
'beta_x'
)
beta_x_node
=
onnx
.
helper
.
make_node
(
'Mul'
,
name
=
beta_x_name
,
inputs
=
[
op
.
input
(
'X'
)[
0
],
beta_name
],
outputs
=
[
beta_x_name
])
sigmoid_name
=
self
.
get_name
(
op
.
type
,
'sigmoid'
)
sigmoid_node
=
onnx
.
helper
.
make_node
(
'Sigmoid'
,
name
=
sigmoid_name
,
inputs
=
[
beta_x_name
],
outputs
=
[
sigmoid_name
])
swish_node
=
onnx
.
helper
.
make_node
(
'Mul'
,
inputs
=
[
op
.
input
(
'X'
)[
0
],
sigmoid_name
],
outputs
=
op
.
output
(
'Out'
))
return
[
beta_node
,
beta_x_node
,
sigmoid_node
,
swish_node
]
def
elementwise_add
(
self
,
op
,
block
):
def
elementwise_add
(
self
,
op
,
block
):
axis
=
op
.
attr
(
'axis'
)
axis
=
op
.
attr
(
'axis'
)
x_shape
=
block
.
var
(
op
.
input
(
'X'
)[
0
]).
shape
x_shape
=
block
.
var
(
op
.
input
(
'X'
)[
0
]).
shape
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录