Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
784826a4
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
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看板
提交
784826a4
编写于
3月 04, 2019
作者:
L
luotao1
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enhance cache runtime_context for different scope
test=develop
上级
2fb38c10
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
15 addition
and
8 deletion
+15
-8
paddle/fluid/framework/operator.cc
paddle/fluid/framework/operator.cc
+13
-7
paddle/fluid/framework/operator.h
paddle/fluid/framework/operator.h
+2
-1
未找到文件。
paddle/fluid/framework/operator.cc
浏览文件 @
784826a4
...
@@ -20,6 +20,7 @@ limitations under the License. */
...
@@ -20,6 +20,7 @@ limitations under the License. */
#include <string>
#include <string>
#include <vector>
#include <vector>
#include "paddle/fluid/framework/data_transform.h"
#include "paddle/fluid/framework/data_transform.h"
#include "paddle/fluid/framework/details/op_handle_base.h"
#include "paddle/fluid/framework/executor.h"
#include "paddle/fluid/framework/executor.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/op_proto_maker.h"
#include "paddle/fluid/framework/op_proto_maker.h"
...
@@ -917,13 +918,18 @@ std::vector<KernelConfig>* OperatorWithKernel::GetKernelConfig(
...
@@ -917,13 +918,18 @@ std::vector<KernelConfig>* OperatorWithKernel::GetKernelConfig(
void
OperatorWithKernel
::
RunImpl
(
const
Scope
&
scope
,
void
OperatorWithKernel
::
RunImpl
(
const
Scope
&
scope
,
const
platform
::
Place
&
place
)
const
{
const
platform
::
Place
&
place
)
const
{
if
(
!
runtime_ctx_
)
{
const
Scope
*
cur_scope
=
&
scope
;
if
(
!
runtime_ctx_
||
pre_scope_
!=
cur_scope
||
scope
.
FindVar
(
details
::
kLocalExecScopeName
))
{
// RuntimeContext is used to relate input/output names of Operator with
// RuntimeContext is used to relate input/output names of Operator with
// the corresponding variables in Scope.
// the corresponding variables in Scope.
// Since the input/output names of Operator do not change in the execution,
// In a same Scope, since the input/output names of Operator do not change
// RuntimeContext could be created only at the first iteration of
// in the execution, RuntimeContext could be created only at the first
// the execution to save the elapsed time.
// iteration of the execution to save the elapsed time.
runtime_ctx_
=
new
RuntimeContext
(
Inputs
(),
Outputs
(),
scope
);
// Note that the Scope should not be the local scope, since local scope
// would be cleaned regularly.
runtime_ctx_
.
reset
(
new
RuntimeContext
(
Inputs
(),
Outputs
(),
scope
));
pre_scope_
=
cur_scope
;
}
}
platform
::
DeviceContextPool
&
pool
=
platform
::
DeviceContextPool
::
Instance
();
platform
::
DeviceContextPool
&
pool
=
platform
::
DeviceContextPool
::
Instance
();
auto
*
dev_ctx
=
pool
.
Get
(
place
);
auto
*
dev_ctx
=
pool
.
Get
(
place
);
...
@@ -963,8 +969,8 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
...
@@ -963,8 +969,8 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
// do data transformScope &transfer_scope;
// do data transformScope &transfer_scope;
std
::
vector
<
std
::
string
>
transfered_inplace_vars
;
std
::
vector
<
std
::
string
>
transfered_inplace_vars
;
auto
*
transfer_scope
=
PrepareData
(
scope
,
expected_kernel_key
,
auto
*
transfer_scope
=
PrepareData
(
&
transfered_inplace_vars
,
runtime_ctx_
);
scope
,
expected_kernel_key
,
&
transfered_inplace_vars
,
runtime_ctx_
.
get
()
);
// exec scope is the scope that kernel actually executed on.
// exec scope is the scope that kernel actually executed on.
const
Scope
&
exec_scope
=
const
Scope
&
exec_scope
=
...
...
paddle/fluid/framework/operator.h
浏览文件 @
784826a4
...
@@ -543,7 +543,8 @@ class OperatorWithKernel : public OperatorBase {
...
@@ -543,7 +543,8 @@ class OperatorWithKernel : public OperatorBase {
protected:
protected:
mutable
OpKernelConfigsMap
kernel_configs_map_
;
mutable
OpKernelConfigsMap
kernel_configs_map_
;
mutable
RuntimeContext
*
runtime_ctx_
=
nullptr
;
mutable
std
::
unique_ptr
<
RuntimeContext
>
runtime_ctx_
;
mutable
const
Scope
*
pre_scope_
=
nullptr
;
};
};
extern
bool
OpSupportGPU
(
const
std
::
string
&
op_type
);
extern
bool
OpSupportGPU
(
const
std
::
string
&
op_type
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录