| @@ -191,14 +191,14 @@ void from_json(const Json &j, SingleOpTensorDesc &desc) { | |||||
| } | } | ||||
| string format_str = j.at(kKeyFormat).get<string>(); | string format_str = j.at(kKeyFormat).get<string>(); | ||||
| string type_str = j.at(kKeyType).get<string>(); | string type_str = j.at(kKeyType).get<string>(); | ||||
| is_tensor_valid &&= ge::TypeUtils::IsFormatValid(format_str); | |||||
| is_tensor_valid &&= ge::TypeUtils::IsDataTypeValid(type_str); | |||||
| is_tensor_valid = is_tensor_valid && ge::TypeUtils::IsFormatValid(format_str); | |||||
| is_tensor_valid = is_tensor_valid && ge::TypeUtils::IsDataTypeValid(type_str); | |||||
| desc.format = GetValue(kFormatDict, format_str, FORMAT_RESERVED); | desc.format = GetValue(kFormatDict, format_str, FORMAT_RESERVED); | ||||
| desc.type = GetValue(kDataTypeDict, type_str, DT_UNDEFINED); | desc.type = GetValue(kDataTypeDict, type_str, DT_UNDEFINED); | ||||
| it = j.find(kKeyOriginFormat); | it = j.find(kKeyOriginFormat); | ||||
| if (it != j.end()) { | if (it != j.end()) { | ||||
| string origin_format_str = j.at(kKeyOriginFormat).get<string>(); | string origin_format_str = j.at(kKeyOriginFormat).get<string>(); | ||||
| is_tensor_valid &&= ge::TypeUtils::IsFormatValid(origin_format_str); | |||||
| is_tensor_valid = is_tensor_valid && ge::TypeUtils::IsFormatValid(origin_format_str); | |||||
| desc.ori_format = GetValue(kFormatDict, origin_format_str, FORMAT_RESERVED); | desc.ori_format = GetValue(kFormatDict, origin_format_str, FORMAT_RESERVED); | ||||
| } | } | ||||
| auto tensor_name = j.find(kKeyName); | auto tensor_name = j.find(kKeyName); | ||||
| @@ -210,7 +210,7 @@ void from_json(const Json &j, SingleOpTensorDesc &desc) { | |||||
| desc.dynamic_input_name = dynamic_input_name->get<string>(); | desc.dynamic_input_name = dynamic_input_name->get<string>(); | ||||
| } | } | ||||
| if (!is_tensor_valid) { | if (!is_tensor_valid) { | ||||
| ge::AttrUtils::SetBool(&desc, kSingleOpTensorDescValid, is_tensor_valid); | |||||
| ge::AttrUtils::SetBool(desc, kSingleOpTensorDescValid, is_tensor_valid); | |||||
| } | } | ||||
| } | } | ||||