Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
e223cf7b
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看板
未验证
提交
e223cf7b
编写于
9月 14, 2022
作者:
P
pangyoki
提交者:
GitHub
9月 14, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
delete new executor log (#45917)
上级
0903020d
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
10 addition
and
18 deletion
+10
-18
paddle/fluid/framework/new_executor/interpretercore_util.cc
paddle/fluid/framework/new_executor/interpretercore_util.cc
+0
-8
python/paddle/fluid/executor.py
python/paddle/fluid/executor.py
+10
-10
未找到文件。
paddle/fluid/framework/new_executor/interpretercore_util.cc
浏览文件 @
e223cf7b
...
...
@@ -418,7 +418,6 @@ void build_op_func_list(const platform::Place& place,
:
var_scope
->
GetMutableScope
();
std
::
vector
<
std
::
unique_ptr
<
OperatorBase
>>
ops_unique
;
// its elements will be moved to vec_func_list
bool
flag_log_is_printed
=
false
;
// Step 1: create all ops for current block.
create_all_ops
(
block
,
&
ops_unique
);
...
...
@@ -449,13 +448,6 @@ void build_op_func_list(const platform::Place& place,
VLOG
(
6
)
<<
"Build OpFuncNode from : "
<<
op_type
;
// Print new executor log if grad op is used.
// It's only for test and will be removed later.
if
(
!
flag_log_is_printed
&&
op_type
.
find
(
"_grad"
)
!=
std
::
string
::
npos
)
{
VLOG
(
0
)
<<
"Standalone Executor is Used."
;
flag_log_is_printed
=
true
;
}
// Hot fix for variables used in dataloader, like
// 'lod_tensor_blocking_queue_0'. These variables may be created in scope,
// and it is not existed as variable in program.
...
...
python/paddle/fluid/executor.py
浏览文件 @
e223cf7b
...
...
@@ -771,9 +771,6 @@ class _ExecutorCache(object):
inner_program
=
converted_program
# print(f"Program after convert:\n {inner_program}", flush=True)
warnings
.
warn
(
"FLAGS_USE_STANDALONE_EXECUTOR and FLAGS_CONVERT_GRAPH_TO_PROGRAM is set to 1. Graph will be converted to Program and executed using new executor."
)
else
:
build_strategy
=
None
from
paddle.incubate.autograd
import
prim_enabled
,
prim2orig
...
...
@@ -789,9 +786,16 @@ class _ExecutorCache(object):
fetch_var_name
=
fetch_var_name
,
use_fetch_v2
=
True
)
# If there are multiple blocks in the program, subblock will not be executed with the new executor in temporary
if
os
.
environ
.
get
(
'FLAGS_CONVERT_GRAPH_TO_PROGRAM'
,
None
)
in
[
1
,
'1'
,
True
,
'True'
,
'true'
]
and
not
program
.
_is_start_up_program_
:
if
program
.
num_blocks
>
1
:
warnings
.
warn
(
"There are more than 1 block in program."
)
# If there are multiple blocks in the program, subblock will not be executed with the new executor in temporary
logging
.
warning
(
"There are more than 1 block in program."
)
elif
program
.
num_blocks
==
1
:
logging
.
warning
(
"There are 1 block in program."
)
else
:
logging
.
warning
(
"There are no block in program."
)
# standalone executor will apply buffer_shared_inplace_pass and
# inplace_addto_op_pass to program according to build_strategy
...
...
@@ -1654,10 +1658,6 @@ class Executor(object):
else
:
tensor
.
_copy_from
(
cpu_tensor
,
self
.
place
)
warnings
.
warn
(
"FLAGS_USE_STANDALONE_EXECUTOR is set to 1. New executor is used to execute Program."
)
return
new_exe
.
run
(
scope
,
list
(
feed
.
keys
()),
fetch_list
,
return_numpy
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录