Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
8b41e2b3
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看板
未验证
提交
8b41e2b3
编写于
2月 18, 2020
作者:
A
Aurelius84
提交者:
GitHub
2月 18, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add gast to replace ast test=develop (#22630)
上级
00594c1c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
196 addition
and
5 deletion
+196
-5
python/paddle/fluid/dygraph/dygraph_to_static/ast_transformer.py
...paddle/fluid/dygraph/dygraph_to_static/ast_transformer.py
+3
-3
python/paddle/fluid/dygraph/jit.py
python/paddle/fluid/dygraph/jit.py
+2
-2
python/paddle/fluid/tests/unittests/test_gast_with_compatibility.py
...dle/fluid/tests/unittests/test_gast_with_compatibility.py
+190
-0
python/requirements.txt
python/requirements.txt
+1
-0
未找到文件。
python/paddle/fluid/dygraph/dygraph_to_static/ast_transformer.py
浏览文件 @
8b41e2b3
...
...
@@ -14,7 +14,7 @@
from
__future__
import
print_function
import
ast
import
g
ast
__all__
=
[
'AstNodeWrapper'
,
'DygraphToStaticAst'
,
'StaticAnalysisVisitor'
]
...
...
@@ -87,7 +87,7 @@ class StaticAnalysisVisitor(object):
cur_wrapper
.
parent
=
last_wrapper
self
.
ancestor_wrappers
.
append
(
cur_wrapper
)
for
child
in
ast
.
iter_child_nodes
(
node
):
for
child
in
g
ast
.
iter_child_nodes
(
node
):
self
.
dfs_visit
(
child
)
self
.
ancestor_wrappers
.
pop
()
return
cur_wrapper
.
node_var_type
...
...
@@ -99,7 +99,7 @@ class StaticAnalysisVisitor(object):
return
self
.
node_to_wrapper_map
class
DygraphToStaticAst
(
ast
.
NodeTransformer
):
class
DygraphToStaticAst
(
g
ast
.
NodeTransformer
):
"""
Main class to transform Dygraph to Static Graph
"""
...
...
python/paddle/fluid/dygraph/jit.py
浏览文件 @
8b41e2b3
...
...
@@ -14,7 +14,7 @@
__all__
=
[
'TracedLayer'
,
'dygraph_to_static_output'
]
import
ast
import
g
ast
import
inspect
from
..wrapped_decorator
import
wrap_decorator
...
...
@@ -54,7 +54,7 @@ def _dygraph_to_static_output_(dygraph_func):
def
__impl__
(
*
args
,
**
kwargs
):
# Get AST from dygraph function
dygraph_code
=
inspect
.
getsource
(
dygraph_func
)
root
=
ast
.
parse
(
dygraph_code
)
root
=
g
ast
.
parse
(
dygraph_code
)
root
=
DygraphToStaticAst
().
get_static_ast
(
root
)
...
...
python/paddle/fluid/tests/unittests/test_gast_with_compatibility.py
0 → 100644
浏览文件 @
8b41e2b3
# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from
__future__
import
print_function
import
ast
import
gast
import
textwrap
import
unittest
class
GastNodeTransformer
(
gast
.
NodeTransformer
):
def
__init__
(
self
,
root
):
self
.
root
=
root
def
apply
(
self
):
return
self
.
generic_visit
(
self
.
root
)
def
visit_Name
(
self
,
node
):
"""
Param in func is ast.Name in PY2, but ast.arg in PY3.
It will be generally represented by gast.Name in gast.
"""
if
isinstance
(
node
.
ctx
,
gast
.
Param
)
and
node
.
id
!=
"self"
:
node
.
id
+=
'_new'
return
node
def
visit_With
(
self
,
node
):
"""
The fileds `context_expr/optional_vars` of `ast.With` in PY2
is moved into `ast.With.items.withitem` in PY3.
It will be generally represented by gast.With.items.withitem in gast.
"""
assert
hasattr
(
node
,
'items'
)
if
node
.
items
:
withitem
=
node
.
items
[
0
]
assert
isinstance
(
withitem
,
gast
.
withitem
)
if
isinstance
(
withitem
.
context_expr
,
gast
.
Call
):
func
=
withitem
.
context_expr
.
func
if
isinstance
(
func
,
gast
.
Name
):
func
.
id
+=
'_new'
return
node
def
visit_Call
(
self
,
node
):
"""
The fileds `starargs/kwargs` of `ast.Call` in PY2
is moved into `Starred/keyword` in PY3.
It will be generally represented by gast.Starred/keyword in gast.
"""
assert
hasattr
(
node
,
'args'
)
if
node
.
args
:
assert
isinstance
(
node
.
args
[
0
],
gast
.
Starred
)
# modify args
if
isinstance
(
node
.
args
[
0
].
value
,
gast
.
Name
):
node
.
args
[
0
].
value
.
id
+=
'_new'
assert
hasattr
(
node
,
'keywords'
)
if
node
.
keywords
:
assert
isinstance
(
node
.
keywords
[
0
],
gast
.
keyword
)
self
.
generic_visit
(
node
)
return
node
def
visit_Constant
(
self
,
node
):
"""
In PY3.8, ast.Num/Str/Bytes/None/False/True are merged into ast.Constant.
But these types are still available and will be deprecated in future versions.
ast.Num corresponds to gast.Num in PY2, and corresponds to gast.Constant in PY3.
"""
if
isinstance
(
node
.
value
,
int
):
node
.
value
*=
2
return
node
def
visit_Num
(
self
,
node
):
"""
ast.Num is available before PY3.8, and see visit_Constant for details.
"""
node
.
n
*=
2
return
node
def
visit_Subscript
(
self
,
node
):
"""
Before PY3.8, the fields of ast.subscript keeps exactly same between PY2 and PY3.
After PY3.8, the field `slice` with ast.Slice will be changed into ast.Index(Tuple).
It will be generally represented by gast.Index or gast.Slice in gast.
Note: Paddle doesn't support PY3.8 currently.
"""
assert
isinstance
(
node
.
slice
,
(
gast
.
Index
,
gast
.
Slice
))
self
.
generic_visit
(
node
)
return
node
def
code_gast_ast
(
source
):
"""
Transform source_code into gast.Node and modify it,
then back to ast.Node.
"""
source
=
textwrap
.
dedent
(
source
)
root
=
gast
.
parse
(
source
)
new_root
=
GastNodeTransformer
(
root
).
apply
()
ast_root
=
gast
.
gast_to_ast
(
new_root
)
return
ast
.
dump
(
ast_root
)
def
code_ast
(
source
):
"""
Transform source_code into ast.Node, then dump it.
"""
source
=
textwrap
.
dedent
(
source
)
root
=
ast
.
parse
(
source
)
return
ast
.
dump
(
root
)
class
TestPythonCompatibility
(
unittest
.
TestCase
):
def
_check_compatibility
(
self
,
source
,
target
):
source_dump
=
code_gast_ast
(
source
)
target_dump
=
code_ast
(
target
)
self
.
assertEqual
(
source_dump
,
target_dump
)
def
test_param_of_func
(
self
):
"""
Param in func is ast.Name in PY2, but ast.arg in PY3.
It will be generally represented by ast.Name in gast.
"""
source
=
"""
def foo(x, y):
return x + y
"""
target
=
"""
def foo(x_new, y_new):
return x + y
"""
self
.
_check_compatibility
(
source
,
target
)
def
test_with
(
self
):
"""
The fileds `context_expr/optional_vars` of `ast.With` in PY2
is moved into `ast.With.items.withitem` in PY3.
"""
source
=
"""
with guard():
a = 1
"""
target
=
"""
with guard_new():
a = 1
"""
self
.
_check_compatibility
(
source
,
target
)
def
test_subscript_Index
(
self
):
source
=
"""
x = y()[10]
"""
target
=
"""
x = y()[20]
"""
self
.
_check_compatibility
(
source
,
target
)
def
test_subscript_Slice
(
self
):
source
=
"""
x = y()[10:20]
"""
target
=
"""
x = y()[20:40]
"""
self
.
_check_compatibility
(
source
,
target
)
def
test_call
(
self
):
source
=
"""
y = foo(*arg)
"""
target
=
"""
y = foo(*arg_new)
"""
self
.
_check_compatibility
(
source
,
target
)
if
__name__
==
'__main__'
:
unittest
.
main
()
python/requirements.txt
浏览文件 @
8b41e2b3
...
...
@@ -17,3 +17,4 @@ pyyaml
decorator
prettytable
objgraph
gast
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录