Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
d4674dab
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
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看板
提交
d4674dab
编写于
3月 01, 2019
作者:
L
Liu Yiqun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cache the chosen kernel of operators'.
test=develop
上级
31d830de
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
47 addition
and
28 deletion
+47
-28
paddle/fluid/framework/operator.cc
paddle/fluid/framework/operator.cc
+45
-28
paddle/fluid/framework/operator.h
paddle/fluid/framework/operator.h
+2
-0
未找到文件。
paddle/fluid/framework/operator.cc
浏览文件 @
d4674dab
...
@@ -921,12 +921,15 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
...
@@ -921,12 +921,15 @@ void OperatorWithKernel::RunImpl(const Scope& 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
);
if
(
!
kernel_type_
)
{
// LOG(INFO) << "1, kernel_type is not set.";
// check if op[type] has kernel registered.
// check if op[type] has kernel registered.
auto
&
all_op_kernels
=
AllOpKernels
();
auto
&
all_op_kernels
=
AllOpKernels
();
auto
kernels_iter
=
all_op_kernels
.
find
(
type_
);
auto
kernels_iter
=
all_op_kernels
.
find
(
type_
);
if
(
kernels_iter
==
all_op_kernels
.
end
())
{
if
(
kernels_iter
==
all_op_kernels
.
end
())
{
PADDLE_THROW
(
PADDLE_THROW
(
"There are no kernels which are registered in the %s operator."
,
type_
);
"There are no kernels which are registered in the %s operator."
,
type_
);
}
}
OpKernelMap
&
kernels
=
kernels_iter
->
second
;
OpKernelMap
&
kernels
=
kernels_iter
->
second
;
...
@@ -951,27 +954,41 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
...
@@ -951,27 +954,41 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
KernelTypeToString
(
expected_kernel_key
));
KernelTypeToString
(
expected_kernel_key
));
}
}
kernel_type_
.
reset
(
new
OpKernelType
(
expected_kernel_key
));
kernel_func_
.
reset
(
new
OpKernelFunc
(
kernel_iter
->
second
));
}
// std::shared_ptr<OpKernelType> kernel_type = kernel_type_;
// std::shared_ptr<OpKernelFunc> kernel_func = kernel_func_;
std
::
vector
<
KernelConfig
>*
kernel_configs
=
std
::
vector
<
KernelConfig
>*
kernel_configs
=
GetKernelConfig
(
expected_kernel_key
);
// GetKernelConfig(expected_kernel_key);
GetKernelConfig
(
*
kernel_type_
);
// 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
=
auto
*
transfer_scope
=
PrepareData
(
scope
,
expected_kernel_key
,
&
transfered_inplace_vars
,
&
ctx
);
// PrepareData(scope, expected_kernel_key, &transfered_inplace_vars,
// &ctx);
PrepareData
(
scope
,
*
kernel_type_
,
&
transfered_inplace_vars
,
&
ctx
);
// 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
=
(
transfer_scope
==
nullptr
?
scope
:
*
transfer_scope
);
(
transfer_scope
==
nullptr
?
scope
:
*
transfer_scope
);
if
(
!
(
expected_kernel_key
.
place_
==
dev_ctx
->
GetPlace
()))
{
// if (!(expected_kernel_key.place_ == dev_ctx->GetPlace())) {
dev_ctx
=
pool
.
Get
(
expected_kernel_key
.
place_
);
// dev_ctx = pool.Get(expected_kernel_key.place_);
if
(
!
(
kernel_type_
->
place_
==
dev_ctx
->
GetPlace
()))
{
dev_ctx
=
pool
.
Get
(
kernel_type_
->
place_
);
}
}
RuntimeInferShapeContext
infer_shape_ctx
(
*
this
,
exec_scope
,
ctx
);
RuntimeInferShapeContext
infer_shape_ctx
(
*
this
,
exec_scope
,
ctx
);
this
->
InferShape
(
&
infer_shape_ctx
);
this
->
InferShape
(
&
infer_shape_ctx
);
// TODO(panyx0718): ExecutionContext should only depend on RuntimeContext
// TODO(panyx0718): ExecutionContext should only depend on RuntimeContext
// not Scope. Imperative mode only pass inputs and get outputs.
// not Scope. Imperative mode only pass inputs and get outputs.
kernel_iter
->
second
(
// kernel_iter->second(
// ExecutionContext(*this, exec_scope, *dev_ctx, ctx, kernel_configs));
(
*
kernel_func_
)(
ExecutionContext
(
*
this
,
exec_scope
,
*
dev_ctx
,
ctx
,
kernel_configs
));
ExecutionContext
(
*
this
,
exec_scope
,
*
dev_ctx
,
ctx
,
kernel_configs
));
if
(
!
transfered_inplace_vars
.
empty
())
{
if
(
!
transfered_inplace_vars
.
empty
())
{
...
...
paddle/fluid/framework/operator.h
浏览文件 @
d4674dab
...
@@ -541,6 +541,8 @@ class OperatorWithKernel : public OperatorBase {
...
@@ -541,6 +541,8 @@ class OperatorWithKernel : public OperatorBase {
protected:
protected:
mutable
OpKernelConfigsMap
kernel_configs_map_
;
mutable
OpKernelConfigsMap
kernel_configs_map_
;
mutable
std
::
shared_ptr
<
OpKernelType
>
kernel_type_
;
mutable
std
::
shared_ptr
<
OpKernelFunc
>
kernel_func_
;
};
};
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录