Browse Source

dynamic shape inference support

pull/1230/head
lichun 4 years ago
parent
commit
5cb5ced84b
2 changed files with 16 additions and 8 deletions
  1. +7
    -5
      ge/executor/ge_executor.cc
  2. +9
    -3
      ge/generator/ge_generator.cc

+ 7
- 5
ge/executor/ge_executor.cc View File

@@ -208,22 +208,24 @@ static void InitOpsProtoManager() {
string path = path_env;
string file_path = RealPath(path.c_str());
if (file_path.empty()) {
GELOGE(FAILED, "File path %s is invalid.", path.c_str());
GELOGE(FAILED, "[Check][EnvPath]ASCEND_OPP_PATH path [%s] is invalid.", path.c_str());
REPORT_INPUT_ERROR("E68016", "ASCEND_OPP_PATH [%s] is invalid.",
path.c_str());
return;
}
opsproto_path = (path + "/op_proto/custom/" + ":") + (path + "/op_proto/built-in/");
GELOGI("Get opsproto so path from env : %s", path.c_str());
} else {
string path_base = PluginManager::GetPath();
GELOGI("path base is %s", path_base.c_str());
path_base = path_base.substr(0, path_base.rfind("/"));
path_base = path_base.substr(0, path_base.rfind("/") + 1);
GELOGI("path_base is %s", path_base.c_str());
path_base = path_base.substr(0, path_base.rfind('/'));
path_base = path_base.substr(0, path_base.rfind('/') + 1);
opsproto_path = (path_base + "ops/op_proto/custom/" + ":") + (path_base + "ops/op_proto/built-in/");
}
GELOGI("Get opsproto path is %s", opsproto_path.c_str());
OpsProtoManager *manager = OpsProtoManager::Instance();
map<string, string> option_tmp;
option_tmp.emplace(std::pair<string ,string>(string("ge.opsProtoLibPath"), opsproto_path));
option_tmp.emplace(std::pair<string, string>(string("ge.opsProtoLibPath"), opsproto_path));
(void)manager->Initialize(option_tmp);
}



+ 9
- 3
ge/generator/ge_generator.cc View File

@@ -560,7 +560,10 @@ static Status SetModelNameForDump(GeRootModelPtr ge_root_model) {
bool is_unknown_shape = false;
Status ret = ge_root_model->CheckIsUnknownShape(is_unknown_shape);
if (ret != SUCCESS) {
GELOGE(FAILED, "Check root model is unknown shape failed.");
GELOGE(FAILED, "[Check][IsUnknownShape]Check root model is unknown shape failed, model id:%zu",
ge_root_model->GetModelId());
REPORT_CALL_ERROR("E19999", "Check root model is unknown shape failed, model id:%zu",
ge_root_model->GetModelId());
return FAILED;
}
GeModelPtr model_root = nullptr;
@@ -578,12 +581,15 @@ static Status SetModelNameForDump(GeRootModelPtr ge_root_model) {
model_name);
if (name_ret != SUCCESS) {
ErrorManager::GetInstance().ATCReportErrMessage("E10000", {"parameter"}, {"output"});
GELOGE(FAILED, "Get model_name failed. Param --output is invalid");
GELOGE(FAILED, "[Check][GetModelNameStep]Get model_name failed. Param --output is invalid,",
"root graph name: %s", ge_root_model->GetRootGraph()->GetName().c_str());
REPORT_CALL_ERROR("E19999", "Get model_name failed. Param --output is invalid,",
"root graph name: %s", ge_root_model->GetRootGraph()->GetName().c_str());
return PARAM_INVALID;
}
map<string, GeModelPtr> name_to_ge_model = ge_root_model->GetSubgraphInstanceNameToModel();
GeModelPtr &ge_model = name_to_ge_model[ge_root_model->GetRootGraph()->GetName()];
GE_RETURN_WITH_LOG_IF_FALSE(ge_model != nullptr, "ge_model cannot be null.");
GE_CHECK_NOTNULL(ge_model);
ge_model->SetName(model_name);
return SUCCESS;
}


Loading…
Cancel
Save