Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Oneflow-Inc
oneflow
提交
17549fa4
O
oneflow
项目概览
Oneflow-Inc
/
oneflow
上一次同步 2 年多
通知
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,体验更适合开发者的 AI 搜索 >>
提交
17549fa4
编写于
1月 08, 2020
作者:
L
lixinqi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refine model_io_job.cpp
上级
ba8cfc3a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
5 deletion
+17
-5
oneflow/core/job/model_io_job.cpp
oneflow/core/job/model_io_job.cpp
+6
-0
oneflow/core/job/oneflow.cpp
oneflow/core/job/oneflow.cpp
+11
-5
未找到文件。
oneflow/core/job/model_io_job.cpp
浏览文件 @
17549fa4
...
...
@@ -88,6 +88,8 @@ void MakeModelInitJob(
const
std
::
string
&
job_name
,
Job
*
job
,
const
HashMap
<
std
::
string
,
OperatorConf
>&
var_op_name2op_conf
,
const
HashMap
<
std
::
string
,
ParallelBlobConf
>&
var_op_name2parallel_blob_conf
)
{
auto
*
flag_name2flag_value
=
job
->
mutable_job_conf
()
->
mutable_flag_name2flag_value
();
(
*
flag_name2flag_value
)[
"__is_user_function__"
].
set_at_bool
(
false
);
SetModelIoDefaultJobConf
(
job
->
mutable_job_conf
(),
job_name
);
Global
<
InterUserJobInfo
>::
Get
()
->
set_global_model_init_job_name
(
job_name
);
JobBuilder
job_builder
(
job
);
...
...
@@ -128,6 +130,8 @@ void MakeModelLoadJob(
const
std
::
string
&
job_name
,
Job
*
job
,
const
HashMap
<
std
::
string
,
OperatorConf
>&
var_op_name2op_conf
,
const
HashMap
<
std
::
string
,
ParallelBlobConf
>&
var_op_name2parallel_blob_conf
)
{
auto
*
flag_name2flag_value
=
job
->
mutable_job_conf
()
->
mutable_flag_name2flag_value
();
(
*
flag_name2flag_value
)[
"__is_user_function__"
].
set_at_bool
(
false
);
SetModelIoDefaultJobConf
(
job
->
mutable_job_conf
(),
job_name
);
Global
<
InterUserJobInfo
>::
Get
()
->
set_global_model_load_job_name
(
job_name
);
JobBuilder
job_builder
(
job
);
...
...
@@ -166,6 +170,8 @@ void MakeModelSaveJob(
const
std
::
string
&
job_name
,
Job
*
job
,
const
HashMap
<
std
::
string
,
OperatorConf
>&
var_op_name2op_conf
,
const
HashMap
<
std
::
string
,
ParallelBlobConf
>&
var_op_name2parallel_blob_conf
)
{
auto
*
flag_name2flag_value
=
job
->
mutable_job_conf
()
->
mutable_flag_name2flag_value
();
(
*
flag_name2flag_value
)[
"__is_user_function__"
].
set_at_bool
(
false
);
Global
<
InterUserJobInfo
>::
Get
()
->
set_global_model_save_job_name
(
job_name
);
SetModelIoDefaultJobConf
(
job
->
mutable_job_conf
(),
job_name
);
JobBuilder
job_builder
(
job
);
...
...
oneflow/core/job/oneflow.cpp
浏览文件 @
17549fa4
...
...
@@ -679,6 +679,17 @@ REGISTER_FUNCTION_CONFIG_DEF().Bool("__is_user_function__", true, "is user defin
void
CompileAndMergePlanOnMaster
(
const
PbRpf
<
Job
>&
conf_jobs
,
Plan
*
plan
)
{
std
::
vector
<
std
::
shared_ptr
<
Job
>>
jobs
(
conf_jobs
.
size
());
FOR_RANGE
(
int
,
i
,
0
,
jobs
.
size
())
{
jobs
.
at
(
i
).
reset
(
new
Job
(
conf_jobs
.
Get
(
i
)));
}
if
(
Global
<
MachineCtx
>::
Get
()
->
IsThisMachineMaster
())
{
HashMap
<
std
::
string
,
ParallelBlobConf
>
var_op_name2parallel_blob_conf
;
FilterOpName2ParallelBlobConf
({
OperatorConf
::
kVariableConf
},
jobs
,
&
var_op_name2parallel_blob_conf
);
auto
AppendJob
=
[
&
](
Job
*
job
)
{
JobDesc
job_desc
(
job
->
job_conf
(),
jobs
.
size
());
CHECK
(
!
job_desc
.
Bool
(
"__is_user_function__"
));
jobs
.
emplace_back
(
new
Job
(
*
job
));
};
MakeModelIoJobs
(
jobs
,
var_op_name2parallel_blob_conf
,
AppendJob
);
}
std
::
vector
<
std
::
shared_ptr
<
Job
>>
function_jobs
;
function_jobs
.
reserve
(
jobs
.
size
());
FOR_RANGE
(
int
,
i
,
0
,
jobs
.
size
())
{
...
...
@@ -692,9 +703,6 @@ void CompileAndMergePlanOnMaster(const PbRpf<Job>& conf_jobs, Plan* plan) {
HashMap
<
std
::
string
,
ParallelBlobConf
>
pull_op_name2parallel_blob_conf
;
FilterOpName2ParallelBlobConf
({
OperatorConf
::
kReturnConf
},
function_jobs
,
&
pull_op_name2parallel_blob_conf
);
HashMap
<
std
::
string
,
ParallelBlobConf
>
var_op_name2parallel_blob_conf
;
FilterOpName2ParallelBlobConf
({
OperatorConf
::
kVariableConf
},
function_jobs
,
&
var_op_name2parallel_blob_conf
);
for
(
const
auto
&
pair
:
push_op_name2parallel_blob_conf
)
{
auto
push_job
=
std
::
make_shared
<
Job
>
();
MakePushJob
(
std
::
string
(
"System-Push-"
)
+
pair
.
first
,
pair
.
first
,
pair
.
second
,
...
...
@@ -707,8 +715,6 @@ void CompileAndMergePlanOnMaster(const PbRpf<Job>& conf_jobs, Plan* plan) {
pull_job
.
get
());
jobs
.
emplace_back
(
pull_job
);
}
MakeModelIoJobs
(
function_jobs
,
var_op_name2parallel_blob_conf
,
[
&
](
Job
*
job
)
{
jobs
.
emplace_back
(
new
Job
(
*
job
));
});
}
std
::
vector
<
Plan
>
sub_plans
(
jobs
.
size
());
FOR_RANGE
(
int64_t
,
i
,
0
,
jobs
.
size
())
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录