Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
马赛克医院
Paddle
提交
8923612b
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,发现更多精彩内容 >>
提交
8923612b
编写于
5月 21, 2019
作者:
B
baojun
提交者:
tensor-tang
5月 22, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
NGraph enable parse serialized graph test=develop (#17453)
上级
cf5d271c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
25 deletion
+44
-25
paddle/fluid/operators/ngraph/ngraph_engine.cc
paddle/fluid/operators/ngraph/ngraph_engine.cc
+41
-22
paddle/fluid/operators/ngraph/ngraph_engine.h
paddle/fluid/operators/ngraph/ngraph_engine.h
+3
-3
未找到文件。
paddle/fluid/operators/ngraph/ngraph_engine.cc
浏览文件 @
8923612b
...
...
@@ -158,6 +158,8 @@ static void SubstituteNgraphOp(
ng_op_desc
.
SetAttr
(
"interval"
,
interval
);
ng_op_desc
.
SetAttr
(
"engine_key"
,
engine_key
);
ng_op_desc
.
SetAttr
(
"graph"
,
block_str
);
ng_op_desc
.
SetInput
(
"Xs"
,
std
::
vector
<
std
::
string
>
(
0
));
ng_op_desc
.
SetOutput
(
"Ys"
,
std
::
vector
<
std
::
string
>
(
0
));
ops
->
erase
(
ops
->
begin
()
+
interval
[
0
],
ops
->
begin
()
+
interval
[
1
]);
ops
->
insert
(
ops
->
begin
()
+
interval
[
0
],
...
...
@@ -223,20 +225,36 @@ NgraphEngine::NgraphEngine(const framework::Scope& scope,
const
platform
::
Place
&
place
,
const
framework
::
ExecutionContext
&
ctx
)
:
scope_
(
scope
),
place_
(
place
)
{
std
::
string
serialized_graph
=
ctx
.
Attr
<
std
::
string
>
(
"graph"
);
auto
interval
=
ctx
.
Attr
<
std
::
vector
<
int
>>
(
"interval"
);
std
::
string
engine_key
=
ctx
.
Attr
<
std
::
string
>
(
"engine_key"
);
var_in_node_map_
=
std
::
make_shared
<
std
::
unordered_map
<
std
::
string
,
std
::
shared_ptr
<
ngraph
::
Node
>>>
();
var_node_map_
=
std
::
make_shared
<
std
::
unordered_map
<
std
::
string
,
std
::
shared_ptr
<
ngraph
::
Node
>>>
();
GetNgFunction
(
engine_key
,
interval
);
GetNgFunction
(
ctx
);
}
void
NgraphEngine
::
Prepare
(
const
std
::
vector
<
int
>&
interval
)
{
void
NgraphEngine
::
Prepare
(
const
framework
::
ExecutionContext
&
ctx
)
{
auto
interval
=
ctx
.
Attr
<
std
::
vector
<
int
>>
(
"interval"
);
std
::
string
serialized_graph
=
ctx
.
Attr
<
std
::
string
>
(
"graph"
);
auto
input_vars
=
ctx
.
Inputs
(
"Xs"
);
if
(
!
input_vars
.
empty
())
{
feed_vars
=
input_vars
;
var_in_
=
input_vars
;
}
auto
output_vars
=
ctx
.
Outputs
(
"Ys"
);
if
(
!
output_vars
.
empty
())
{
var_out_
=
output_vars
;
}
framework
::
proto
::
BlockDesc
block_proto
;
if
(
!
serialized_graph
.
empty
())
block_proto
.
ParseFromString
(
serialized_graph
);
framework
::
BlockDesc
block_desc
(
nullptr
,
&
block_proto
);
if
(
!
serialized_graph
.
empty
())
{
NgraphEngine
::
p_bdesc
=
&
block_desc
;
}
bool
has_fetch
=
false
,
is_full
=
false
;
for
(
auto
&
var
:
p_bdesc
->
AllVars
())
{
if
(
!
(
var
->
GetType
()
==
framework
::
proto
::
VarType
::
SELECTED_ROWS
||
...
...
@@ -316,7 +334,15 @@ void NgraphEngine::Prepare(const std::vector<int>& interval) {
op_state_
=
OpState
::
UNKNOWN
;
}
BuildNgIO
(
ops_desc
,
interval
);
if
(
var_in_
.
empty
()
&&
var_out_
.
empty
())
{
BuildNgIO
(
ops_desc
,
interval
);
}
for
(
size_t
i
=
0
;
i
<
var_in_
.
size
();
++
i
)
{
auto
var_name
=
var_in_
[
i
];
if
(
persistables_
.
find
(
var_name
)
==
persistables_
.
end
())
{
var_in_updates_
.
emplace_back
(
i
);
}
}
}
void
NgraphEngine
::
BuildNgIO
(
const
std
::
vector
<
framework
::
OpDesc
*>&
ops_desc
,
...
...
@@ -392,13 +418,6 @@ void NgraphEngine::BuildNgIO(const std::vector<framework::OpDesc*>& ops_desc,
}
}
}
for
(
size_t
i
=
0
;
i
<
var_in_
.
size
();
++
i
)
{
auto
var_name
=
var_in_
[
i
];
if
(
persistables_
.
find
(
var_name
)
==
persistables_
.
end
())
{
var_in_updates_
.
emplace_back
(
i
);
}
}
}
void
NgraphEngine
::
GetNgInputShape
()
{
...
...
@@ -434,7 +453,6 @@ void NgraphEngine::BuildNgNodes() {
}
}
}
NgraphBridge
ngb
(
var_node_map_
);
for
(
auto
&
op
:
fused_ops_
)
{
ngb
.
BuildNgNode
(
op
);
...
...
@@ -448,8 +466,8 @@ void NgraphEngine::RunInferShape() {
}
}
void
NgraphEngine
::
BuildNgFunction
(
const
std
::
vector
<
int
>&
interval
)
{
Prepare
(
interval
);
void
NgraphEngine
::
BuildNgFunction
(
const
framework
::
ExecutionContext
&
ctx
)
{
Prepare
(
ctx
);
RunInferShape
();
GetNgInputShape
();
BuildNgNodes
();
...
...
@@ -472,12 +490,13 @@ void NgraphEngine::BuildNgFunction(const std::vector<int>& interval) {
std
::
make_shared
<
ngraph
::
Function
>
(
func_outputs
,
func_inputs
);
}
void
NgraphEngine
::
GetNgFunction
(
std
::
string
engine_key
,
const
std
::
vector
<
int
>&
interval
)
{
void
NgraphEngine
::
GetNgFunction
(
const
framework
::
ExecutionContext
&
ctx
)
{
auto
interval
=
ctx
.
Attr
<
std
::
vector
<
int
>>
(
"interval"
);
std
::
string
engine_key
=
ctx
.
Attr
<
std
::
string
>
(
"engine_key"
);
bool
use_cache
=
true
;
if
(
use_cache
)
{
this
->
func_cache_key_
=
""
;
for
(
int
i
=
0
;
i
<
st
d
::
min
(
static_cast
<
int
>
(
feed_vars
.
size
()),
10
);
++
i
)
{
for
(
int
i
=
0
;
i
<
st
atic_cast
<
int
>
(
feed_vars
.
size
()
);
++
i
)
{
auto
*
var
=
scope_
.
FindVar
(
feed_vars
[
i
]);
if
(
var
&&
var
->
IsType
<
framework
::
LoDTensor
>
())
{
auto
*
tensor_pd
=
GetLoDTensorOrSelectedRowsValueFromVar
(
*
var
);
...
...
@@ -507,7 +526,7 @@ void NgraphEngine::GetNgFunction(std::string engine_key,
}
if
(
engine_cache
.
find
(
func_cache_key_
)
==
engine_cache
.
end
())
{
BuildNgFunction
(
interval
);
BuildNgFunction
(
ctx
);
engine_cache
[
func_cache_key_
].
ngraph_function
=
this
->
ngraph_function_
;
engine_cache
[
func_cache_key_
].
persistables
=
this
->
persistables_
;
engine_cache
[
func_cache_key_
].
var_in_updates
=
this
->
var_in_updates_
;
...
...
@@ -516,7 +535,7 @@ void NgraphEngine::GetNgFunction(std::string engine_key,
engine_cache
[
func_cache_key_
].
is_test
=
this
->
is_test_
;
}
}
else
{
BuildNgFunction
(
interval
);
BuildNgFunction
(
ctx
);
}
}
...
...
paddle/fluid/operators/ngraph/ngraph_engine.h
浏览文件 @
8923612b
...
...
@@ -101,7 +101,7 @@ class NgraphEngine {
std
::
unordered_map
<
std
::
string
,
std
::
shared_ptr
<
ngraph
::
Node
>>>
var_node_map_
;
// prepare info for ngraph engine need
void
Prepare
(
const
std
::
vector
<
int
>&
interval
);
void
Prepare
(
const
framework
::
ExecutionContext
&
ctx
);
// get ngraph engine input and output list
void
BuildNgIO
(
const
std
::
vector
<
framework
::
OpDesc
*>&
op_descs
,
const
std
::
vector
<
int
>&
interval
);
...
...
@@ -112,9 +112,9 @@ class NgraphEngine {
// run paddle RuntimeInferShape to get the tensor shape
void
RunInferShape
();
// build ngraph function call
void
BuildNgFunction
(
const
std
::
vector
<
int
>&
interval
);
void
BuildNgFunction
(
const
framework
::
ExecutionContext
&
ctx
);
// Check cache for ngraph function or otherwise build the function
void
GetNgFunction
(
std
::
string
engine_key
,
const
std
::
vector
<
int
>&
interval
);
void
GetNgFunction
(
const
framework
::
ExecutionContext
&
ctx
);
};
}
// namespace operators
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录