Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
412573f0
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看板
未验证
提交
412573f0
编写于
1月 17, 2023
作者:
W
WangZhen
提交者:
GitHub
1月 17, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix translated layer fine-tune error (#49870)
* Fix translated layer fine-tune
上级
56cacae9
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
57 addition
and
59 deletion
+57
-59
python/paddle/jit/dy2static/partial_program.py
python/paddle/jit/dy2static/partial_program.py
+7
-37
python/paddle/jit/dy2static/utils.py
python/paddle/jit/dy2static/utils.py
+38
-0
python/paddle/jit/translated_layer.py
python/paddle/jit/translated_layer.py
+12
-22
未找到文件。
python/paddle/jit/dy2static/partial_program.py
浏览文件 @
412573f0
...
...
@@ -32,6 +32,7 @@ from paddle.fluid.layers.utils import _hash_with_id, flatten, pack_sequence_as
from
.
import
logging_utils
from
.return_transformer
import
RETURN_NO_VALUE_MAGIC_NUM
from
.utils
import
_out_grad_names
,
_param_grad_names
__all__
=
[]
...
...
@@ -375,46 +376,15 @@ class PartialProgramLayer:
@
LazyInitialized
def
_param_grad_names
(
self
):
names
=
[]
# NOTE: `names` and `self._params` must be in the same order so that
# the param grad name can be set correctly in the run_program.
for
param
in
self
.
_params
:
candidate
=
[
var_name
for
var_name
in
self
.
_train_program
.
block
(
0
).
vars
.
keys
()
if
var_name
.
endswith
(
param
.
name
+
'@GRAD'
)
]
if
candidate
:
names
.
append
(
max
(
candidate
,
key
=
lambda
name
:
name
.
count
(
'grad/'
))
)
else
:
names
.
append
(
param
.
name
+
'@GRAD'
)
return
names
return
_param_grad_names
(
self
.
_train_program
.
desc
,
self
.
_params
)
@
LazyInitialized
def
_out_grad_names
(
self
):
"""
Parse Out@GARD name from original train and infer program.
"""
names
=
[]
origin_infer_program
=
self
.
_create_program
(
is_infer_mode
=
True
)
origin_train_program
=
self
.
_train_program
fwd_end_op_index
=
len
(
origin_infer_program
.
block
(
0
).
ops
)
for
i
in
range
(
fwd_end_op_index
+
1
,
min
(
fwd_end_op_index
+
2
*
len
(
self
.
_outputs
.
var_ids
),
len
(
origin_train_program
.
block
(
0
).
ops
),
),
2
,
):
op
=
origin_train_program
.
block
(
0
).
ops
[
i
]
if
op
.
type
==
'fill_constant'
:
var_name
=
op
.
output
(
'Out'
)[
0
]
names
.
append
(
var_name
)
return
names
return
_out_grad_names
(
self
.
_train_program
.
desc
,
self
.
_create_program
(
is_infer_mode
=
True
).
desc
.
block
(
0
).
op_size
(),
len
(
self
.
_outputs
.
var_ids
),
)
@
property
def
program
(
self
):
...
...
python/paddle/jit/dy2static/utils.py
浏览文件 @
412573f0
...
...
@@ -1483,3 +1483,41 @@ def create_name_str(name_ids):
names_str
=
[
"'%s'"
%
(
name
.
replace
(
"'"
,
"
\\
'"
))
for
name
in
name_ids
]
return
"(%s, )"
%
','
.
join
(
names_str
)
def
_param_grad_names
(
program_desc
,
params
):
"""
Parse PARAM@GARD name from original train and infer program.
"""
names
=
[]
# NOTE: `names` and `self._params` must be in the same order so that
# the param grad name can be set correctly in the run_program.
for
param
in
params
:
candidate
=
[
var
.
name
()
for
var
in
program_desc
.
block
(
0
).
all_vars
()
if
var
.
name
().
endswith
(
param
.
name
+
'@GRAD'
)
]
if
candidate
:
names
.
append
(
max
(
candidate
,
key
=
lambda
name
:
name
.
count
(
'grad/'
)))
else
:
names
.
append
(
param
.
name
+
'@GRAD'
)
return
names
def
_out_grad_names
(
program_desc
,
fwd_end_op_index
,
out_size
):
"""
Parse Out@GARD name from original train and infer program.
"""
names
=
[]
for
i
in
range
(
fwd_end_op_index
+
1
,
min
(
fwd_end_op_index
+
2
*
out_size
,
program_desc
.
block
(
0
).
op_size
()),
2
,
):
op
=
program_desc
.
block
(
0
).
op
(
i
)
if
op
.
type
()
==
'fill_constant'
:
var_name
=
op
.
output
(
'Out'
)[
0
]
names
.
append
(
var_name
)
return
names
python/paddle/jit/translated_layer.py
浏览文件 @
412573f0
...
...
@@ -33,6 +33,8 @@ from paddle.jit.dy2static.partial_program import (
add_build_strategy_for
,
)
from
.dy2static.utils
import
_out_grad_names
,
_param_grad_names
__all__
=
[]
INFER_MODEL_SUFFIX
=
".pdmodel"
...
...
@@ -887,28 +889,7 @@ def _construct_params_and_buffers(
def
_valid_vars
(
vars
):
if
vars
:
return
vars
if
framework
.
_in_eager_without_dygraph_check
():
return
[
core
.
eager
.
Tensor
(
core
.
VarDesc
.
VarType
.
FP32
,
[],
"Fake_var"
,
core
.
VarDesc
.
VarType
.
RAW
,
False
,
)
]
else
:
return
[
core
.
VarBase
(
core
.
VarDesc
.
VarType
.
FP32
,
[],
"Fake_var"
,
core
.
VarDesc
.
VarType
.
RAW
,
False
,
)
]
return
vars
if
vars
else
None
def
_run_dygraph
(
instance
,
input
,
program_holder
):
...
...
@@ -1041,6 +1022,15 @@ def _run_dygraph(instance, input, program_holder):
'program_id'
,
_hash_with_id
(
trace_program
,
instance
),
]
if
not
instance
.
_is_test
:
attrs
.
extend
(
(
'param_grad_names'
,
_param_grad_names
(
trace_program
,
persistable_vars
),
'out_grad_names'
,
_out_grad_names
(
trace_program
,
end_op_index
,
len
(
output_vars
)),
)
)
use_interpretorcore
=
(
_is_enable_standalone_executor
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录