Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
5c364cda
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看板
未验证
提交
5c364cda
编写于
4月 09, 2019
作者:
T
Tao Luo
提交者:
GitHub
4月 09, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16711 from luotao1/has_attr
reduce hasAttr elapsed time in RunImpl
上级
1c8b34dd
4098ba29
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
3 deletion
+15
-3
paddle/fluid/framework/operator.cc
paddle/fluid/framework/operator.cc
+12
-3
paddle/fluid/framework/operator.h
paddle/fluid/framework/operator.h
+3
-0
未找到文件。
paddle/fluid/framework/operator.cc
浏览文件 @
5c364cda
...
@@ -880,7 +880,16 @@ std::vector<KernelConfig>* OperatorWithKernel::GetKernelConfig(
...
@@ -880,7 +880,16 @@ 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
(
!
HasAttr
(
kEnableCacheRuntimeContext
))
{
// To reduce the elapsed time of HasAttr, we use bool variable to record the
// result of HasAttr.
if
(
!
enable_cache_runtime_context
&&
HasAttr
(
kEnableCacheRuntimeContext
))
enable_cache_runtime_context
=
true
;
if
(
!
enable_cache_expected_kernel
&&
HasAttr
(
kEnableCacheExpectedKernel
))
enable_cache_expected_kernel
=
true
;
if
(
!
all_kernels_must_compute_runtime_shape
&&
HasAttr
(
kAllKernelsMustComputeRuntimeShape
))
all_kernels_must_compute_runtime_shape
=
true
;
if
(
!
enable_cache_runtime_context
)
{
RuntimeContext
ctx
(
Inputs
(),
Outputs
(),
scope
);
RuntimeContext
ctx
(
Inputs
(),
Outputs
(),
scope
);
RunImpl
(
scope
,
place
,
&
ctx
);
RunImpl
(
scope
,
place
,
&
ctx
);
}
else
{
}
else
{
...
@@ -899,7 +908,7 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
...
@@ -899,7 +908,7 @@ 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
(
!
HasAttr
(
kEnableCacheExpectedKernel
)
||
!
kernel_type_
)
{
if
(
!
enable_cache_expected_kernel
||
!
kernel_type_
)
{
ChooseKernel
(
*
runtime_ctx
,
scope
,
place
);
ChooseKernel
(
*
runtime_ctx
,
scope
,
place
);
}
}
...
@@ -918,7 +927,7 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
...
@@ -918,7 +927,7 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
dev_ctx
=
pool
.
Get
(
kernel_type_
->
place_
);
dev_ctx
=
pool
.
Get
(
kernel_type_
->
place_
);
}
}
if
(
!
HasAttr
(
kAllKernelsMustComputeRuntimeShape
)
)
{
if
(
!
all_kernels_must_compute_runtime_shape
)
{
RuntimeInferShapeContext
infer_shape_ctx
(
*
this
,
exec_scope
,
*
runtime_ctx
);
RuntimeInferShapeContext
infer_shape_ctx
(
*
this
,
exec_scope
,
*
runtime_ctx
);
this
->
InferShape
(
&
infer_shape_ctx
);
this
->
InferShape
(
&
infer_shape_ctx
);
}
}
...
...
paddle/fluid/framework/operator.h
浏览文件 @
5c364cda
...
@@ -506,6 +506,9 @@ class OperatorWithKernel : public OperatorBase {
...
@@ -506,6 +506,9 @@ class OperatorWithKernel : public OperatorBase {
mutable
std
::
unique_ptr
<
OpKernelFunc
>
kernel_func_
;
mutable
std
::
unique_ptr
<
OpKernelFunc
>
kernel_func_
;
mutable
std
::
unique_ptr
<
RuntimeContext
>
runtime_ctx_
;
mutable
std
::
unique_ptr
<
RuntimeContext
>
runtime_ctx_
;
mutable
const
Scope
*
pre_scope_
=
nullptr
;
mutable
const
Scope
*
pre_scope_
=
nullptr
;
mutable
bool
enable_cache_runtime_context
=
false
;
mutable
bool
enable_cache_expected_kernel
=
false
;
mutable
bool
all_kernels_must_compute_runtime_shape
=
false
;
};
};
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录