From 8965d2207434e38405f7a947d83aab7692da62df Mon Sep 17 00:00:00 2001 From: y00500818 Date: Tue, 8 Dec 2020 11:21:30 +0800 Subject: [PATCH 1/8] add error_manager for onnx mk --- parser/onnx/CMakeLists.txt | 1 + parser/onnx/module.mk | 1 + 2 files changed, 2 insertions(+) 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 From 6cbfe70c0072deaa27bbeebba93c7e03547401dd Mon Sep 17 00:00:00 2001 From: taoxudonghaha Date: Tue, 8 Dec 2020 19:17:20 +0800 Subject: [PATCH 2/8] change python3.7 to python3 --- CMakeLists.txt | 2 +- metadef | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..4b13d69 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 220067ec17e13e5cc913e9e2c5895fcabaa5bd59 +Subproject commit 4b13d69c481624560af8854e5d9500cd5cadde8f From a155d144ee2055634d8d19a889dd484999426f3d Mon Sep 17 00:00:00 2001 From: dongduo Date: Wed, 9 Dec 2020 17:56:16 +0800 Subject: [PATCH 3/8] Fix code check --- parser/tensorflow/tensorflow_data_parser.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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; } From 635e52e91f8ebd1d90680b7836d141d14994f0e5 Mon Sep 17 00:00:00 2001 From: baker Date: Thu, 10 Dec 2020 09:24:41 +0800 Subject: [PATCH 4/8] add parse onnx model api --- parser/caffe/caffe_parser.h | 3 +++ parser/onnx/onnx_parser.h | 3 +++ parser/tensorflow/tensorflow_parser.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/parser/caffe/caffe_parser.h b/parser/caffe/caffe_parser.h index 9a252f9..d2e4701 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/onnx_parser.h b/parser/onnx/onnx_parser.h index bdb93c5..7e4c3e2 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_parser.h b/parser/tensorflow/tensorflow_parser.h index 2200a8d..8d58328 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 From 06ea27b2544404abbdc1e5f5bb9aada94d6ebb3b Mon Sep 17 00:00:00 2001 From: baker Date: Thu, 10 Dec 2020 09:36:09 +0800 Subject: [PATCH 5/8] add onnx model parse api --- parser/caffe/caffe_parser.h | 2 +- parser/onnx/onnx_parser.h | 2 +- parser/tensorflow/tensorflow_parser.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parser/caffe/caffe_parser.h b/parser/caffe/caffe_parser.h index d2e4701..072fbc0 100644 --- a/parser/caffe/caffe_parser.h +++ b/parser/caffe/caffe_parser.h @@ -55,7 +55,7 @@ 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; + return domi::SUCCESS; } /** diff --git a/parser/onnx/onnx_parser.h b/parser/onnx/onnx_parser.h index 7e4c3e2..c010f19 100644 --- a/parser/onnx/onnx_parser.h +++ b/parser/onnx/onnx_parser.h @@ -40,7 +40,7 @@ class OnnxModelParser : public domi::ModelParser { 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; + return domi::SUCCESS; } Status ParseProto(const google::protobuf::Message *proto, ge::ComputeGraphPtr &graph) override { diff --git a/parser/tensorflow/tensorflow_parser.h b/parser/tensorflow/tensorflow_parser.h index 8d58328..34ccb38 100644 --- a/parser/tensorflow/tensorflow_parser.h +++ b/parser/tensorflow/tensorflow_parser.h @@ -92,7 +92,7 @@ class TensorFlowModelParser : public domi::ModelParser { 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; + return domi::SUCCESS; } /** From ba5215ddb6e9278ec37c830d02de2c687c50184e Mon Sep 17 00:00:00 2001 From: baker Date: Thu, 10 Dec 2020 09:42:55 +0800 Subject: [PATCH 6/8] add onnx model parse api --- parser/caffe/caffe_parser.h | 2 +- parser/onnx/onnx_parser.h | 2 +- parser/tensorflow/tensorflow_parser.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parser/caffe/caffe_parser.h b/parser/caffe/caffe_parser.h index 072fbc0..d2e4701 100644 --- a/parser/caffe/caffe_parser.h +++ b/parser/caffe/caffe_parser.h @@ -55,7 +55,7 @@ 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; + return domi::SUCCESS; } /** diff --git a/parser/onnx/onnx_parser.h b/parser/onnx/onnx_parser.h index c010f19..7e4c3e2 100644 --- a/parser/onnx/onnx_parser.h +++ b/parser/onnx/onnx_parser.h @@ -40,7 +40,7 @@ class OnnxModelParser : public domi::ModelParser { 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; + return domi::SUCCESS; } Status ParseProto(const google::protobuf::Message *proto, ge::ComputeGraphPtr &graph) override { diff --git a/parser/tensorflow/tensorflow_parser.h b/parser/tensorflow/tensorflow_parser.h index 34ccb38..8d58328 100644 --- a/parser/tensorflow/tensorflow_parser.h +++ b/parser/tensorflow/tensorflow_parser.h @@ -92,7 +92,7 @@ class TensorFlowModelParser : public domi::ModelParser { 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; + return domi::SUCCESS; } /** From b49155240347fc440259caca33392e20932593e1 Mon Sep 17 00:00:00 2001 From: baker Date: Thu, 10 Dec 2020 09:46:19 +0800 Subject: [PATCH 7/8] add onnx model parse api --- parser/caffe/caffe_parser.h | 2 +- parser/onnx/onnx_parser.h | 2 +- parser/tensorflow/tensorflow_parser.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parser/caffe/caffe_parser.h b/parser/caffe/caffe_parser.h index d2e4701..3818067 100644 --- a/parser/caffe/caffe_parser.h +++ b/parser/caffe/caffe_parser.h @@ -55,7 +55,7 @@ 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; + return domi::SUCCESS; } /** diff --git a/parser/onnx/onnx_parser.h b/parser/onnx/onnx_parser.h index 7e4c3e2..5eba094 100644 --- a/parser/onnx/onnx_parser.h +++ b/parser/onnx/onnx_parser.h @@ -40,7 +40,7 @@ class OnnxModelParser : public domi::ModelParser { 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; + return domi::SUCCESS; } Status ParseProto(const google::protobuf::Message *proto, ge::ComputeGraphPtr &graph) override { diff --git a/parser/tensorflow/tensorflow_parser.h b/parser/tensorflow/tensorflow_parser.h index 8d58328..c2eee31 100644 --- a/parser/tensorflow/tensorflow_parser.h +++ b/parser/tensorflow/tensorflow_parser.h @@ -92,7 +92,7 @@ class TensorFlowModelParser : public domi::ModelParser { 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; + return domi::SUCCESS; } /** From 2320dd7a01476d20adddfeeeb8c074b5e9a58f3f Mon Sep 17 00:00:00 2001 From: zhengyuanhua Date: Thu, 10 Dec 2020 10:13:34 +0800 Subject: [PATCH 8/8] update submodule --- metadef | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadef b/metadef index 4b13d69..d19c9c5 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 4b13d69c481624560af8854e5d9500cd5cadde8f +Subproject commit d19c9c5c92f21a0335c18681dcceed44f3a54ddc