From 3c54d47b191951feacc8368c2af79357daaaa609 Mon Sep 17 00:00:00 2001
From: wxl <wanxuelei@huawei.com>
Date: Fri, 18 Dec 2020 09:54:20 +0800
Subject: [PATCH] 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<string> 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<string, vector<int64_t>> 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<std::string, std::string> &options, std::string tips);
 void EraseEndSemicolon(std::string &param);
 }
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<std::string, std::string> &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;
 }