From 635e52e91f8ebd1d90680b7836d141d14994f0e5 Mon Sep 17 00:00:00 2001 From: baker Date: Thu, 10 Dec 2020 09:24:41 +0800 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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; } /**