Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
b768708e
P
Paddle
项目概览
PaddlePaddle
/
Paddle
11 个月 前同步成功
通知
2291
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b768708e
编写于
2月 16, 2020
作者:
S
songyouwei
提交者:
GitHub
2月 16, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix pickle load encoding between python 2 and 3 (#22621)
test=develop
上级
cb4560b7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
6 deletion
+6
-6
python/paddle/fluid/dygraph/checkpoint.py
python/paddle/fluid/dygraph/checkpoint.py
+2
-2
python/paddle/fluid/io.py
python/paddle/fluid/io.py
+4
-4
未找到文件。
python/paddle/fluid/dygraph/checkpoint.py
浏览文件 @
b768708e
...
@@ -132,7 +132,7 @@ def load_dygraph(model_path, keep_name_table=False):
...
@@ -132,7 +132,7 @@ def load_dygraph(model_path, keep_name_table=False):
with
open
(
params_file_path
,
'rb'
)
as
f
:
with
open
(
params_file_path
,
'rb'
)
as
f
:
para_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
para_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
f
,
encoding
=
'
bytes
'
)
f
,
encoding
=
'
latin1
'
)
if
not
keep_name_table
and
"StructuredToParameterName@@"
in
para_dict
:
if
not
keep_name_table
and
"StructuredToParameterName@@"
in
para_dict
:
del
para_dict
[
"StructuredToParameterName@@"
]
del
para_dict
[
"StructuredToParameterName@@"
]
...
@@ -141,6 +141,6 @@ def load_dygraph(model_path, keep_name_table=False):
...
@@ -141,6 +141,6 @@ def load_dygraph(model_path, keep_name_table=False):
if
os
.
path
.
exists
(
opti_file_path
):
if
os
.
path
.
exists
(
opti_file_path
):
with
open
(
opti_file_path
,
'rb'
)
as
f
:
with
open
(
opti_file_path
,
'rb'
)
as
f
:
opti_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
opti_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
f
,
encoding
=
'
bytes
'
)
f
,
encoding
=
'
latin1
'
)
return
para_dict
,
opti_dict
return
para_dict
,
opti_dict
python/paddle/fluid/io.py
浏览文件 @
b768708e
...
@@ -1696,7 +1696,7 @@ def load(program, model_path, executor=None, var_list=None):
...
@@ -1696,7 +1696,7 @@ def load(program, model_path, executor=None, var_list=None):
executor
.
_default_executor
)
executor
.
_default_executor
)
with
open
(
parameter_file_name
,
'rb'
)
as
f
:
with
open
(
parameter_file_name
,
'rb'
)
as
f
:
load_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
load_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
f
,
encoding
=
'
bytes
'
)
f
,
encoding
=
'
latin1
'
)
for
v
in
parameter_list
:
for
v
in
parameter_list
:
assert
v
.
name
in
load_dict
,
\
assert
v
.
name
in
load_dict
,
\
"Can not find [{}] in model file [{}]"
.
format
(
"Can not find [{}] in model file [{}]"
.
format
(
...
@@ -1717,7 +1717,7 @@ def load(program, model_path, executor=None, var_list=None):
...
@@ -1717,7 +1717,7 @@ def load(program, model_path, executor=None, var_list=None):
with
open
(
opt_file_name
,
'rb'
)
as
f
:
with
open
(
opt_file_name
,
'rb'
)
as
f
:
load_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
load_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
f
,
encoding
=
'
bytes
'
)
f
,
encoding
=
'
latin1
'
)
for
v
in
optimizer_var_list
:
for
v
in
optimizer_var_list
:
assert
v
.
name
in
load_dict
,
\
assert
v
.
name
in
load_dict
,
\
"Can not find [{}] in model file [{}]"
.
format
(
"Can not find [{}] in model file [{}]"
.
format
(
...
@@ -1842,13 +1842,13 @@ def load_program_state(model_path, var_list=None):
...
@@ -1842,13 +1842,13 @@ def load_program_state(model_path, var_list=None):
with
open
(
parameter_file_name
,
'rb'
)
as
f
:
with
open
(
parameter_file_name
,
'rb'
)
as
f
:
para_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
para_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
f
,
encoding
=
'
bytes
'
)
f
,
encoding
=
'
latin1
'
)
opt_file_name
=
model_prefix
+
".pdopt"
opt_file_name
=
model_prefix
+
".pdopt"
if
os
.
path
.
exists
(
opt_file_name
):
if
os
.
path
.
exists
(
opt_file_name
):
with
open
(
opt_file_name
,
'rb'
)
as
f
:
with
open
(
opt_file_name
,
'rb'
)
as
f
:
opti_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
opti_dict
=
pickle
.
load
(
f
)
if
six
.
PY2
else
pickle
.
load
(
f
,
encoding
=
'
bytes
'
)
f
,
encoding
=
'
latin1
'
)
para_dict
.
update
(
opti_dict
)
para_dict
.
update
(
opti_dict
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录