Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

job_config to cfg #5235

Merged
merged 5 commits into from
Jun 22, 2021
Merged

job_config to cfg #5235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9341070
job_config to cfg
liufengwei0103 Jun 18, 2021
9fa75fe
Merge branch 'master' into job_config_to_cfg
liufengwei0103 Jun 21, 2021
394a034
Merge branch 'master' into job_config_to_cfg
liufengwei0103 Jun 22, 2021
8fdf722
Merge branch 'master' into job_config_to_cfg
liufengwei0103 Jun 22, 2021
1589dec
Merge branch 'master' into job_config_to_cfg
oneflow-ci-bot Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions oneflow/api/python/job_build/job_build_and_infer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@ inline Maybe<void> JobBuildAndInferCtx_Close() {

inline Maybe<void> CurJobBuildAndInferCtx_CheckJob() { return JUST(GetCurInferCtx())->CheckJob(); }

inline Maybe<void> CurJobBuildAndInferCtx_SetJobConf(const std::string& serialized_job_conf) {
// parse
inline Maybe<void> CurJobBuildAndInferCtx_SetJobConf(const cfg::JobConfigProto& cfg_job_conf) {
JobConfigProto job_conf;
CHECK_OR_RETURN(TxtString2PbMessage(serialized_job_conf, &job_conf)) << "job conf parse failed";
cfg_job_conf.ToProto(&job_conf);
return JUST(GetCurInferCtx())->SetJobConf(job_conf);
}

Expand Down
5 changes: 3 additions & 2 deletions oneflow/api/python/job_build/job_build_and_infer_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ limitations under the License.
#include "oneflow/core/record/record.pb.h"
#include "oneflow/core/job/job_build_and_infer_ctx_mgr.h"
#include "oneflow/core/job/job.pb.h"
#include "oneflow/core/job/job_conf.cfg.h"
#include "oneflow/core/job/placement.pb.h"
#include "oneflow/core/operator/op_conf.pb.h"
#include "oneflow/api/python/job_build/job_build_and_infer.h"
Expand All @@ -41,8 +42,8 @@ inline void CurJobBuildAndInferCtx_CheckJob() {
return oneflow::CurJobBuildAndInferCtx_CheckJob().GetOrThrow();
}

inline void CurJobBuildAndInferCtx_SetJobConf(const std::string& serialized_job_conf) {
return oneflow::CurJobBuildAndInferCtx_SetJobConf(serialized_job_conf).GetOrThrow();
inline void CurJobBuildAndInferCtx_SetJobConf(const oneflow::cfg::JobConfigProto& cfg_job_conf) {
return oneflow::CurJobBuildAndInferCtx_SetJobConf(cfg_job_conf).GetOrThrow();
}

inline void CurJobBuildAndInferCtx_SetTrainConf(const std::string& serialized_train_conf) {
Expand Down
3 changes: 1 addition & 2 deletions oneflow/python/framework/c_api_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ def JobBuildAndInferCtx_Open(job_name):


def CurJobBuildAndInferCtx_SetJobConf(job_config_proto):
serialized_job_conf = str(job_config_proto)
oneflow._oneflow_internal.CurJobBuildAndInferCtx_SetJobConf(serialized_job_conf)
oneflow._oneflow_internal.CurJobBuildAndInferCtx_SetJobConf(job_config_proto)


def CurJobBuildAndInferCtx_SetTrainConf(train_config_proto):
Expand Down