Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
飞不过沧海
Paddle
提交
1041e18c
P
Paddle
项目概览
飞不过沧海
/
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1041e18c
编写于
3月 05, 2019
作者:
L
Liu Yiqun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refine codes.
test=develop
上级
d8a939d8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
48 deletion
+49
-48
paddle/fluid/framework/operator.cc
paddle/fluid/framework/operator.cc
+42
-46
paddle/fluid/framework/operator.h
paddle/fluid/framework/operator.h
+7
-2
未找到文件。
paddle/fluid/framework/operator.cc
浏览文件 @
1041e18c
...
...
@@ -922,62 +922,20 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
auto
*
dev_ctx
=
pool
.
Get
(
place
);
if
(
!
kernel_type_
)
{
// LOG(INFO) << "1, kernel_type is not set.";
// check if op[type] has kernel registered.
auto
&
all_op_kernels
=
AllOpKernels
();
auto
kernels_iter
=
all_op_kernels
.
find
(
type_
);
if
(
kernels_iter
==
all_op_kernels
.
end
())
{
PADDLE_THROW
(
"There are no kernels which are registered in the %s operator."
,
type_
);
}
OpKernelMap
&
kernels
=
kernels_iter
->
second
;
auto
expected_kernel_key
=
this
->
GetExpectedKernelType
(
ExecutionContext
(
*
this
,
scope
,
*
dev_ctx
,
ctx
,
nullptr
));
VLOG
(
3
)
<<
"expected_kernel_key:"
<<
expected_kernel_key
;
auto
kernel_iter
=
kernels
.
find
(
expected_kernel_key
);
#ifdef PADDLE_WITH_MKLDNN
// workaround for missing MKLDNN kernel when FLAGS_use_mkldnn env var is set
if
(
kernel_iter
==
kernels
.
end
()
&&
expected_kernel_key
.
library_type_
==
LibraryType
::
kMKLDNN
)
{
VLOG
(
3
)
<<
"missing MKLDNN kernel: fallbacking to PLAIN one"
;
expected_kernel_key
.
library_type_
=
LibraryType
::
kPlain
;
expected_kernel_key
.
data_layout_
=
DataLayout
::
kAnyLayout
;
kernel_iter
=
kernels
.
find
(
expected_kernel_key
);
}
#endif
if
(
kernel_iter
==
kernels
.
end
())
{
PADDLE_THROW
(
"op %s does not have kernel for %s"
,
type_
,
KernelTypeToString
(
expected_kernel_key
));
}
kernel_type_
.
reset
(
new
OpKernelType
(
expected_kernel_key
));
kernel_func_
.
reset
(
new
OpKernelFunc
(
kernel_iter
->
second
));
ChooseKernel
(
ctx
,
scope
,
place
);
}
// std::shared_ptr<OpKernelType> kernel_type = kernel_type_;
// std::shared_ptr<OpKernelFunc> kernel_func = kernel_func_;
std
::
vector
<
KernelConfig
>*
kernel_configs
=
// GetKernelConfig(expected_kernel_key);
GetKernelConfig
(
*
kernel_type_
);
std
::
vector
<
KernelConfig
>*
kernel_configs
=
GetKernelConfig
(
*
kernel_type_
);
// do data transformScope &transfer_scope;
std
::
vector
<
std
::
string
>
transfered_inplace_vars
;
auto
*
transfer_scope
=
// 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.
const
Scope
&
exec_scope
=
(
transfer_scope
==
nullptr
?
scope
:
*
transfer_scope
);
// if (!(expected_kernel_key.place_ == dev_ctx->GetPlace())) {
// dev_ctx = pool.Get(expected_kernel_key.place_);
if
(
!
(
kernel_type_
->
place_
==
dev_ctx
->
GetPlace
()))
{
dev_ctx
=
pool
.
Get
(
kernel_type_
->
place_
);
}
...
...
@@ -986,8 +944,6 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
this
->
InferShape
(
&
infer_shape_ctx
);
// TODO(panyx0718): ExecutionContext should only depend on RuntimeContext
// not Scope. Imperative mode only pass inputs and get outputs.
// kernel_iter->second(
// ExecutionContext(*this, exec_scope, *dev_ctx, ctx, kernel_configs));
(
*
kernel_func_
)(
ExecutionContext
(
*
this
,
exec_scope
,
*
dev_ctx
,
ctx
,
kernel_configs
));
...
...
@@ -1015,6 +971,46 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
}
}
void
OperatorWithKernel
::
ChooseKernel
(
const
RuntimeContext
&
ctx
,
const
Scope
&
scope
,
const
platform
::
Place
&
place
)
const
{
platform
::
DeviceContextPool
&
pool
=
platform
::
DeviceContextPool
::
Instance
();
auto
*
dev_ctx
=
pool
.
Get
(
place
);
// check if op[type] has kernel registered.
auto
&
all_op_kernels
=
AllOpKernels
();
auto
kernels_iter
=
all_op_kernels
.
find
(
type_
);
if
(
kernels_iter
==
all_op_kernels
.
end
())
{
PADDLE_THROW
(
"There are no kernels which are registered in the %s operator."
,
type_
);
}
OpKernelMap
&
kernels
=
kernels_iter
->
second
;
auto
expected_kernel_key
=
this
->
GetExpectedKernelType
(
ExecutionContext
(
*
this
,
scope
,
*
dev_ctx
,
ctx
,
nullptr
));
VLOG
(
3
)
<<
"expected_kernel_key:"
<<
expected_kernel_key
;
auto
kernel_iter
=
kernels
.
find
(
expected_kernel_key
);
#ifdef PADDLE_WITH_MKLDNN
// workaround for missing MKLDNN kernel when FLAGS_use_mkldnn env var is set
if
(
kernel_iter
==
kernels
.
end
()
&&
expected_kernel_key
.
library_type_
==
LibraryType
::
kMKLDNN
)
{
VLOG
(
3
)
<<
"missing MKLDNN kernel: fallbacking to PLAIN one"
;
expected_kernel_key
.
library_type_
=
LibraryType
::
kPlain
;
expected_kernel_key
.
data_layout_
=
DataLayout
::
kAnyLayout
;
kernel_iter
=
kernels
.
find
(
expected_kernel_key
);
}
#endif
if
(
kernel_iter
==
kernels
.
end
())
{
PADDLE_THROW
(
"op %s does not have kernel for %s"
,
type_
,
KernelTypeToString
(
expected_kernel_key
));
}
kernel_type_
.
reset
(
new
OpKernelType
(
expected_kernel_key
));
kernel_func_
.
reset
(
new
OpKernelFunc
(
kernel_iter
->
second
));
}
void
OperatorWithKernel
::
TransferInplaceVarsBack
(
const
Scope
&
scope
,
const
std
::
vector
<
std
::
string
>&
inplace_vars
,
const
Scope
&
transfer_scope
)
const
{
...
...
paddle/fluid/framework/operator.h
浏览文件 @
1041e18c
...
...
@@ -16,9 +16,11 @@ limitations under the License. */
#include <algorithm>
#include <atomic>
#include <memory>
#include <string>
#include <tuple>
#include <unordered_map>
#include <utility>
#include <vector>
#include "glog/logging.h" // For VLOG
...
...
@@ -539,10 +541,13 @@ class OperatorWithKernel : public OperatorBase {
const
std
::
vector
<
std
::
string
>&
inplace_vars
,
const
Scope
&
exec_scope
)
const
;
void
ChooseKernel
(
const
RuntimeContext
&
ctx
,
const
Scope
&
scope
,
const
platform
::
Place
&
place
)
const
;
protected:
mutable
OpKernelConfigsMap
kernel_configs_map_
;
mutable
std
::
shared
_ptr
<
OpKernelType
>
kernel_type_
;
mutable
std
::
shared
_ptr
<
OpKernelFunc
>
kernel_func_
;
mutable
std
::
unique
_ptr
<
OpKernelType
>
kernel_type_
;
mutable
std
::
unique
_ptr
<
OpKernelFunc
>
kernel_func_
;
};
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录