Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Oneflow-Inc
oneflow
提交
cbf36fb9
O
oneflow
项目概览
Oneflow-Inc
/
oneflow
上一次同步 接近 3 年
通知
13
Star
2733
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oneflow
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cbf36fb9
编写于
9月 13, 2018
作者:
L
Li Xinqi
提交者:
Jinhui Yuan
9月 13, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mdupdt delayed topo (#1227)
Former-commit-id:
317267a0
上级
f6de1c9a
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
27 addition
and
10 deletion
+27
-10
oneflow/core/graph/task_graph.cpp
oneflow/core/graph/task_graph.cpp
+22
-4
oneflow/core/graph/task_graph.h
oneflow/core/graph/task_graph.h
+3
-2
oneflow/core/job/compiler.cpp
oneflow/core/job/compiler.cpp
+2
-4
未找到文件。
oneflow/core/graph/task_graph.cpp
浏览文件 @
cbf36fb9
...
@@ -73,12 +73,21 @@ void TaskGraph::GeneratePersistenceThrdId(
...
@@ -73,12 +73,21 @@ void TaskGraph::GeneratePersistenceThrdId(
}
}
}
}
void
TaskGraph
::
MdUpdtDelayedTopoForEachNode
(
std
::
function
<
void
(
TaskNode
*
node
)
>
Handler
)
const
{
HashSet
<
const
TaskNode
*>
built_nodes
;
auto
Build
=
[
&
](
TaskNode
*
node
)
{
CHECK
(
built_nodes
.
emplace
(
node
).
second
);
Handler
(
node
);
};
AcyclicTopoForEachNode
([](
TaskNode
*
node
)
{
return
node
->
GetTaskType
()
!=
kNormalMdUpdt
;
},
Build
);
AcyclicTopoForEachNode
([](
TaskNode
*
node
)
{
return
node
->
GetTaskType
()
==
kNormalMdUpdt
;
},
Build
);
ForEachNode
([
&
](
TaskNode
*
node
)
{
CHECK
(
built_nodes
.
find
(
node
)
!=
built_nodes
.
end
());
});
}
void
TaskGraph
::
AcyclicTopoForEachNode
(
std
::
function
<
bool
(
TaskNode
*
node
)
>
IsAllowedStartNode
,
void
TaskGraph
::
AcyclicTopoForEachNode
(
std
::
function
<
bool
(
TaskNode
*
node
)
>
IsAllowedStartNode
,
std
::
function
<
void
(
TaskNode
*
node
)
>
Handler
)
const
{
std
::
function
<
void
(
TaskNode
*
node
)
>
Handler
)
const
{
std
::
list
<
TaskNode
*>
starts
;
ForEachNode
([
&
](
TaskNode
*
node
)
{
if
(
node
->
in_edges
().
empty
()
&&
IsAllowedStartNode
(
node
))
{
starts
.
push_back
(
node
);
}
});
auto
ForEachInNode
=
[
&
](
TaskNode
*
node
,
const
std
::
function
<
void
(
TaskNode
*
)
>&
Handler
)
{
auto
ForEachInNode
=
[
&
](
TaskNode
*
node
,
const
std
::
function
<
void
(
TaskNode
*
)
>&
Handler
)
{
node
->
ForEachNodeOnInEdge
([
&
](
TaskNode
*
node_on_in_edge
)
{
node
->
ForEachNodeOnInEdge
([
&
](
TaskNode
*
node_on_in_edge
)
{
if
(
IsBackEdge
(
node_on_in_edge
,
node
))
return
;
if
(
IsBackEdge
(
node_on_in_edge
,
node
))
return
;
...
@@ -91,6 +100,15 @@ void TaskGraph::AcyclicTopoForEachNode(std::function<bool(TaskNode* node)> IsAll
...
@@ -91,6 +100,15 @@ void TaskGraph::AcyclicTopoForEachNode(std::function<bool(TaskNode* node)> IsAll
Handler
(
const_cast
<
TaskNode
*>
(
node_on_out_edge
));
Handler
(
const_cast
<
TaskNode
*>
(
node_on_out_edge
));
});
});
};
};
auto
IsSourceNode
=
[
&
](
TaskNode
*
node
)
{
int32_t
in_node_num
=
0
;
ForEachInNode
(
node
,
[
&
](
TaskNode
*
in_node
)
{
++
in_node_num
;
});
return
in_node_num
==
0
;
};
std
::
list
<
TaskNode
*>
starts
;
ForEachNode
([
&
](
TaskNode
*
node
)
{
if
(
IsSourceNode
(
node
)
&&
IsAllowedStartNode
(
node
))
{
starts
.
push_back
(
node
);
}
});
// DfsTopo will cause inappropriate chain graph
// DfsTopo will cause inappropriate chain graph
TopoForEachNode
(
starts
,
ForEachInNode
,
ForEachOutNode
,
Handler
);
TopoForEachNode
(
starts
,
ForEachInNode
,
ForEachOutNode
,
Handler
);
}
}
...
...
oneflow/core/graph/task_graph.h
浏览文件 @
cbf36fb9
...
@@ -57,8 +57,7 @@ class TaskGraph final : public Graph<TaskNode, TaskEdge> {
...
@@ -57,8 +57,7 @@ class TaskGraph final : public Graph<TaskNode, TaskEdge> {
void
AddOrderCtrlEdgeBetweenCopyAndMdUpdt
();
void
AddOrderCtrlEdgeBetweenCopyAndMdUpdt
();
void
RmUselessConsumeRelationshipBetweenFwBw
();
void
RmUselessConsumeRelationshipBetweenFwBw
();
void
AcyclicTopoForEachNode
(
std
::
function
<
void
(
TaskNode
*
node
)
>
Handler
)
const
;
void
AcyclicTopoForEachNode
(
std
::
function
<
void
(
TaskNode
*
node
)
>
Handler
)
const
;
void
AcyclicTopoForEachNode
(
std
::
function
<
bool
(
TaskNode
*
node
)
>
IsAllowedStartNode
,
void
MdUpdtDelayedTopoForEachNode
(
std
::
function
<
void
(
TaskNode
*
node
)
>
Handler
)
const
;
std
::
function
<
void
(
TaskNode
*
node
)
>
Handler
)
const
;
#define DECLARE_BLD_SUB_TASK_GRAPH_METHOD(method_name) void method_name BLD_SUB_TSK_GPH_MTHD_ARGS();
#define DECLARE_BLD_SUB_TASK_GRAPH_METHOD(method_name) void method_name BLD_SUB_TSK_GPH_MTHD_ARGS();
...
@@ -72,6 +71,8 @@ class TaskGraph final : public Graph<TaskNode, TaskEdge> {
...
@@ -72,6 +71,8 @@ class TaskGraph final : public Graph<TaskNode, TaskEdge> {
DECLARE_BLD_SUB_TASK_GRAPH_METHOD
(
BldSubTskGphByReduceGather2ReduceGather
);
DECLARE_BLD_SUB_TASK_GRAPH_METHOD
(
BldSubTskGphByReduceGather2ReduceGather
);
private:
private:
void
AcyclicTopoForEachNode
(
std
::
function
<
bool
(
TaskNode
*
node
)
>
IsAllowedStartNode
,
std
::
function
<
void
(
TaskNode
*
node
)
>
Handler
)
const
;
void
BuildTaskPath
(
void
BuildTaskPath
(
CompTaskNode
*
src
,
CompTaskNode
*
dst
,
CompTaskNode
*
src
,
CompTaskNode
*
dst
,
std
::
function
<
TaskNode
**
(
CompTaskNode
*
src
,
int64_t
machine_id
,
int32_t
mem_zone_id
)
>
std
::
function
<
TaskNode
**
(
CompTaskNode
*
src
,
int64_t
machine_id
,
int32_t
mem_zone_id
)
>
...
...
oneflow/core/job/compiler.cpp
浏览文件 @
cbf36fb9
...
@@ -41,6 +41,7 @@ void ToDotFile(const Plan& plan, const std::string& filepath) {
...
@@ -41,6 +41,7 @@ void ToDotFile(const Plan& plan, const std::string& filepath) {
}
}
out_stream
<<
"}
\n
"
;
out_stream
<<
"}
\n
"
;
}
}
}
// namespace
}
// namespace
Plan
Compiler
::
Compile
()
{
Plan
Compiler
::
Compile
()
{
...
@@ -101,10 +102,7 @@ Plan Compiler::DoCompile() {
...
@@ -101,10 +102,7 @@ Plan Compiler::DoCompile() {
task_gph
->
ForEachNode
(
std
::
bind
(
&
TaskNode
::
ProduceAllRegstsAndBindEdges
,
_1
));
task_gph
->
ForEachNode
(
std
::
bind
(
&
TaskNode
::
ProduceAllRegstsAndBindEdges
,
_1
));
task_gph
->
ForEachNode
(
std
::
bind
(
&
TaskNode
::
ConsumeAllRegsts
,
_1
));
task_gph
->
ForEachNode
(
std
::
bind
(
&
TaskNode
::
ConsumeAllRegsts
,
_1
));
task_gph
->
ForEachNode
(
std
::
bind
(
&
TaskNode
::
PinConsumedRegst
,
_1
));
task_gph
->
ForEachNode
(
std
::
bind
(
&
TaskNode
::
PinConsumedRegst
,
_1
));
task_gph
->
AcyclicTopoForEachNode
(
task_gph
->
MdUpdtDelayedTopoForEachNode
(
&
TaskNode
::
Build
);
[](
TaskNode
*
node
)
{
return
node
->
GetTaskType
()
!=
kNormalMdUpdt
;
},
&
TaskNode
::
Build
);
task_gph
->
AcyclicTopoForEachNode
(
[](
TaskNode
*
node
)
{
return
node
->
GetTaskType
()
==
kNormalMdUpdt
;
},
&
TaskNode
::
Build
);
task_gph
->
RemoveEmptyRegsts
();
task_gph
->
RemoveEmptyRegsts
();
task_gph
->
AddOrderingCtrlEdgeInSameChain
();
task_gph
->
AddOrderingCtrlEdgeInSameChain
();
if
(
job_desc
->
IsTrain
()
&&
job_desc
->
enable_mem_sharing
())
{
if
(
job_desc
->
IsTrain
()
&&
job_desc
->
enable_mem_sharing
())
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录