diff --git a/CMakeLists.txt b/CMakeLists.txt index 93b175d..def55a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ endif() option(ENABLE_OPEN_SRC "Enable graphengine compile in opensource." FALSE) if (ENABLE_OPEN_SRC) - set(HI_PYTHON python3.7) + set(HI_PYTHON python3) include(cmake/external_libs/protobuf_shared.cmake) include(cmake/external_libs/protoc.cmake) diff --git a/metadef b/metadef index 220067e..d19c9c5 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 220067ec17e13e5cc913e9e2c5895fcabaa5bd59 +Subproject commit d19c9c5c92f21a0335c18681dcceed44f3a54ddc diff --git a/parser/caffe/caffe_parser.h b/parser/caffe/caffe_parser.h index 9a252f9..3818067 100644 --- a/parser/caffe/caffe_parser.h +++ b/parser/caffe/caffe_parser.h @@ -54,6 +54,9 @@ class CaffeModelParser : public domi::ModelParser { */ Status Parse(const char *file, ge::Graph &graph) override; Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) override; + virtual Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) { + return domi::SUCCESS; + } /** * @ingroup domi_omg diff --git a/parser/onnx/CMakeLists.txt b/parser/onnx/CMakeLists.txt index 10243a1..b365317 100644 --- a/parser/onnx/CMakeLists.txt +++ b/parser/onnx/CMakeLists.txt @@ -74,6 +74,7 @@ target_link_libraries(fmk_onnx_parser PRIVATE json -lrt -ldl + error_manager ) ############ install ############ diff --git a/parser/onnx/module.mk b/parser/onnx/module.mk index f3b4ee1..4b5105a 100644 --- a/parser/onnx/module.mk +++ b/parser/onnx/module.mk @@ -50,6 +50,7 @@ LOCAL_SHARED_LIBRARIES := \ libparser_common \ libgraph \ libregister \ + liberror_manager \ LOCAL_STATIC_LIBRARIES += libmmpa diff --git a/parser/onnx/onnx_parser.h b/parser/onnx/onnx_parser.h index bdb93c5..5eba094 100644 --- a/parser/onnx/onnx_parser.h +++ b/parser/onnx/onnx_parser.h @@ -39,6 +39,9 @@ class OnnxModelParser : public domi::ModelParser { ge::DataType ConvertToGeDataType(const uint32_t type) override; Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) override { return domi::SUCCESS; } + virtual Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) { + return domi::SUCCESS; + } Status ParseProto(const google::protobuf::Message *proto, ge::ComputeGraphPtr &graph) override { return domi::SUCCESS; diff --git a/parser/tensorflow/tensorflow_data_parser.cc b/parser/tensorflow/tensorflow_data_parser.cc index d6fb085..965d73b 100644 --- a/parser/tensorflow/tensorflow_data_parser.cc +++ b/parser/tensorflow/tensorflow_data_parser.cc @@ -139,8 +139,7 @@ Status TensorFlowDataParser::CheckInputShape(const std::string &name) { // dim i = 0, means empty tensor. // dim i = -1 or -2, means unknown shape. GE_CHK_BOOL_RET_STATUS(user_input_dims_v[i] >= kValidShapeMinValue, domi::PARAM_INVALID, - "parse data node %s: shape contains placeholder ,but not designated by user", - name.c_str()); + "parse data node %s: shape contains placeholder ,but not designated by user", name.c_str()); } return SUCCESS; } diff --git a/parser/tensorflow/tensorflow_parser.h b/parser/tensorflow/tensorflow_parser.h index 2200a8d..c2eee31 100644 --- a/parser/tensorflow/tensorflow_parser.h +++ b/parser/tensorflow/tensorflow_parser.h @@ -91,6 +91,9 @@ class TensorFlowModelParser : public domi::ModelParser { Status Parse(const char *file, ge::Graph &graph) override; Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) override; + virtual Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) { + return domi::SUCCESS; + } /** * @ingroup domi_omg