From 9af35ae1c17025d9b00ed87ee1d27622ac96a15b Mon Sep 17 00:00:00 2001 From: wxl Date: Mon, 30 Nov 2020 13:50:04 +0800 Subject: [PATCH] Bugfix: add input format check for dynamic batch --- ge/ir_build/atc_ir_common.cc | 5 +++++ metadef | 2 +- parser | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ge/ir_build/atc_ir_common.cc b/ge/ir_build/atc_ir_common.cc index eaff928b..64921c04 100755 --- a/ge/ir_build/atc_ir_common.cc +++ b/ge/ir_build/atc_ir_common.cc @@ -19,6 +19,7 @@ #include "framework/common/string_util.h" #include "framework/common/types.h" #include "framework/common/util.h" +#include "graph/utils/type_utils.h" using std::pair; using std::string; @@ -106,6 +107,10 @@ bool CheckDynamicBatchSizeInputShapeValid(unordered_map> bool CheckDynamicImagesizeInputShapeValid(unordered_map> shape_map, const std::string input_format, std::string &dynamic_image_size) { + if (!input_format.empty() && !ge::TypeUtils::IsFormatValid(input_format.c_str())) { + GELOGE(ge::PARAM_INVALID, "user input format [%s] is not found!", input_format.c_str()); + return false; + } int32_t size = 0; for (auto iter = shape_map.begin(); iter != shape_map.end(); ++iter) { vector shape = iter->second; diff --git a/metadef b/metadef index 0f5ddb10..6995fa36 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 0f5ddb10ce79ea2c01b8b9cab5ec3102879610bb +Subproject commit 6995fa3682b9e1147c5173e56192126d2f91a2b7 diff --git a/parser b/parser index cf60b0c0..742f940d 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit cf60b0c02d1a6e844fcec4202d18a069e9502b0f +Subproject commit 742f940d8868fbd2f5de19f726d6d28142bc0a6e