Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
621bc4f7
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
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看板
未验证
提交
621bc4f7
编写于
1月 20, 2021
作者:
A
Aurelius84
提交者:
GitHub
1月 20, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Dy2static]Fix paddle prefix in is_paddle_api (#30569)
* add paddle. * add unittest
上级
9dd71c74
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
27 addition
and
9 deletion
+27
-9
python/paddle/fluid/dygraph/dygraph_to_static/convert_call_func.py
...ddle/fluid/dygraph/dygraph_to_static/convert_call_func.py
+1
-5
python/paddle/fluid/dygraph/dygraph_to_static/utils.py
python/paddle/fluid/dygraph/dygraph_to_static/utils.py
+15
-4
python/paddle/fluid/tests/unittests/dygraph_to_static/test_utils.py
...dle/fluid/tests/unittests/dygraph_to_static/test_utils.py
+11
-0
未找到文件。
python/paddle/fluid/dygraph/dygraph_to_static/convert_call_func.py
浏览文件 @
621bc4f7
...
@@ -31,6 +31,7 @@ from paddle.fluid.dygraph.dygraph_to_static.logging_utils import TranslatorLogge
...
@@ -31,6 +31,7 @@ from paddle.fluid.dygraph.dygraph_to_static.logging_utils import TranslatorLogge
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
StaticFunction
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
StaticFunction
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
convert_to_static
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
convert_to_static
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
unwrap_decorators
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
unwrap_decorators
from
paddle.fluid.dygraph.dygraph_to_static.utils
import
is_paddle_func
from
paddle.fluid.dygraph.layers
import
Layer
from
paddle.fluid.dygraph.layers
import
Layer
__all__
=
[
"convert_call"
]
__all__
=
[
"convert_call"
]
...
@@ -74,11 +75,6 @@ def is_builtin_len(func):
...
@@ -74,11 +75,6 @@ def is_builtin_len(func):
return
False
return
False
def
is_paddle_func
(
func
):
m
=
inspect
.
getmodule
(
func
)
return
m
is
not
None
and
m
.
__name__
.
startswith
(
"paddle"
)
def
is_unsupported
(
func
):
def
is_unsupported
(
func
):
"""
"""
Checks whether the func is supported by dygraph to static graph.
Checks whether the func is supported by dygraph to static graph.
...
...
python/paddle/fluid/dygraph/dygraph_to_static/utils.py
浏览文件 @
621bc4f7
...
@@ -30,6 +30,12 @@ import numpy as np
...
@@ -30,6 +30,12 @@ import numpy as np
from
paddle.fluid
import
unique_name
from
paddle.fluid
import
unique_name
from
paddle.fluid.data_feeder
import
convert_dtype
from
paddle.fluid.data_feeder
import
convert_dtype
# Note(Aurelius): Do not forget the dot `.` to distinguish other
# module such as paddlenlp.
PADDLE_MODULE_PREFIX
=
'paddle.'
DYGRAPH_MODULE_PREFIX
=
'paddle.fluid.dygraph'
DYGRAPH_TO_STATIC_MODULE_PREFIX
=
'paddle.fluid.dygraph.dygraph_to_static'
class
BaseNodeVisitor
(
gast
.
NodeVisitor
):
class
BaseNodeVisitor
(
gast
.
NodeVisitor
):
"""
"""
...
@@ -191,16 +197,21 @@ def is_api_in_module(node, module_prefix):
...
@@ -191,16 +197,21 @@ def is_api_in_module(node, module_prefix):
def
is_dygraph_api
(
node
):
def
is_dygraph_api
(
node
):
# Note: A api in module dygraph_to_static is not a real dygraph api.
# Note: A api in module dygraph_to_static is not a real dygraph api.
if
is_api_in_module
(
node
,
"paddle.fluid.dygraph.dygraph_to_static"
):
if
is_api_in_module
(
node
,
DYGRAPH_TO_STATIC_MODULE_PREFIX
):
return
False
return
False
# TODO(liym27): A better way to determine whether it is a dygraph api.
# TODO(liym27): A better way to determine whether it is a dygraph api.
# Consider the decorator @dygraph_only
# Consider the decorator @dygraph_only
return
is_api_in_module
(
node
,
"paddle.fluid.dygraph"
)
return
is_api_in_module
(
node
,
DYGRAPH_MODULE_PREFIX
)
def
is_paddle_api
(
node
):
def
is_paddle_api
(
node
):
return
is_api_in_module
(
node
,
"paddle"
)
return
is_api_in_module
(
node
,
PADDLE_MODULE_PREFIX
)
def
is_paddle_func
(
func
):
m
=
inspect
.
getmodule
(
func
)
return
m
is
not
None
and
m
.
__name__
.
startswith
(
PADDLE_MODULE_PREFIX
)
# Is numpy_api cannot reuse is_api_in_module because of numpy module problem
# Is numpy_api cannot reuse is_api_in_module because of numpy module problem
...
...
python/paddle/fluid/tests/unittests/dygraph_to_static/test_utils.py
浏览文件 @
621bc4f7
...
@@ -14,10 +14,12 @@
...
@@ -14,10 +14,12 @@
from
__future__
import
print_function
from
__future__
import
print_function
import
types
import
unittest
import
unittest
from
paddle.fluid.dygraph.dygraph_to_static
import
ProgramTranslator
from
paddle.fluid.dygraph.dygraph_to_static
import
ProgramTranslator
from
paddle.fluid.dygraph.dygraph_to_static.utils
import
index_in_list
from
paddle.fluid.dygraph.dygraph_to_static.utils
import
index_in_list
from
paddle.fluid.dygraph.dygraph_to_static.utils
import
is_paddle_func
from
test_program_translator
import
get_source_code
from
test_program_translator
import
get_source_code
...
@@ -61,5 +63,14 @@ class TestSplitAssignTransformer(unittest.TestCase):
...
@@ -61,5 +63,14 @@ class TestSplitAssignTransformer(unittest.TestCase):
self
.
assertEqual
(
answer
,
code
)
self
.
assertEqual
(
answer
,
code
)
class
TestIsPaddle
(
unittest
.
TestCase
):
def
fake_module
(
self
):
return
types
.
ModuleType
(
'paddlenlp'
)
def
test_func
(
self
):
m
=
self
.
fake_module
()
self
.
assertFalse
(
is_paddle_func
(
m
))
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录