From 5dd03212ebc07ef20a397df31899d65888761224 Mon Sep 17 00:00:00 2001 From: "wangwenhua1@huawei.com" Date: Fri, 18 Dec 2020 16:06:39 +0800 Subject: [PATCH] display model info --- ge/generator/ge_generator.cc | 16 ++-- ge/offline/main.cc | 36 ++++++++- ge/session/omg.cc | 110 ++++++++++++++++++++++++++++ inc/external/ge/ge_api_types.h | 3 + inc/framework/omg/omg.h | 7 ++ inc/framework/omg/omg_inner_types.h | 9 ++- 6 files changed, 171 insertions(+), 10 deletions(-) diff --git a/ge/generator/ge_generator.cc b/ge/generator/ge_generator.cc index e7f11893..ab22d2c7 100644 --- a/ge/generator/ge_generator.cc +++ b/ge/generator/ge_generator.cc @@ -510,6 +510,12 @@ bool GeGenerator::Impl::SetOmSystemInfo(AttrHolder &obj) { } void GeGenerator::Impl::DisplayModelInfo(AttrHolder &obj) { + std::string display_model; + (void)ge::GetContext().GetOption(ge::DISPLAY_MODEL_INFO, display_model); + if (display_model != "1") { + GELOGD("display_model not 1"); + return; + } // int64_t memory_size; (void)ge::AttrUtils::GetInt(obj, ATTR_MODEL_MEMORY_SIZE, memory_size); @@ -520,8 +526,8 @@ void GeGenerator::Impl::DisplayModelInfo(AttrHolder &obj) { int64_t event_num; (void)ge::AttrUtils::GetInt(obj, ATTR_MODEL_EVENT_NUM, event_num); std::cout << ATTR_MODEL_MEMORY_SIZE << "[" << memory_size << "], " << ATTR_MODEL_WEIGHT_SIZE << "[" << weight_size << - "], " << ATTR_MODEL_STREAM_NUM << "[" << stream_num << "], " << ATTR_MODEL_EVENT_NUM << "[" << event_num << "]." << - std::endl; + "], " << ATTR_MODEL_STREAM_NUM << "[" << stream_num << "], " << ATTR_MODEL_EVENT_NUM << "[" << event_num << "]." + << std::endl; // std::string atc_version; @@ -531,7 +537,7 @@ void GeGenerator::Impl::DisplayModelInfo(AttrHolder &obj) { std::string framework_type; (void)ge::AttrUtils::GetStr(obj, "framework_type", framework_type); std::cout << ATTR_MODEL_ATC_VERSION << "[" << atc_version << "], " << "soc_version" << "[" << soc_version << - "], " << "framework_type" << "[" << framework_type << "]." << std::endl; + "], " << "framework_type" << "[" << framework_type << "]." << std::endl; // int64_t modeldef_size; @@ -545,8 +551,8 @@ void GeGenerator::Impl::DisplayModelInfo(AttrHolder &obj) { int64_t task_info_size; (void)ge::AttrUtils::GetInt(obj, "task_info_size", task_info_size); std::cout << "modeldef_size" << "[" << modeldef_size << "], " << "weight_data_size" << "[" << weight_data_size << - "], " << "tbe_kernels_size" << "[" << tbe_kernels_size << "], " << "cust_aicpu_kernel_store_size" << "[" << - cust_aicpu_kernel_store_size << "], " << "task_info_size" << "[" << task_info_size << "]." << std::endl; + "], " << "tbe_kernels_size" << "[" << tbe_kernels_size << "], " << "cust_aicpu_kernel_store_size" << "[" << + cust_aicpu_kernel_store_size << "], " << "task_info_size" << "[" << task_info_size << "]." << std::endl; } Status GeGenerator::GenerateModel(const Graph &graph, const string &file_name_prefix, const vector &inputs, diff --git a/ge/offline/main.cc b/ge/offline/main.cc index b7188a85..c94e666a 100755 --- a/ge/offline/main.cc +++ b/ge/offline/main.cc @@ -202,6 +202,8 @@ DEFINE_string(mdl_bank_path, "", "Optional; model bank path"); DEFINE_string(op_bank_path, "", "Optional; op bank path"); +DEFINE_string(display_model_info, "0", "Optional; display model info"); + class GFlagUtils { public: /** @@ -307,7 +309,8 @@ class GFlagUtils { " --op_compiler_cache_dir Set the save path of operator compilation cache files.\n" "Default value: $HOME/atc_data/kernel_cache\n" " --op_compiler_cache_mode Set the operator compilation cache mode." - "Options are disable(default), enable and force(force to refresh the cache)"); + "Options are disable(default), enable and force(force to refresh the cache)" + " --display_model_info enable for display model inf; 0(default): close display, 1: open display"); gflags::ParseCommandLineNonHelpFlags(&argc, &argv, true); // Using gflags to analyze input parameters @@ -889,6 +892,16 @@ static Status ConvertModelToJson(int fwk_type, const string &model_file, const s return ret; } +static Status DisplayModelInfo(int fwk_type, const string &model_file) { + Status ret = ge::SUCCESS; + if (fwk_type == -1) { + ret = ge::DisplayModelInfo(model_file.c_str()); + return ret; + } + + return ret; +} + domi::Status GenerateModel(std::map &options, std::string output) { ge::GeGenerator ge_generator; ge::Status geRet = ge::SUCCESS; @@ -1162,6 +1175,8 @@ domi::Status GenerateOmModel() { options.insert(std::pair(string(ge::MDL_BANK_PATH_FLAG), FLAGS_mdl_bank_path)); options.insert(std::pair(string(ge::OP_BANK_PATH_FLAG), FLAGS_op_bank_path)); + + options.insert(std::pair(string(ge::DISPLAY_MODEL_INFO), FLAGS_display_model_info)); // set enable scope fusion passes SetEnableScopeFusionPasses(FLAGS_enable_scope_fusion_passes); // print atc option map @@ -1187,6 +1202,22 @@ domi::Status ConvertModelToJson() { return domi::SUCCESS; } +domi::Status DisplayModelInfo() { + // No model path passed in + GE_CHK_BOOL_TRUE_EXEC_WITH_LOG(FLAGS_om == "", + ErrorManager::GetInstance().ATCReportErrMessage("E10004", {"parameter"}, {"om"}); + return ge::FAILED, + "Input parameter[--om]'s value is empty!!"); + + // Check if the model path is valid + GE_CHK_BOOL_TRUE_EXEC_WITH_LOG( + FLAGS_om != "" && !ge::CheckInputPathValid(FLAGS_om, "--om"), + return ge::FAILED, + "model file path is invalid: %s.", FLAGS_om.c_str()); + + return DisplayModelInfo(FLAGS_framework, FLAGS_om); +} + bool CheckRet(domi::Status ret) { if (ret != domi::SUCCESS) { if (FLAGS_mode == ONLY_PRE_CHECK) { @@ -1330,6 +1361,9 @@ int main(int argc, char* argv[]) { } else if (FLAGS_mode == ge::RunMode::PBTXT_TO_JSON) { GE_CHK_BOOL_EXEC(ConvertPbtxtToJson() == domi::SUCCESS, ret = domi::FAILED; break, "ATC convert pbtxt to json execute failed!!"); + } else if (FLAGS_mode == ge::RunMode::DISPLAY_OM_INFO) { + GE_CHK_BOOL_EXEC(DisplayModelInfo() == domi::SUCCESS, ret = domi::FAILED; + break, "ATC ConvertJson execute failed!!"); } else { ErrorManager::GetInstance().ATCReportErrMessage( "E10001", {"parameter", "value", "reason"}, {"--mode", std::to_string(FLAGS_mode), kModeSupport}); diff --git a/ge/session/omg.cc b/ge/session/omg.cc index 7ff52e82..d9d5dbf8 100755 --- a/ge/session/omg.cc +++ b/ge/session/omg.cc @@ -869,6 +869,116 @@ void GetGroupName(ge::proto::ModelDef &model_def) { }); } +FMK_FUNC_HOST_VISIBILITY void PrintModelInfo(ge::proto::ModelDef *model_def) { + auto model_attr_map = model_def->mutable_attr(); + auto iter = model_attr_map->find(ATTR_MODEL_MEMORY_SIZE); + auto memory_size = (iter != model_attr_map->end()) ? iter->second.i() : -1; + iter = model_attr_map->find(ATTR_MODEL_WEIGHT_SIZE); + auto weight_size = (iter != model_attr_map->end()) ? iter->second.i() : -1; + iter = model_attr_map->find(ATTR_MODEL_STREAM_NUM); + auto stream_num = (iter != model_attr_map->end()) ? iter->second.i() : -1; + iter = model_attr_map->find(ATTR_MODEL_EVENT_NUM); + auto event_num = (iter != model_attr_map->end()) ? iter->second.i() : -1; + std::cout << ATTR_MODEL_MEMORY_SIZE << "[" << memory_size << "], " << ATTR_MODEL_WEIGHT_SIZE << "[" << weight_size << + "], " << ATTR_MODEL_STREAM_NUM << "[" << stream_num << "], " << ATTR_MODEL_EVENT_NUM << "[" << event_num << "]." + << std::endl; + + iter = model_attr_map->find(ATTR_MODEL_ATC_VERSION); + auto atc_version = (iter != model_attr_map->end()) ? iter->second.s() : ""; + iter = model_attr_map->find("soc_version"); + auto soc_version = (iter != model_attr_map->end()) ? iter->second.s() : ""; + iter = model_attr_map->find("framework_type"); + auto framework_type = (iter != model_attr_map->end()) ? iter->second.s() : ""; + std::cout << ATTR_MODEL_ATC_VERSION << "[" << atc_version << "], " << "soc_version" << "[" << soc_version << + "], " << "framework_type" << "[" << framework_type << "]." << std::endl; + + iter = model_attr_map->find("modeldef_size"); + auto modeldef_size = (iter != model_attr_map->end()) ? iter->second.i() : -1; + iter = model_attr_map->find("weight_data_size"); + auto weight_data_size = (iter != model_attr_map->end()) ? iter->second.i() : -1; + iter = model_attr_map->find("tbe_kernels_size"); + auto tbe_kernels_size = (iter != model_attr_map->end()) ? iter->second.i() : -1; + iter = model_attr_map->find("cust_aicpu_kernel_store_size"); + auto cust_aicpu_kernel_store_size = (iter != model_attr_map->end()) ? iter->second.i() : -1; + iter = model_attr_map->find("task_info_size"); + auto task_info_size = (iter != model_attr_map->end()) ? iter->second.i() : -1; + + std::cout << "modeldef_size" << "[" << modeldef_size << "], " << "weight_data_size" << "[" << weight_data_size << + "], " << "tbe_kernels_size" << "[" << tbe_kernels_size << "], " << "cust_aicpu_kernel_store_size" << "[" << + cust_aicpu_kernel_store_size << "], " << "task_info_size" << "[" << task_info_size << "]." << std::endl; +} + +FMK_FUNC_HOST_VISIBILITY Status DisplayModelInfo(const char *model_file) { + ge::proto::ModelDef model_def; + ge::ModelData model; + Status ret = GetModeldefFormFile(model_file, model, &model_def); + if (ret == SUCCESS) { + PrintModelInfo(&model_def); + } + if (model.model_data != nullptr) { + delete[] reinterpret_cast(model.model_data); + model.model_data = nullptr; + } + return ret; +} + +FMK_FUNC_HOST_VISIBILITY Status GetModeldefFormFile(const char *model_file, ge::ModelData& model, + ge::proto::ModelDef *model_def) { + GE_CHECK_NOTNULL(model_file); + + // Mode 2 does not need to verify the priority, and a default value of 0 is passed + int32_t priority = 0; + + // Load model from file + Status ret = ModelParserBase::LoadFromFile(model_file, "", priority, model); + if (ret != SUCCESS) { + GELOGE(ret, "LoadFromFile failed."); + return ret; + } + + uint8_t *model_data = nullptr; + uint32_t model_len = 0; + try { + // Parse the contents of the file to get the modeldef object + ret = ModelParserBase::ParseModelContent(model, model_data, model_len); + if (ret == SUCCESS) { + OmFileLoadHelper omFileLoadHelper; + ge::graphStatus status = omFileLoadHelper.Init(model_data, model_len); + if (status != ge::GRAPH_SUCCESS) { + GELOGE(ge::FAILED, "Om file init failed."); + if (model.model_data != nullptr) { + delete[] reinterpret_cast(model.model_data); + model.model_data = nullptr; + } + return status; + } + + ModelPartition ir_part; + status = omFileLoadHelper.GetModelPartition(MODEL_DEF, ir_part); + if (status != ge::GRAPH_SUCCESS) { + GELOGE(ge::FAILED, "Get model part failed."); + if (model.model_data != nullptr) { + delete[] reinterpret_cast(model.model_data); + model.model_data = nullptr; + } + return status; + } + + // De serialization + if (ReadProtoFromArray(ir_part.data, ir_part.size, model_def)) { + return SUCCESS; + } + return FAILED; + } else { + GELOGE(PARAM_INVALID, "ParseModelContent failed because of invalid om file. Please check --om param."); + return FAILED; + } + } catch (const std::exception &e) { + GELOGE(FAILED, "get from file failed, exception message : %s.", e.what()); + return FAILED; + } +} + FMK_FUNC_HOST_VISIBILITY Status ConvertOmModelToJson(const char *model_file, const char *json_file) { GE_CHECK_NOTNULL(model_file); GE_CHECK_NOTNULL(json_file); diff --git a/inc/external/ge/ge_api_types.h b/inc/external/ge/ge_api_types.h index cce17f93..f47b0de6 100644 --- a/inc/external/ge/ge_api_types.h +++ b/inc/external/ge/ge_api_types.h @@ -294,6 +294,9 @@ const std::string MDL_BANK_PATH_FLAG = "ge.mdl_bank_path"; // Configure op bank path const std::string OP_BANK_PATH_FLAG = "ge.op_bank_path"; +// Configure display_model_info flag +const std::string DISPLAY_MODEL_INFO = "ge.display_model_info"; + // Graph run mode enum GraphRunMode { PREDICTION = 0, TRAIN }; diff --git a/inc/framework/omg/omg.h b/inc/framework/omg/omg.h index e7ca05f7..d5238b77 100644 --- a/inc/framework/omg/omg.h +++ b/inc/framework/omg/omg.h @@ -22,6 +22,7 @@ #include #include #include "framework/omg/omg_inner_types.h" +#include "framework/common/ge_types.h" #include "framework/omg/parser/parser_inner_ctx.h" #include "proto/ge_ir.pb.h" #include "proto/om.pb.h" @@ -103,6 +104,12 @@ void GetOutputNodesNameAndIndex(std::vector> &ou void UpdateOmgCtxWithParserCtx(); void UpdateParserCtxWithOmgCtx(); + +Status GetModeldefFormFile(const char *model_file, ge::ModelData& model, ge::proto::ModelDef *model_def); + +Status DisplayModelInfo(const char *model_file); + +void PrintModelInfo(ge::proto::ModelDef *model_def); } // namespace ge namespace domi { diff --git a/inc/framework/omg/omg_inner_types.h b/inc/framework/omg/omg_inner_types.h index 454890aa..3e39fb56 100644 --- a/inc/framework/omg/omg_inner_types.h +++ b/inc/framework/omg/omg_inner_types.h @@ -43,10 +43,11 @@ namespace ge { * @brief run model */ enum RunMode { - GEN_OM_MODEL = 0, // generate offline model file - MODEL_TO_JSON = 1, // convert to JSON file - ONLY_PRE_CHECK = 3, // only for pre-check - PBTXT_TO_JSON = 5 // pbtxt to json + GEN_OM_MODEL = 0, // generate offline model file + MODEL_TO_JSON = 1, // convert to JSON file + ONLY_PRE_CHECK = 3, // only for pre-check + PBTXT_TO_JSON = 5, // pbtxt to json + DISPLAY_OM_INFO = 6 // display model info }; ///