Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
X2Paddle
提交
259c603e
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看板
提交
259c603e
编写于
10月 22, 2019
作者:
J
jiangjiajun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix code
上级
79911873
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
21 addition
and
17 deletion
+21
-17
x2paddle/convert.py
x2paddle/convert.py
+21
-17
未找到文件。
x2paddle/convert.py
浏览文件 @
259c603e
...
@@ -102,8 +102,8 @@ def tf2paddle(model_path,
...
@@ -102,8 +102,8 @@ def tf2paddle(model_path,
optimizer
=
TFOptimizer
(
mapper
)
optimizer
=
TFOptimizer
(
mapper
)
optimizer
.
delete_redundance_code
()
optimizer
.
delete_redundance_code
()
optimizer
.
strip_graph
()
optimizer
.
strip_graph
()
# optimizer.merge_activation()
# optimizer.merge_activation()
# optimizer.merge_bias()
# optimizer.merge_bias()
mapper
.
save_inference_model
(
save_dir
)
mapper
.
save_inference_model
(
save_dir
)
...
@@ -172,8 +172,13 @@ def main():
...
@@ -172,8 +172,13 @@ def main():
try
:
try
:
import
paddle
import
paddle
v0
,
v1
,
v2
=
paddle
.
__version__
.
split
(
'.'
)
v0
,
v1
,
v2
=
paddle
.
__version__
.
split
(
'.'
)
if
v0
==
0
and
v1
==
0
and
v2
==
0
:
if
int
(
v0
)
==
0
and
int
(
v1
)
==
0
and
int
(
v2
)
==
0
:
print
(
"You have installed paddlepaddle-dev? We're not sure it's working for x2paddle!"
print
(
"You have installed paddlepaddle-dev? We're not sure it's working for x2paddle!"
)
print
(
"==================paddlepaddle>=1.6.1 is strongly recommended================="
)
elif
int
(
v0
)
!=
1
or
int
(
v1
)
<
6
:
elif
int
(
v0
)
!=
1
or
int
(
v1
)
<
6
:
print
(
"paddlepaddle>=1.6.1 is required"
)
print
(
"paddlepaddle>=1.6.1 is required"
)
return
return
...
@@ -184,7 +189,6 @@ def main():
...
@@ -184,7 +189,6 @@ def main():
assert
args
.
framework
is
not
None
,
"--framework is not defined(support tensorflow/caffe/onnx)"
assert
args
.
framework
is
not
None
,
"--framework is not defined(support tensorflow/caffe/onnx)"
assert
args
.
save_dir
is
not
None
,
"--save_dir is not defined"
assert
args
.
save_dir
is
not
None
,
"--save_dir is not defined"
if
args
.
framework
==
"tensorflow"
:
if
args
.
framework
==
"tensorflow"
:
assert
args
.
model
is
not
None
,
"--model should be defined while translating tensorflow model"
assert
args
.
model
is
not
None
,
"--model should be defined while translating tensorflow model"
without_data_format_optimization
=
False
without_data_format_optimization
=
False
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录