From 395a4a8a31a457bc4c42d05e5a8ea4982ce99d29 Mon Sep 17 00:00:00 2001 From: wxl Date: Thu, 17 Dec 2020 21:21:14 +0800 Subject: [PATCH 1/6] bugfix --- ge/ir_build/ge_ir_build.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ge/ir_build/ge_ir_build.cc b/ge/ir_build/ge_ir_build.cc index f181170c..cb63c4cb 100644 --- a/ge/ir_build/ge_ir_build.cc +++ b/ge/ir_build/ge_ir_build.cc @@ -318,6 +318,13 @@ graphStatus Impl::CheckOptions(const std::map &options if (it != options_.end() && (CheckDisableReuseMemoryParamValid(it->second) != GRAPH_SUCCESS)) { return GRAPH_PARAM_INVALID; } + // Check Input Format + if (options_.find(kInputFormat) != options_.end()) { + if (!options_[kInputFormat].empty() && !ge::TypeUtils::IsFormatValid(options_[kInputFormat].c_str())) { + GELOGE(ge::PARAM_INVALID, "user input format [%s] is not found!", options_[kInputFormat].c_str()); + return GRAPH_PARAM_INVALID; + } + } return GRAPH_SUCCESS; } From 3c54d47b191951feacc8368c2af79357daaaa609 Mon Sep 17 00:00:00 2001 From: wxl Date: Fri, 18 Dec 2020 09:54:20 +0800 Subject: [PATCH 2/6] bugfix --- ge/ir_build/atc_ir_common.cc | 11 +++++++++++ ge/ir_build/atc_ir_common.h | 1 + ge/ir_build/ge_ir_build.cc | 5 +---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ge/ir_build/atc_ir_common.cc b/ge/ir_build/atc_ir_common.cc index 2a77e386..f03b2117 100755 --- a/ge/ir_build/atc_ir_common.cc +++ b/ge/ir_build/atc_ir_common.cc @@ -63,6 +63,17 @@ vector SplitInputShape(const std::string &input_shape) { } } // namespace +Status CheckInputFormat(string &input_format) { + if (input_format.empty()) { + return ge::SUCCESS; + } + if (!ge::TypeUtils::IsFormatValid(input_format.c_str())) { + GELOGE(ge::PARAM_INVALID, "user input format [%s] is not found!", input_format.c_str()); + return ge::PARAM_INVALID; + } + return ge::SUCCESS; +} + bool CheckDynamicBatchSizeInputShapeValid(unordered_map> shape_map, std::string &dynamic_batch_size) { int32_t size = 0; diff --git a/ge/ir_build/atc_ir_common.h b/ge/ir_build/atc_ir_common.h index 47361167..e7a89b63 100644 --- a/ge/ir_build/atc_ir_common.h +++ b/ge/ir_build/atc_ir_common.h @@ -75,6 +75,7 @@ Status CheckInsertOpConfParamValid(const std::string insert_op_conf); Status CheckDisableReuseMemoryParamValid(const std::string disable_reuse_memory); Status CheckEnableSingleStreamParamValid(const std::string enable_single_stream); Status CheckImplmodeParamValid(const std::string &optypelist_for_implmode, std::string &op_select_implmode); +Status CheckInputFormat(string &input_format); void PrintOptionMap(std::map &options, std::string tips); void EraseEndSemicolon(std::string ¶m); } diff --git a/ge/ir_build/ge_ir_build.cc b/ge/ir_build/ge_ir_build.cc index cb63c4cb..4c39c271 100644 --- a/ge/ir_build/ge_ir_build.cc +++ b/ge/ir_build/ge_ir_build.cc @@ -320,10 +320,7 @@ graphStatus Impl::CheckOptions(const std::map &options } // Check Input Format if (options_.find(kInputFormat) != options_.end()) { - if (!options_[kInputFormat].empty() && !ge::TypeUtils::IsFormatValid(options_[kInputFormat].c_str())) { - GELOGE(ge::PARAM_INVALID, "user input format [%s] is not found!", options_[kInputFormat].c_str()); - return GRAPH_PARAM_INVALID; - } + return CheckInputFormat(options_[kInputFormat]); } return GRAPH_SUCCESS; } From 0dfbbe1c1eb576d2851ac757f51d4c4c9333a9a4 Mon Sep 17 00:00:00 2001 From: wxl Date: Fri, 18 Dec 2020 14:09:49 +0800 Subject: [PATCH 3/6] bugfix --- ge/ir_build/atc_ir_common.cc | 6 ++++-- ge/ir_build/atc_ir_common.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ge/ir_build/atc_ir_common.cc b/ge/ir_build/atc_ir_common.cc index f03b2117..d51bbc54 100755 --- a/ge/ir_build/atc_ir_common.cc +++ b/ge/ir_build/atc_ir_common.cc @@ -63,12 +63,14 @@ vector SplitInputShape(const std::string &input_shape) { } } // namespace -Status CheckInputFormat(string &input_format) { +Status CheckInputFormat(const string &input_format) { if (input_format.empty()) { return ge::SUCCESS; } if (!ge::TypeUtils::IsFormatValid(input_format.c_str())) { - GELOGE(ge::PARAM_INVALID, "user input format [%s] is not found!", input_format.c_str()); + ErrorManager::GetInstance().ATCReportErrMessage( + "E10001", {"parameter", "value", "reason"}, {"--input_format", FLAGS_input_format, "input format is invalid!"}); + GELOGE(ge::PARAM_INVALID, "input format [%s] is invalid!", input_format.c_str()); return ge::PARAM_INVALID; } return ge::SUCCESS; diff --git a/ge/ir_build/atc_ir_common.h b/ge/ir_build/atc_ir_common.h index e7a89b63..b26c2f2b 100644 --- a/ge/ir_build/atc_ir_common.h +++ b/ge/ir_build/atc_ir_common.h @@ -75,7 +75,7 @@ Status CheckInsertOpConfParamValid(const std::string insert_op_conf); Status CheckDisableReuseMemoryParamValid(const std::string disable_reuse_memory); Status CheckEnableSingleStreamParamValid(const std::string enable_single_stream); Status CheckImplmodeParamValid(const std::string &optypelist_for_implmode, std::string &op_select_implmode); -Status CheckInputFormat(string &input_format); +Status CheckInputFormat(const string &input_format); void PrintOptionMap(std::map &options, std::string tips); void EraseEndSemicolon(std::string ¶m); } From feb37b2ff317d80c793fe99a05ec54a684d3ec13 Mon Sep 17 00:00:00 2001 From: wxl Date: Fri, 18 Dec 2020 14:34:31 +0800 Subject: [PATCH 4/6] bugfix --- inc/external/ge/ge_api_types.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/inc/external/ge/ge_api_types.h b/inc/external/ge/ge_api_types.h index cce17f93..86b8aa2b 100644 --- a/inc/external/ge/ge_api_types.h +++ b/inc/external/ge/ge_api_types.h @@ -293,6 +293,8 @@ 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"; +const std::string OP_BANK_UPDATE_FLAG = "ge.op_bank_update"; + // Graph run mode enum GraphRunMode { PREDICTION = 0, TRAIN }; @@ -366,6 +368,7 @@ static const char *const OP_COMPILER_CACHE_DIR = ge::OP_COMPILER_CACHE_DIR; static const char *const OP_COMPILER_CACHE_MODE = ge::OP_COMPILER_CACHE_MODE; static const char *const MDL_BANK_PATH = ge::MDL_BANK_PATH_FLAG.c_str(); static const char *const OP_BANK_PATH = ge::OP_BANK_PATH_FLAG.c_str(); +static const char *const OP_BANK_UPDATE = ge::OP_BANK_UPDATE_FLAG.c_str(); static const char *const OP_DEBUG_LEVEL = ge::OP_DEBUG_LEVEL.c_str(); // for interface: aclgrphBuildModel @@ -389,7 +392,8 @@ const std::set ir_builder_suppported_options = {INPUT_FORMAT, OP_COMPILER_CACHE_DIR, OP_COMPILER_CACHE_MODE, MDL_BANK_PATH, - OP_BANK_PATH}; + OP_BANK_PATH, + OP_BANK_UPDATE}; // for interface: aclgrphParse const std::set ir_parser_suppported_options = {INPUT_FORMAT, From 19091f166d720d6bdbfd708b8d615a8842658b96 Mon Sep 17 00:00:00 2001 From: wxl Date: Fri, 18 Dec 2020 14:55:09 +0800 Subject: [PATCH 5/6] bugfix --- inc/external/ge/ge_api_types.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/inc/external/ge/ge_api_types.h b/inc/external/ge/ge_api_types.h index 86b8aa2b..cce17f93 100644 --- a/inc/external/ge/ge_api_types.h +++ b/inc/external/ge/ge_api_types.h @@ -293,8 +293,6 @@ 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"; -const std::string OP_BANK_UPDATE_FLAG = "ge.op_bank_update"; - // Graph run mode enum GraphRunMode { PREDICTION = 0, TRAIN }; @@ -368,7 +366,6 @@ static const char *const OP_COMPILER_CACHE_DIR = ge::OP_COMPILER_CACHE_DIR; static const char *const OP_COMPILER_CACHE_MODE = ge::OP_COMPILER_CACHE_MODE; static const char *const MDL_BANK_PATH = ge::MDL_BANK_PATH_FLAG.c_str(); static const char *const OP_BANK_PATH = ge::OP_BANK_PATH_FLAG.c_str(); -static const char *const OP_BANK_UPDATE = ge::OP_BANK_UPDATE_FLAG.c_str(); static const char *const OP_DEBUG_LEVEL = ge::OP_DEBUG_LEVEL.c_str(); // for interface: aclgrphBuildModel @@ -392,8 +389,7 @@ const std::set ir_builder_suppported_options = {INPUT_FORMAT, OP_COMPILER_CACHE_DIR, OP_COMPILER_CACHE_MODE, MDL_BANK_PATH, - OP_BANK_PATH, - OP_BANK_UPDATE}; + OP_BANK_PATH}; // for interface: aclgrphParse const std::set ir_parser_suppported_options = {INPUT_FORMAT, From 8ddb16e8f758f29ffcd5470780ad86583557d391 Mon Sep 17 00:00:00 2001 From: wxl Date: Fri, 18 Dec 2020 15:07:06 +0800 Subject: [PATCH 6/6] bugfix --- ge/ir_build/atc_ir_common.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ge/ir_build/atc_ir_common.cc b/ge/ir_build/atc_ir_common.cc index d51bbc54..77d749de 100755 --- a/ge/ir_build/atc_ir_common.cc +++ b/ge/ir_build/atc_ir_common.cc @@ -69,7 +69,7 @@ Status CheckInputFormat(const string &input_format) { } if (!ge::TypeUtils::IsFormatValid(input_format.c_str())) { ErrorManager::GetInstance().ATCReportErrMessage( - "E10001", {"parameter", "value", "reason"}, {"--input_format", FLAGS_input_format, "input format is invalid!"}); + "E10001", {"parameter", "value", "reason"}, {"--input_format", input_format, "input format is invalid!"}); GELOGE(ge::PARAM_INVALID, "input format [%s] is invalid!", input_format.c_str()); return ge::PARAM_INVALID; }