Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
272dabd7
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2293
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
272dabd7
编写于
8月 01, 2023
作者:
0
0x45f
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix scope error
上级
82cbf987
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
50 addition
and
20 deletion
+50
-20
paddle/fluid/eager/to_static/run_program_op_func.h
paddle/fluid/eager/to_static/run_program_op_func.h
+40
-14
paddle/fluid/eager/to_static/run_program_op_node.h
paddle/fluid/eager/to_static/run_program_op_node.h
+5
-4
paddle/fluid/framework/operator.h
paddle/fluid/framework/operator.h
+2
-0
paddle/fluid/operators/run_program_op.h
paddle/fluid/operators/run_program_op.h
+3
-2
未找到文件。
paddle/fluid/eager/to_static/run_program_op_func.h
浏览文件 @
272dabd7
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
#include "paddle/fluid/eager/eager_tensor.h"
#include "paddle/fluid/eager/eager_tensor.h"
#include "paddle/fluid/eager/to_static/run_program_op_node.h"
#include "paddle/fluid/eager/to_static/run_program_op_node.h"
#include "paddle/fluid/eager/utils.h"
#include "paddle/fluid/eager/utils.h"
#include "paddle/fluid/memory/allocation/allocator.h"
// Filter params without grads in global block. In this case, we will
// Filter params without grads in global block. In this case, we will
// tag its AutogradMeta with stop_gradient = True to avoid fault from
// tag its AutogradMeta with stop_gradient = True to avoid fault from
...
@@ -53,6 +54,41 @@ static void clear_no_grad_edges_with_partial_block(
...
@@ -53,6 +54,41 @@ static void clear_no_grad_edges_with_partial_block(
}
}
}
}
static
void
clear_unused_out_var_in_backward
(
const
std
::
vector
<
paddle
::
Tensor
*>&
out
,
const
paddle
::
framework
::
BlockDesc
*
backward_block
,
paddle
::
framework
::
Scope
*
scope
)
{
std
::
deque
<
std
::
shared_ptr
<
paddle
::
memory
::
Allocation
>>*
garbages
=
new
std
::
deque
<
std
::
shared_ptr
<
paddle
::
memory
::
Allocation
>>
();
for
(
auto
*
out_tensor
:
out
)
{
if
(
!
backward_block
->
HasVar
(
out_tensor
->
name
()))
{
auto
var
=
scope
->
FindVar
(
out_tensor
->
name
());
if
(
var
==
nullptr
)
{
continue
;
}
if
(
var
->
IsType
<
phi
::
DenseTensor
>
())
{
garbages
->
emplace_back
(
var
->
GetMutable
<
phi
::
DenseTensor
>
()
->
MoveMemoryHolder
());
}
}
}
delete
garbages
;
}
static
std
::
vector
<
paddle
::
Tensor
>
filte_unused_input_var_in_backward
(
const
std
::
vector
<
paddle
::
Tensor
>&
x
,
const
paddle
::
framework
::
BlockDesc
*
backward_block
)
{
auto
filter_x
=
std
::
vector
<
paddle
::
Tensor
>
(
x
);
for
(
size_t
i
=
0
;
i
<
x
.
size
();
i
++
)
{
if
(
!
backward_block
->
HasVar
(
x
[
i
].
name
()))
{
auto
fake
=
paddle
::
Tensor
(
std
::
make_shared
<
phi
::
DenseTensor
>
());
fake
.
set_name
(
paddle
::
framework
::
kFakeVarName
);
filter_x
[
i
]
=
fake
;
}
}
return
filter_x
;
}
inline
void
run_program_ad_func
(
inline
void
run_program_ad_func
(
const
std
::
vector
<
paddle
::
Tensor
>&
x
,
const
std
::
vector
<
paddle
::
Tensor
>&
x
,
const
std
::
vector
<
paddle
::
Tensor
>&
params
,
const
std
::
vector
<
paddle
::
Tensor
>&
params
,
...
@@ -93,21 +129,11 @@ inline void run_program_ad_func(
...
@@ -93,21 +129,11 @@ inline void run_program_ad_func(
auto
*
backward_global_block
=
PADDLE_GET_CONST
(
auto
*
backward_global_block
=
PADDLE_GET_CONST
(
paddle
::
framework
::
BlockDesc
*
,
attrs
.
at
(
"backward_global_block"
));
paddle
::
framework
::
BlockDesc
*
,
attrs
.
at
(
"backward_global_block"
));
// Clear unused x vars
// Clear unused x vars
auto
temp_x
=
std
::
vector
<
paddle
::
Tensor
>
(
x
);
auto
filter_x
=
for
(
size_t
i
=
0
;
i
<
x
.
size
();
i
++
)
{
filte_unused_input_var_in_backward
(
x
,
backward_global_block
);
if
(
!
backward_global_block
->
HasVar
(
x
[
i
].
name
()))
{
grad_node
->
SetFwdX
(
filter_x
);
auto
fake
=
paddle
::
Tensor
(
std
::
make_shared
<
phi
::
DenseTensor
>
());
fake
.
set_name
(
"Fake_var"
);
temp_x
[
i
]
=
fake
;
}
}
grad_node
->
SetFwdX
(
temp_x
);
// Clear unused out vars
// Clear unused out vars
for
(
size_t
i
=
0
;
i
<
out
.
size
();
i
++
)
{
clear_unused_out_var_in_backward
(
out
,
backward_global_block
,
step_scope
[
0
]);
if
(
!
backward_global_block
->
HasVar
(
out
[
i
]
->
name
()))
{
step_scope
[
0
]
->
EraseVars
({
out
[
i
]
->
name
()});
}
}
grad_node
->
SetFwdParams
(
params
);
grad_node
->
SetFwdParams
(
params
);
grad_node
->
SetStepScope
(
step_scope
);
grad_node
->
SetStepScope
(
step_scope
);
...
...
paddle/fluid/eager/to_static/run_program_op_node.h
浏览文件 @
272dabd7
...
@@ -130,7 +130,7 @@ static void ShareTensorsIntoScope(const std::vector<Tensor> &tensors,
...
@@ -130,7 +130,7 @@ static void ShareTensorsIntoScope(const std::vector<Tensor> &tensors,
paddle
::
framework
::
Scope
*
scope
)
{
paddle
::
framework
::
Scope
*
scope
)
{
for
(
size_t
i
=
0
;
i
<
tensors
.
size
();
++
i
)
{
for
(
size_t
i
=
0
;
i
<
tensors
.
size
();
++
i
)
{
auto
name
=
tensors
[
i
].
name
();
auto
name
=
tensors
[
i
].
name
();
if
(
name
==
"Fake_var"
)
{
if
(
name
==
paddle
::
framework
::
kFakeVarName
)
{
continue
;
continue
;
}
}
auto
*
var
=
scope
->
Var
(
name
);
auto
*
var
=
scope
->
Var
(
name
);
...
@@ -159,8 +159,8 @@ static void ShareTensorsFromScope(
...
@@ -159,8 +159,8 @@ static void ShareTensorsFromScope(
// because we can't find them in scope. So we skip sharing these vars or
// because we can't find them in scope. So we skip sharing these vars or
// var@GRAD if they don't appear in global block.
// var@GRAD if they don't appear in global block.
auto
&
name
=
tensors
[
i
]
->
name
();
auto
&
name
=
tensors
[
i
]
->
name
();
if
(
name
==
paddle
::
framework
::
kEmptyVarName
||
name
==
"Fake_var"
||
if
(
name
==
paddle
::
framework
::
kEmptyVarName
||
!
global_block
.
HasVar
(
name
))
{
name
==
paddle
::
framework
::
kFakeVarName
||
!
global_block
.
HasVar
(
name
))
{
VLOG
(
2
)
<<
"find tensor name is "
<<
name
<<
", skip it!"
;
VLOG
(
2
)
<<
"find tensor name is "
<<
name
<<
", skip it!"
;
continue
;
continue
;
}
}
...
@@ -197,7 +197,8 @@ static void ShareTensorsFromScopeWithPartialBlock(
...
@@ -197,7 +197,8 @@ static void ShareTensorsFromScopeWithPartialBlock(
paddle
::
framework
::
Scope
*
scope
)
{
paddle
::
framework
::
Scope
*
scope
)
{
for
(
size_t
i
=
0
;
i
<
tensors
.
size
();
++
i
)
{
for
(
size_t
i
=
0
;
i
<
tensors
.
size
();
++
i
)
{
auto
&
name
=
tensors
[
i
]
->
name
();
auto
&
name
=
tensors
[
i
]
->
name
();
if
(
name
==
paddle
::
framework
::
kEmptyVarName
||
name
==
"Fake_var"
||
if
(
name
==
paddle
::
framework
::
kEmptyVarName
||
name
==
paddle
::
framework
::
kFakeVarName
||
(
!
forward_global_block
.
HasVar
(
name
)
&&
(
!
forward_global_block
.
HasVar
(
name
)
&&
!
backward_global_block
.
HasVar
(
name
)))
{
!
backward_global_block
.
HasVar
(
name
)))
{
VLOG
(
2
)
<<
"find tensor name is "
<<
name
<<
", skip it!"
;
VLOG
(
2
)
<<
"find tensor name is "
<<
name
<<
", skip it!"
;
...
...
paddle/fluid/framework/operator.h
浏览文件 @
272dabd7
...
@@ -65,6 +65,8 @@ PHI_DECLARE_int32(inner_op_parallelism);
...
@@ -65,6 +65,8 @@ PHI_DECLARE_int32(inner_op_parallelism);
namespace
paddle
{
namespace
paddle
{
namespace
framework
{
namespace
framework
{
constexpr
char
kFakeVarName
[]
=
"Fake_var"
;
/// If a variable is a empty variable, that name will be used.
/// If a variable is a empty variable, that name will be used.
constexpr
char
kEmptyVarName
[]
=
"@EMPTY@"
;
constexpr
char
kEmptyVarName
[]
=
"@EMPTY@"
;
...
...
paddle/fluid/operators/run_program_op.h
浏览文件 @
272dabd7
...
@@ -143,7 +143,7 @@ static void ShareVarsIntoScope(const std::vector<Variable *> &vars,
...
@@ -143,7 +143,7 @@ static void ShareVarsIntoScope(const std::vector<Variable *> &vars,
const
std
::
vector
<
std
::
string
>
&
var_names
,
const
std
::
vector
<
std
::
string
>
&
var_names
,
framework
::
Scope
*
scope
)
{
framework
::
Scope
*
scope
)
{
for
(
size_t
i
=
0
;
i
<
vars
.
size
();
++
i
)
{
for
(
size_t
i
=
0
;
i
<
vars
.
size
();
++
i
)
{
if
(
var_names
[
i
]
==
"Fake_var"
)
{
if
(
var_names
[
i
]
==
framework
::
kFakeVarName
)
{
continue
;
continue
;
}
}
auto
*
var
=
scope
->
Var
(
var_names
[
i
]);
auto
*
var
=
scope
->
Var
(
var_names
[
i
]);
...
@@ -162,7 +162,8 @@ static void ShareVarsFromScope(const std::vector<Variable *> &vars,
...
@@ -162,7 +162,8 @@ static void ShareVarsFromScope(const std::vector<Variable *> &vars,
// because we can't findthem in scope. So we skip sharing these vars or
// because we can't findthem in scope. So we skip sharing these vars or
// var@GRAD if they don't appear in global block.
// var@GRAD if they don't appear in global block.
if
(
var_names
[
i
]
==
framework
::
kEmptyVarName
||
if
(
var_names
[
i
]
==
framework
::
kEmptyVarName
||
var_names
[
i
]
==
"Fake_var"
||
!
global_block
.
HasVar
(
var_names
[
i
]))
{
var_names
[
i
]
==
framework
::
kFakeVarName
||
!
global_block
.
HasVar
(
var_names
[
i
]))
{
VLOG
(
2
)
<<
"find variable name is "
<<
var_names
[
i
]
<<
", skip it!"
;
VLOG
(
2
)
<<
"find variable name is "
<<
var_names
[
i
]
<<
", skip it!"
;
continue
;
continue
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录