Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
804afc51
P
Paddle
项目概览
PaddlePaddle
/
Paddle
12 个月 前同步成功
通知
2292
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
804afc51
编写于
3月 19, 2019
作者:
B
baojun
提交者:
tensor-tang
3月 20, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor ngraph fix (#16270)
* take care edge cases test=develop * use pragma test=develop
上级
9195c3bb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
16 deletion
+22
-16
paddle/fluid/operators/ngraph/ngraph_engine.cc
paddle/fluid/operators/ngraph/ngraph_engine.cc
+20
-12
paddle/fluid/operators/ngraph/ngraph_engine.h
paddle/fluid/operators/ngraph/ngraph_engine.h
+2
-4
未找到文件。
paddle/fluid/operators/ngraph/ngraph_engine.cc
浏览文件 @
804afc51
...
...
@@ -92,12 +92,10 @@ static std::vector<std::vector<int>> NgraphOpIntervals(
int
size
=
ops
->
size
();
int
left
=
0
;
while
(
left
<
size
&&
ops
->
at
(
left
)
->
Type
()
!=
framework
::
kFeedOpType
)
{
while
(
left
<
size
&&
ops
->
at
(
left
)
->
Type
()
!=
framework
::
kFeedOpType
&&
ops
->
at
(
left
)
->
Type
()
!=
framework
::
kFetchOpType
)
{
++
left
;
}
if
(
left
==
size
)
{
return
intervals
;
}
while
(
left
<
size
&&
ops
->
at
(
left
)
->
Type
()
==
framework
::
kFeedOpType
)
{
for
(
auto
&
var_name_item
:
ops
->
at
(
left
)
->
Outputs
())
{
...
...
@@ -112,10 +110,6 @@ static std::vector<std::vector<int>> NgraphOpIntervals(
while
(
right
<
size
&&
ops
->
at
(
right
)
->
Type
()
!=
framework
::
kFetchOpType
)
{
++
right
;
}
if
(
right
==
size
)
{
return
intervals
;
}
if
(
left
>=
right
)
return
intervals
;
int
index
=
right
;
while
(
index
<
size
&&
ops
->
at
(
index
)
->
Type
()
==
framework
::
kFetchOpType
)
{
...
...
@@ -127,6 +121,10 @@ static std::vector<std::vector<int>> NgraphOpIntervals(
++
index
;
}
if
(
left
==
size
||
ops
->
at
(
left
)
->
Type
()
==
framework
::
kFetchOpType
)
{
left
=
0
;
}
// (left, right - 1) represents indices between feed and fetch
int
pivot
=
left
;
while
(
pivot
<
right
)
{
...
...
@@ -234,6 +232,7 @@ NgraphEngine::NgraphEngine(const framework::Scope& scope,
}
void
NgraphEngine
::
Prepare
(
const
std
::
vector
<
int
>&
interval
)
{
bool
has_fetch
=
false
,
is_full
=
false
;
for
(
auto
&
var
:
p_bdesc
->
AllVars
())
{
if
(
!
(
var
->
GetType
()
==
framework
::
proto
::
VarType
::
SELECTED_ROWS
||
var
->
GetType
()
==
framework
::
proto
::
VarType
::
LOD_TENSOR
||
...
...
@@ -264,6 +263,9 @@ void NgraphEngine::Prepare(const std::vector<int>& interval) {
std
::
vector
<
paddle
::
framework
::
OpDesc
*>
ops_desc
;
for
(
auto
op_desc
:
p_bdesc
->
AllOps
())
{
ops_desc
.
emplace_back
(
op_desc
);
if
(
op_desc
->
Type
()
==
framework
::
kFetchOpType
)
{
has_fetch
=
true
;
}
}
for
(
auto
op_desc
:
ops_desc
)
{
...
...
@@ -276,11 +278,11 @@ void NgraphEngine::Prepare(const std::vector<int>& interval) {
if
(
interval
[
0
]
>
0
&&
ops_desc
.
at
(
interval
[
0
]
-
1
)
->
Type
()
==
framework
::
kFeedOpType
&&
interval
[
1
]
<
static_cast
<
int
>
(
ops_desc
.
size
())
&&
ops_desc
.
at
(
interval
.
at
(
1
)
)
->
Type
()
==
framework
::
kFetchOpType
)
{
this
->
op_state_
=
OpState
::
FULL
;
ops_desc
.
at
(
interval
[
1
]
)
->
Type
()
==
framework
::
kFetchOpType
)
{
is_full
=
true
;
}
if
(
this
->
op_state_
==
OpState
::
FULL
)
{
if
(
is_full
)
{
this
->
op_state_
=
this
->
is_test_
?
OpState
::
FULL_TEST
:
OpState
::
FULL_TRAIN
;
}
else
{
this
->
op_state_
=
...
...
@@ -293,7 +295,8 @@ void NgraphEngine::Prepare(const std::vector<int>& interval) {
framework
::
OpRegistry
::
CreateOp
(
*
(
ops_desc
[
idx
])));
++
idx
;
}
while
(
ops_desc
.
at
(
idx
)
->
Type
()
!=
framework
::
kFetchOpType
)
{
while
(
idx
<
static_cast
<
int
>
(
ops_desc
.
size
())
&&
ops_desc
.
at
(
idx
)
->
Type
()
!=
framework
::
kFetchOpType
)
{
auto
op_desc
=
ops_desc
.
at
(
idx
);
for
(
auto
&
var_name_item
:
op_desc
->
Inputs
())
{
for
(
auto
&
var_name
:
var_name_item
.
second
)
{
...
...
@@ -303,6 +306,10 @@ void NgraphEngine::Prepare(const std::vector<int>& interval) {
++
idx
;
}
if
(
!
has_fetch
)
{
op_state_
=
OpState
::
UNKNOWN
;
}
BuildNgIO
(
ops_desc
,
interval
);
}
...
...
@@ -378,6 +385,7 @@ 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
())
{
...
...
paddle/fluid/operators/ngraph/ngraph_engine.h
浏览文件 @
804afc51
...
...
@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#
ifndef PADDLE_FLUID_OPERATORS_NGRAPH_NGRAPH_ENGINE_H_
#define PADDLE_FLUID_OPERATORS_NGRAPH_NGRAPH_ENGINE_H_
#
pragma once
#include <memory>
#include <set>
#include <string>
...
...
@@ -35,7 +35,6 @@ enum class OpState { /* nGraph support state on ops */
PARTIAL_TRAIN
,
/* Support partial ops for train */
FULL_TEST
,
/* Support full list of ops for test */
PARTIAL_TEST
,
/* Support partial list of ops for test */
FULL
,
/* All ops supported from feed to fetch */
UNKNOWN
/* Output all for debug purpose */
};
...
...
@@ -119,4 +118,3 @@ class NgraphEngine {
}
// namespace operators
}
// namespace paddle
#endif // PADDLE_FLUID_OPERATORS_NGRAPH_NGRAPH_ENGINE_H_
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录