Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Crayon鑫
Paddle
提交
a647bcd3
P
Paddle
项目概览
Crayon鑫
/
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看板
未验证
提交
a647bcd3
编写于
3月 26, 2020
作者:
A
Aurelius84
提交者:
GitHub
3月 26, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add convert_function_with_cache in dygraph_to_static_func (#23190)
* add unittest test=develop * add function cache test=develop
上级
bd809033
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
3 deletion
+30
-3
python/paddle/fluid/dygraph/dygraph_to_static/program_translator.py
...dle/fluid/dygraph/dygraph_to_static/program_translator.py
+15
-2
python/paddle/fluid/tests/unittests/dygraph_to_static/test_cache_program.py
...d/tests/unittests/dygraph_to_static/test_cache_program.py
+15
-1
未找到文件。
python/paddle/fluid/dygraph/dygraph_to_static/program_translator.py
浏览文件 @
a647bcd3
...
@@ -29,7 +29,7 @@ from paddle.fluid.dygraph.dygraph_to_static.ast_transformer import DygraphToStat
...
@@ -29,7 +29,7 @@ from paddle.fluid.dygraph.dygraph_to_static.ast_transformer import DygraphToStat
from
paddle.fluid.dygraph.dygraph_to_static.utils
import
ast_to_source_code
from
paddle.fluid.dygraph.dygraph_to_static.utils
import
ast_to_source_code
from
paddle.fluid.framework
import
in_dygraph_mode
from
paddle.fluid.framework
import
in_dygraph_mode
__all__
=
[
'ProgramTranslator'
]
__all__
=
[
'ProgramTranslator'
,
'convert_function_with_cache'
]
class
FunctionCache
(
object
):
class
FunctionCache
(
object
):
...
@@ -66,6 +66,19 @@ class FunctionCache(object):
...
@@ -66,6 +66,19 @@ class FunctionCache(object):
self
.
_get_dedent_code_string
(
func
),
None
)
is
not
None
self
.
_get_dedent_code_string
(
func
),
None
)
is
not
None
_CACHE_LOCK
=
threading
.
Lock
()
_FUNCTION_CACHE
=
FunctionCache
()
def
convert_function_with_cache
(
dygraph_func
):
"""
Transform function of dygraph into static function using the cache mechanism.
"""
with
_CACHE_LOCK
:
static_func
=
_FUNCTION_CACHE
.
get_or_cache_func
(
dygraph_func
)
return
static_func
def
synchronized
(
func
):
def
synchronized
(
func
):
func
.
__lock__
=
threading
.
Lock
()
func
.
__lock__
=
threading
.
Lock
()
...
@@ -273,7 +286,7 @@ class ProgramTranslator(object):
...
@@ -273,7 +286,7 @@ class ProgramTranslator(object):
"The decorator 'dygraph_to_static_graph' doesn't work in dygraph mode."
"The decorator 'dygraph_to_static_graph' doesn't work in dygraph mode."
" Please use it in static mode."
)
" Please use it in static mode."
)
return
dygraph_func
return
dygraph_func
static_func
,
ast_transformer
=
convert_to_static
(
dygraph_func
)
static_func
=
convert_function_with_cache
(
dygraph_func
)
return
static_func
return
static_func
def
get_code
(
self
,
dygraph_func
):
def
get_code
(
self
,
dygraph_func
):
...
...
python/paddle/fluid/tests/unittests/dygraph_to_static/test_cache_program.py
浏览文件 @
a647bcd3
...
@@ -21,7 +21,7 @@ from collections import Counter
...
@@ -21,7 +21,7 @@ from collections import Counter
import
paddle.fluid
as
fluid
import
paddle.fluid
as
fluid
from
paddle.fluid.dygraph.dygraph_to_static
import
ProgramTranslator
from
paddle.fluid.dygraph.dygraph_to_static
import
ProgramTranslator
from
paddle.fluid.dygraph.
jit
import
dygraph_to_static_output
from
paddle.fluid.dygraph.
dygraph_to_static
import
convert_function_with_cache
from
test_fetch_feed
import
Pool2D
,
Linear
from
test_fetch_feed
import
Pool2D
,
Linear
...
@@ -111,5 +111,19 @@ class TestCacheProgramWithOptimizer(unittest.TestCase):
...
@@ -111,5 +111,19 @@ class TestCacheProgramWithOptimizer(unittest.TestCase):
static_loss
))
static_loss
))
def
simple_func
(
x
):
inputs
=
fluid
.
dygraph
.
to_variable
(
x
)
mean
=
fluid
.
layers
.
mean
(
inputs
)
return
mean
class
TestConvertWithCache
(
unittest
.
TestCase
):
def
test_cache
(
self
):
static_func
=
convert_function_with_cache
(
simple_func
)
# Get transformed function from cache.
cached_func
=
convert_function_with_cache
(
simple_func
)
self
.
assertTrue
(
id
(
static_func
),
id
(
cached_func
))
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
unittest
.
main
()
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录