From f2a29576257b28ded1e1644053c3ae6653586d2f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=82=A8=EA=B6=81=EC=84=9D/On-Device=20Lab=28SR=29/Enginee?= =?utf8?q?r/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 21 May 2019 11:11:20 +0900 Subject: [PATCH] [moco/ONNX] Change parameter of convert_graph (#3547) For checking opset version of ONNX, onnx ModelProto is needed. But until now, convert_graph has GraphProto, not ModelProto. This commit will pass ModelProto parameter instead of GraphProto Signed-off-by: Seok NamKoong --- contrib/moco/lib/frontend/onnx/src/Frontend.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/moco/lib/frontend/onnx/src/Frontend.cpp b/contrib/moco/lib/frontend/onnx/src/Frontend.cpp index e327b72..43847c6 100644 --- a/contrib/moco/lib/frontend/onnx/src/Frontend.cpp +++ b/contrib/moco/lib/frontend/onnx/src/Frontend.cpp @@ -71,7 +71,7 @@ void load_onnx(const std::string &path, moco::onnx::Frontend::FileType type, } } -void convert_graph(::onnx::GraphProto &onnx_graph_proto, loco::Graph *graph) +void convert_graph(::onnx::ModelProto &onnx_model_proto, loco::Graph *graph) { auto nodes = stdex::make_unique(); auto input_names = stdex::make_unique(); @@ -84,6 +84,9 @@ void convert_graph(::onnx::GraphProto &onnx_graph_proto, loco::Graph *graph) // 3. Set graph input // 4. Create loco::Push node and set input and set graph output + assert(onnx_model_proto.has_graph()); + ::onnx::GraphProto onnx_graph_proto = onnx_model_proto.graph(); + // 1. Convert all the nodes to loco::Node for (const auto &n : onnx_graph_proto.node()) { @@ -174,15 +177,12 @@ Frontend::Frontend() std::unique_ptr Frontend::load(const char *modelfile, FileType type) const { ::onnx::ModelProto onnx_model_proto; - ::onnx::GraphProto onnx_graph_proto; load_onnx(modelfile, type, onnx_model_proto); - onnx_graph_proto = onnx_model_proto.graph(); - auto graph = loco::make_graph(); - convert_graph(onnx_graph_proto, graph.get()); + convert_graph(onnx_model_proto, graph.get()); return std::move(graph); } -- 2.7.4