diff --git a/parser/common/acl_graph_parser_util.cc b/parser/common/acl_graph_parser_util.cc index eb81041..f9cc5c9 100644 --- a/parser/common/acl_graph_parser_util.cc +++ b/parser/common/acl_graph_parser_util.cc @@ -70,7 +70,10 @@ const char *const kDigitError = "is not digit"; const std::string kGraphDefaultName = "domi_default"; const char *const kOutputTypeSample = "correct sample is \"opname:index:dtype\""; const char *const kOutputTypeError = "The multiple out nodes set in output_type must be found in out_nodes."; - +static std::set kCaffeSupportInputFormatSet = {"NCHW", "ND"}; +static std::set kTfSupportInputFormatSet = {"NCHW", "NHWC", "ND", "NCDHW", "NDHWC"}; +static const char *const kCaffeFormatSupport = "only support NCHW, ND in Caffe model"; +static const char *const kTFFormatSupport = "only support NCHW, NHWC, ND, NCDHW, NDHWC in TF model"; /// The maximum length of the file. /// Based on the security coding specification and the current actual (protobuf) model size, it is determined as 2G-1 const int kMaxFileSizeLimit = INT_MAX; @@ -307,8 +310,45 @@ domi::Status AclGrphParseUtil::AclParserInitialize(const std::map> &output_nodes_info, std::vector &output_nodes_name); domi::Status ParseAclLogLevel(const std::string &log); + bool CheckAclInputFormat(const string &input_format); domi::Status ParseAclFormat(const std::string &input_format); bool ParseInputShape(const std::string &input_shape, std::unordered_map> &shape_map,