Browse Source

single op add check json file

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

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

@@ -192,7 +192,7 @@ void from_json(const Json &j, SingleOpTensorDesc &desc) {
tensor_verify_result.is_format_valid = TypeUtils::IsFormatValid(format_str); tensor_verify_result.is_format_valid = TypeUtils::IsFormatValid(format_str);
tensor_verify_result.format = format_str; tensor_verify_result.format = format_str;
tensor_verify_result.is_dtype_valid = TypeUtils::IsFormatValid(type_str); tensor_verify_result.is_dtype_valid = TypeUtils::IsFormatValid(type_str);
tensor_verify_result.dtye = type_str;
tensor_verify_result.dtype = 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);


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

@@ -66,9 +66,6 @@ void from_json(const nlohmann::json &json, SingleOpDesc &desc);


class SingleOpParser { class SingleOpParser {
public: public:
static Status ParseSingleOpList(const std::string &file, std::vector<SingleOpBuildParam> &op_list);

private:
struct JsonTensorVeriry { struct JsonTensorVeriry {
bool is_format_valid = true; bool is_format_valid = true;
bool is_dtype_valid = true; bool is_dtype_valid = true;
@@ -76,7 +73,10 @@ class SingleOpParser {
std::string format; std::string format;
std::string dtype; std::string dtype;
}; };
public:
static Status ParseSingleOpList(const std::string &file, std::vector<SingleOpBuildParam> &op_list);


private:
static Status ReadJsonFile(const std::string &file, nlohmann::json &json_obj); static Status ReadJsonFile(const std::string &file, nlohmann::json &json_obj);
static bool Validate(const SingleOpDesc &op_desc); static bool Validate(const SingleOpDesc &op_desc);
static Status ValidateSingleOpJson(); static Status ValidateSingleOpJson();


Loading…
Cancel
Save