Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
40162227
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
40162227
编写于
5月 27, 2020
作者:
A
Aurelius84
提交者:
GitHub
5月 27, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support save model in dygraph.guard test=develop (#24761)
上级
355caee1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
2 deletion
+8
-2
python/paddle/fluid/dygraph/dygraph_to_static/program_translator.py
...dle/fluid/dygraph/dygraph_to_static/program_translator.py
+1
-0
python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist.py
...dle/fluid/tests/unittests/dygraph_to_static/test_mnist.py
+1
-1
python/paddle/fluid/tests/unittests/dygraph_to_static/test_save_inference_model.py
.../unittests/dygraph_to_static/test_save_inference_model.py
+6
-1
未找到文件。
python/paddle/fluid/dygraph/dygraph_to_static/program_translator.py
浏览文件 @
40162227
...
@@ -550,6 +550,7 @@ class ProgramTranslator(object):
...
@@ -550,6 +550,7 @@ class ProgramTranslator(object):
source_code
=
ast_to_source_code
(
root_wrapper
.
node
)
source_code
=
ast_to_source_code
(
root_wrapper
.
node
)
return
source_code
return
source_code
@
switch_to_static_graph
def
save_inference_model
(
self
,
dirname
,
feed
=
None
,
fetch
=
None
):
def
save_inference_model
(
self
,
dirname
,
feed
=
None
,
fetch
=
None
):
"""
"""
Saves current model as the inference model. It will prune the main_program
Saves current model as the inference model. It will prune the main_program
...
...
python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist.py
浏览文件 @
40162227
...
@@ -200,7 +200,6 @@ class TestMNISTWithDeclarative(TestMNIST):
...
@@ -200,7 +200,6 @@ class TestMNISTWithDeclarative(TestMNIST):
break
break
return
loss_data
return
loss_data
@
switch_to_static_graph
def
check_save_inference_model
(
self
,
inputs
,
prog_trans
,
to_static
,
gt_out
):
def
check_save_inference_model
(
self
,
inputs
,
prog_trans
,
to_static
,
gt_out
):
if
to_static
:
if
to_static
:
infer_model_path
=
"./test_mnist_inference_model"
infer_model_path
=
"./test_mnist_inference_model"
...
@@ -208,6 +207,7 @@ class TestMNISTWithDeclarative(TestMNIST):
...
@@ -208,6 +207,7 @@ class TestMNISTWithDeclarative(TestMNIST):
infer_out
=
self
.
load_and_run_inference
(
infer_model_path
,
inputs
)
infer_out
=
self
.
load_and_run_inference
(
infer_model_path
,
inputs
)
self
.
assertTrue
(
np
.
allclose
(
gt_out
.
numpy
(),
infer_out
))
self
.
assertTrue
(
np
.
allclose
(
gt_out
.
numpy
(),
infer_out
))
@
switch_to_static_graph
def
load_and_run_inference
(
self
,
model_path
,
inputs
):
def
load_and_run_inference
(
self
,
model_path
,
inputs
):
exe
=
fluid
.
Executor
(
self
.
place
)
exe
=
fluid
.
Executor
(
self
.
place
)
[
inference_program
,
feed_target_names
,
[
inference_program
,
feed_target_names
,
...
...
python/paddle/fluid/tests/unittests/dygraph_to_static/test_save_inference_model.py
浏览文件 @
40162227
...
@@ -30,6 +30,7 @@ np.random.seed(SEED)
...
@@ -30,6 +30,7 @@ np.random.seed(SEED)
place
=
fluid
.
CUDAPlace
(
0
)
if
fluid
.
is_compiled_with_cuda
()
else
fluid
.
CPUPlace
(
place
=
fluid
.
CUDAPlace
(
0
)
if
fluid
.
is_compiled_with_cuda
()
else
fluid
.
CPUPlace
(
)
)
program_translator
=
ProgramTranslator
()
class
SimpleFcLayer
(
fluid
.
dygraph
.
Layer
):
class
SimpleFcLayer
(
fluid
.
dygraph
.
Layer
):
...
@@ -63,6 +64,10 @@ class TestDyToStaticSaveInferenceModel(unittest.TestCase):
...
@@ -63,6 +64,10 @@ class TestDyToStaticSaveInferenceModel(unittest.TestCase):
loss
.
backward
()
loss
.
backward
()
adam
.
minimize
(
loss
)
adam
.
minimize
(
loss
)
layer
.
clear_gradients
()
layer
.
clear_gradients
()
# test for saving model in dygraph.guard
infer_model_dir
=
"./test_dy2stat_save_inference_model"
program_translator
.
save_inference_model
(
infer_model_dir
,
feed
=
[
0
],
fetch
=
[
1
])
# Check the correctness of the inference
# Check the correctness of the inference
dygraph_out
,
_
=
layer
(
x
)
dygraph_out
,
_
=
layer
(
x
)
self
.
check_save_inference_model
(
layer
,
[
x_data
],
dygraph_out
.
numpy
())
self
.
check_save_inference_model
(
layer
,
[
x_data
],
dygraph_out
.
numpy
())
...
@@ -77,7 +82,7 @@ class TestDyToStaticSaveInferenceModel(unittest.TestCase):
...
@@ -77,7 +82,7 @@ class TestDyToStaticSaveInferenceModel(unittest.TestCase):
gt_out
,
gt_out
,
feed
=
None
,
feed
=
None
,
fetch
=
None
):
fetch
=
None
):
program_translator
=
ProgramTranslator
()
expected_persistable_vars
=
set
([
p
.
name
for
p
in
model
.
parameters
()])
expected_persistable_vars
=
set
([
p
.
name
for
p
in
model
.
parameters
()])
infer_model_dir
=
"./test_dy2stat_save_inference_model"
infer_model_dir
=
"./test_dy2stat_save_inference_model"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录