| @@ -37,6 +37,7 @@ enum FrameworkType { | |||||
| MINDSPORE = 1, | MINDSPORE = 1, | ||||
| TENSORFLOW = 3, | TENSORFLOW = 3, | ||||
| ANDROID_NN, | ANDROID_NN, | ||||
| ONNX, | |||||
| FRAMEWORK_RESERVED, | FRAMEWORK_RESERVED, | ||||
| }; | }; | ||||
| @@ -64,6 +64,17 @@ class ModelParser { | |||||
| */ | */ | ||||
| virtual Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) = 0; | virtual Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) = 0; | ||||
| /** | |||||
| * @ingroup domi_omg | |||||
| * @brief Parse relevant data from memory and save it to graph | |||||
| * @param [in] input Model file memory data | |||||
| * @param [in|out] graph A graph for saving the model information after analysis | |||||
| * @return SUCCESS | |||||
| * @return FAILED | |||||
| * @author | |||||
| */ | |||||
| virtual Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) = 0; | |||||
| /** | /** | ||||
| * @ingroup domi_omg | * @ingroup domi_omg | ||||
| * @brief Analyze network model data | * @brief Analyze network model data | ||||
| @@ -59,7 +59,7 @@ struct ParserContext { | |||||
| bool train_flag = false; | bool train_flag = false; | ||||
| domi::domiTensorFormat_t format = domi::DOMI_TENSOR_ND; | domi::domiTensorFormat_t format = domi::DOMI_TENSOR_ND; | ||||
| domi::FrameworkType type = domi::FRAMEWORK_RESERVED; | domi::FrameworkType type = domi::FRAMEWORK_RESERVED; | ||||
| RunMode run_mode = ONLY_PRE_CHECK; | |||||
| RunMode run_mode = GEN_OM_MODEL; | |||||
| // save caffe custom proto path, used by caffe parse | // save caffe custom proto path, used by caffe parse | ||||
| std::string custom_proto_path; | std::string custom_proto_path; | ||||
| // save caffe proto path, used by caffe parse | // save caffe proto path, used by caffe parse | ||||