Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleSlim
提交
dc0ca8ec
P
PaddleSlim
项目概览
PaddlePaddle
/
PaddleSlim
1 年多 前同步成功
通知
51
Star
1434
Fork
344
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
53
列表
看板
标记
里程碑
合并请求
16
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleSlim
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
53
Issue
53
列表
看板
标记
里程碑
合并请求
16
合并请求
16
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
dc0ca8ec
编写于
8月 19, 2022
作者:
G
Guanghua Yu
提交者:
GitHub
8月 19, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix x2paddle import (#1364)
上级
6d490cc4
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
16 deletion
+15
-16
paddleslim/common/load_model.py
paddleslim/common/load_model.py
+15
-16
未找到文件。
paddleslim/common/load_model.py
浏览文件 @
dc0ca8ec
...
...
@@ -115,24 +115,14 @@ def load_onnx_model(model_path, disable_feedback=False):
return
val_program
,
feed_target_names
,
fetch_targets
else
:
# onnx to paddle inference model.
assert
os
.
path
.
exists
(
model_path
),
'Not found `{}`, please check model path.'
.
format
(
model_path
)
try
:
pkg
.
require
(
'x2paddle'
)
except
:
from
pip._internal
import
main
main
([
'install'
,
'x2paddle'
])
try
:
from
x2paddle.decoder.onnx_decoder
import
ONNXDecoder
from
x2paddle.op_mapper.onnx2paddle.onnx_op_mapper
import
ONNXOpMapper
from
x2paddle.optimizer.optimizer
import
GraphOptimizer
from
x2paddle.utils
import
ConverterCheck
except
:
_logger
.
error
(
"x2paddle is not installed, please use
\"
pip install x2paddle
\"
."
)
time_info
=
int
(
time
.
time
())
if
not
disable_feedback
:
ConverterCheck
(
task
=
"ONNX"
,
time_info
=
time_info
,
convert_state
=
"Start"
).
start
()
# check onnx installation and version
try
:
pkg
.
require
(
'onnx'
)
...
...
@@ -147,6 +137,14 @@ def load_onnx_model(model_path, disable_feedback=False):
from
pip._internal
import
main
main
([
'install'
,
'onnx==1.12.0'
])
from
x2paddle.decoder.onnx_decoder
import
ONNXDecoder
from
x2paddle.op_mapper.onnx2paddle.onnx_op_mapper
import
ONNXOpMapper
from
x2paddle.optimizer.optimizer
import
GraphOptimizer
from
x2paddle.utils
import
ConverterCheck
time_info
=
int
(
time
.
time
())
if
not
disable_feedback
:
ConverterCheck
(
task
=
"ONNX"
,
time_info
=
time_info
,
convert_state
=
"Start"
).
start
()
# support distributed convert model
model_idx
=
paddle
.
distributed
.
get_rank
(
)
if
paddle
.
distributed
.
get_world_size
()
>
1
else
0
...
...
@@ -166,9 +164,10 @@ def load_onnx_model(model_path, disable_feedback=False):
ConverterCheck
(
task
=
"ONNX"
,
time_info
=
time_info
,
convert_state
=
"Success"
).
start
()
except
:
_logger
.
info
(
"[ERROR] x2paddle threw an exception, you can ask for help at: https://github.com/PaddlePaddle/X2Paddle/issues"
except
Exception
as
e
:
_logger
.
warning
(
e
)
_logger
.
error
(
"x2paddle threw an exception, you can ask for help at: https://github.com/PaddlePaddle/X2Paddle/issues"
)
sys
.
exit
(
1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录