Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
迷雾大侦探
Paddle
提交
fc9d80bc
P
Paddle
项目概览
迷雾大侦探
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
fc9d80bc
编写于
9月 24, 2020
作者:
A
Aurelius84
提交者:
GitHub
9月 24, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Dy2Stat]rename StaticLayer into StaticFunction (#27487)
* rename StaticLayer * rename
上级
dc713116
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
20 deletion
+20
-20
python/paddle/fluid/dygraph/dygraph_to_static/convert_call_func.py
...ddle/fluid/dygraph/dygraph_to_static/convert_call_func.py
+5
-5
python/paddle/fluid/dygraph/dygraph_to_static/program_translator.py
...dle/fluid/dygraph/dygraph_to_static/program_translator.py
+5
-5
python/paddle/fluid/dygraph/jit.py
python/paddle/fluid/dygraph/jit.py
+6
-6
python/paddle/fluid/tests/unittests/dygraph_to_static/test_declarative.py
...uid/tests/unittests/dygraph_to_static/test_declarative.py
+4
-4
未找到文件。
python/paddle/fluid/dygraph/dygraph_to_static/convert_call_func.py
浏览文件 @
fc9d80bc
...
...
@@ -29,7 +29,7 @@ import six
from
paddle.fluid.dygraph.dygraph_to_static.convert_operators
import
convert_len
from
paddle.fluid.dygraph.dygraph_to_static.logging_utils
import
TranslatorLogger
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
Static
Layer
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
Static
Function
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.layers
import
Layer
...
...
@@ -143,14 +143,14 @@ def convert_call(func):
# def foo(x):
# return x
#
# `foo` will be converted into a wrapper class, suppose as `Static
Layer
`.
# And `foo.__globals__['foo']` will still return this `Static
Layer
` instead of
# `foo` function. So `isinstance(fn, Static
Layer
)` is added here.
# `foo` will be converted into a wrapper class, suppose as `Static
Function
`.
# And `foo.__globals__['foo']` will still return this `Static
Function
` instead of
# `foo` function. So `isinstance(fn, Static
Function
)` is added here.
global_functions
=
set
()
for
fn
in
func
.
__globals__
.
values
():
if
inspect
.
isfunction
(
fn
):
global_functions
.
add
(
fn
)
elif
isinstance
(
fn
,
Static
Layer
):
elif
isinstance
(
fn
,
Static
Function
):
_
,
fn
=
unwrap_decorators
(
fn
)
global_functions
.
add
(
fn
)
...
...
python/paddle/fluid/dygraph/dygraph_to_static/program_translator.py
浏览文件 @
fc9d80bc
...
...
@@ -205,7 +205,7 @@ def unwrap_decorators(func):
decorators
=
[]
cur
=
func
while
True
:
if
isinstance
(
cur
,
Static
Layer
):
if
isinstance
(
cur
,
Static
Function
):
decorators
.
append
(
cur
)
# Note: if `cur` is a method, keep it as bound method of class.
instance
=
cur
.
_class_instance
...
...
@@ -218,7 +218,7 @@ def unwrap_decorators(func):
return
decorators
,
cur
class
Static
Layer
(
object
):
class
Static
Function
(
object
):
"""
Wrapper class to Manage program conversion of decorated function.
...
...
@@ -226,7 +226,7 @@ class StaticLayer(object):
def
__init__
(
self
,
function
,
input_spec
=
None
):
"""
Initializes a `Static
Layer
`.
Initializes a `Static
Function
`.
Args:
function(callable): A function or method that will be converted into static program.
...
...
@@ -268,12 +268,12 @@ class StaticLayer(object):
In above case, `net(x, y)` will call `net.forward(x, y)` firstly that is a bound method
of `Net` instance. After decorated by `@paddle.jit.to_static`, it will firstly to call `__get__`
to parse the class instance correctly instead of the `Static
Layer
` instance.
to parse the class instance correctly instead of the `Static
Function
` instance.
"""
if
instance
not
in
self
.
_descriptor_cache
:
if
instance
is
None
:
return
self
# Note(Aurelius84): To construct new instance of Static
Layer
when we
# Note(Aurelius84): To construct new instance of Static
Function
when we
# first encouter the bound function of layer and cache it.
new_static_layer
=
self
.
_clone
()
new_static_layer
.
_class_instance
=
instance
...
...
python/paddle/fluid/dygraph/jit.py
浏览文件 @
fc9d80bc
...
...
@@ -28,7 +28,7 @@ from paddle.fluid.data_feeder import check_type
from
paddle.fluid.dygraph.base
import
program_desc_tracing_guard
,
switch_to_static_graph
from
paddle.fluid.dygraph.dygraph_to_static
import
logging_utils
from
paddle.fluid.dygraph.dygraph_to_static.logging_utils
import
set_code_level
,
set_verbosity
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
ProgramTranslator
,
Static
Layer
,
unwrap_decorators
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
ProgramTranslator
,
Static
Function
,
unwrap_decorators
from
paddle.fluid.dygraph.io
import
EXTRA_VAR_INFO_FILENAME
,
VARIABLE_FILENAME
,
TranslatedLayer
from
paddle.fluid.dygraph.layers
import
Layer
from
paddle.fluid.executor
import
Executor
,
scope_guard
...
...
@@ -141,7 +141,7 @@ def copy_decorator_attrs(original_func, decorated_obj):
Args:
original_func(callable): the original decorated function.
decorated_obj(Static
Layer): the target decorated StaticLayer
object.
decorated_obj(Static
Function): the target decorated StaticFunction
object.
"""
decorator_name
=
"declarative"
...
...
@@ -198,7 +198,7 @@ def declarative(function=None, input_spec=None):
def
decorated
(
python_func
):
"""
Decorates a python function into a Static
Layer
object.
Decorates a python function into a Static
Function
object.
"""
# Step 1. unwrap the function if it is already decorated.
_
,
python_func
=
unwrap_decorators
(
python_func
)
...
...
@@ -206,7 +206,7 @@ def declarative(function=None, input_spec=None):
# Step 2. copy some attributes from original python function.
static_layer
=
copy_decorator_attrs
(
original_func
=
python_func
,
decorated_obj
=
Static
Layer
(
decorated_obj
=
Static
Function
(
function
=
python_func
,
input_spec
=
input_spec
))
return
static_layer
...
...
@@ -214,7 +214,7 @@ def declarative(function=None, input_spec=None):
# for usage: `declarative(foo, ...)`
if
function
is
not
None
:
if
isinstance
(
function
,
Layer
):
if
isinstance
(
function
.
forward
,
Static
Layer
):
if
isinstance
(
function
.
forward
,
Static
Function
):
class_name
=
function
.
__class__
.
__name__
logging_utils
.
warn
(
"`{}.forward` has already been decorated somewhere. It will be redecorated to replace previous one."
.
...
...
@@ -868,7 +868,7 @@ def save(layer, model_path, input_spec=None, config=None):
# 2. get program from Layer
# TODO(chenweihang): add support for other method, not only forward
if
isinstance
(
layer
.
forward
,
Static
Layer
):
if
isinstance
(
layer
.
forward
,
Static
Function
):
concrete_program
=
layer
.
forward
.
concrete_program
else
:
# transform in jit.save, if input_spec is incomplete, declarative will throw error
...
...
python/paddle/fluid/tests/unittests/dygraph_to_static/test_declarative.py
浏览文件 @
fc9d80bc
...
...
@@ -19,7 +19,7 @@ import paddle
import
paddle.fluid
as
fluid
from
paddle.static
import
InputSpec
from
paddle.fluid.dygraph
import
to_variable
,
declarative
,
ProgramTranslator
,
Layer
,
jit
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
ConcreteProgram
,
Static
Layer
from
paddle.fluid.dygraph.dygraph_to_static.program_translator
import
ConcreteProgram
,
Static
Function
from
test_basic_api_transformation
import
dyfunc_to_variable
...
...
@@ -81,14 +81,14 @@ class SimpleNet(Layer):
return
z
class
TestStatic
Layer
Instance
(
unittest
.
TestCase
):
class
TestStatic
Function
Instance
(
unittest
.
TestCase
):
def
test_instance_same_class
(
self
):
with
fluid
.
dygraph
.
guard
(
fluid
.
CPUPlace
()):
net_1
=
SimpleNet
()
net_2
=
SimpleNet
()
self
.
assertTrue
(
isinstance
(
net_1
.
forward
,
Static
Layer
))
self
.
assertTrue
(
isinstance
(
net_2
.
forward
,
Static
Layer
))
self
.
assertTrue
(
isinstance
(
net_1
.
forward
,
Static
Function
))
self
.
assertTrue
(
isinstance
(
net_2
.
forward
,
Static
Function
))
self
.
assertNotEqual
(
net_1
.
forward
,
net_2
.
forward
)
# convert layer into static progam of net_1
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录