Browse Source

single op add check json file

pull/532/head
wxl 5 years ago
parent
commit
e973313419
2 changed files with 6 additions and 3 deletions
  1. +3
    -3
      ge/offline/single_op_parser.cc
  2. +3
    -0
      ge/offline/single_op_parser.h

+ 3
- 3
ge/offline/single_op_parser.cc View File

@@ -210,7 +210,7 @@ void from_json(const Json &j, SingleOpTensorDesc &desc) {
if (dynamic_input_name != j.end()) {
desc.dynamic_input_name = dynamic_input_name->get<string>();
}
SingleOpParser::json_op_valid_result_.emplace_back(tensor_verify_result);
SingleOpParser::AppendJsonTensorVerifyResult(tensor_verify_result);
}

void from_json(const Json &j, SingleOpAttr &attr) {
@@ -360,7 +360,7 @@ bool SingleOpParser::Validate(const SingleOpDesc &op_desc) {
}

Status ValidateSingleOpJson() {
for (const auto &r : json_op_valid_result_) {
for (const auto &r : GetJsonTensorVerifyResult()) {
if (!r.is_format_valid) {
string err_str = "json tensor format invalid.Tensor name is [" + r.tensor_name + "], format is " + r.format;
GE_ERRORLOG_AND_ERRORMSG(PARAM_INVALID, err_str);
@@ -372,7 +372,7 @@ Status ValidateSingleOpJson() {
return PARAM_INVALID;
}
}
json_op_valid_result_.clear();
ClearJsonTensorVerifyResult();
return SUCCESS;
}



+ 3
- 0
ge/offline/single_op_parser.h View File

@@ -80,6 +80,9 @@ class SingleOpParser {
static Status ReadJsonFile(const std::string &file, nlohmann::json &json_obj);
static bool Validate(const SingleOpDesc &op_desc);
static Status ValidateSingleOpJson();
static void AppendJsonTensorVerifyResult(JsonTensorVeriry result) { json_op_valid_result_.emplace_back(result); }
static void ClearJsonTensorVerifyResult() { json_op_valid_result_.clear(); }
static std::vector<JsonTensorVeriry> GetJsonTensorVerifyResult() { return json_op_valid_result_; }
static std::unique_ptr<OpDesc> CreateOpDesc(const std::string &op_type);
static Status ConvertToBuildParam(int index, const SingleOpDesc &single_op_desc, SingleOpBuildParam &build_param);
static Status UpdateDynamicTensorName(std::vector<SingleOpTensorDesc> &desc);


Loading…
Cancel
Save