From: 박종현/On-Device Lab(SR)/Staff Engineer/삼성전자 Date: Wed, 10 Jul 2019 04:05:48 +0000 (+0900) Subject: [moco/onnx] Remove make_dimension(uint32_t) usage (#4170) X-Git-Tag: nncc_backup~135 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc18bb990881e687728447260bf6419343707ba8;p=platform%2Fcore%2Fml%2Fnnfw.git [moco/onnx] Remove make_dimension(uint32_t) usage (#4170) This commit revises moco-onnx not to invoke deprecated make_dimension(uint32_t). Signed-off-by: Jonghyun Park --- diff --git a/contrib/moco-onnx/src/Frontend.cpp b/contrib/moco-onnx/src/Frontend.cpp index 2b5c8bc..b671529 100644 --- a/contrib/moco-onnx/src/Frontend.cpp +++ b/contrib/moco-onnx/src/Frontend.cpp @@ -179,7 +179,7 @@ void convert_graph(::onnx::ModelProto &onnx_model_proto, loco::Graph *graph) pull_node->rank(tensor.shape().dim_size()); for (uint32_t i = 0; i < pull_node->rank(); ++i) { - pull_node->dim(i) = loco::make_dimension((uint32_t)tensor.shape().dim(i).dim_value()); + pull_node->dim(i) = (uint32_t)tensor.shape().dim(i).dim_value(); } nodes->enroll(input.name(), pull_node); diff --git a/contrib/moco-onnx/src/Op/Constant_V1.cpp b/contrib/moco-onnx/src/Op/Constant_V1.cpp index f442f56..916f5fa 100644 --- a/contrib/moco-onnx/src/Op/Constant_V1.cpp +++ b/contrib/moco-onnx/src/Op/Constant_V1.cpp @@ -54,7 +54,7 @@ void Constant_V1::build(const ::onnx::NodeProto &node, GraphBuilderContext *cont for (uint32_t i = 0; i < const_node->rank(); ++i) { - const_node->dim(i) = loco::make_dimension(tensor_attribute.dims(i)); + const_node->dim(i) = tensor_attribute.dims(i); } // TODO Support other data types diff --git a/contrib/moco-onnx/src/Op/Constant_V9.cpp b/contrib/moco-onnx/src/Op/Constant_V9.cpp index d2755c9..56dc6cc 100644 --- a/contrib/moco-onnx/src/Op/Constant_V9.cpp +++ b/contrib/moco-onnx/src/Op/Constant_V9.cpp @@ -50,7 +50,7 @@ void Constant_V9::build(const ::onnx::NodeProto &node, GraphBuilderContext *cont for (uint32_t i = 0; i < const_node->rank(); ++i) { - const_node->dim(i) = loco::make_dimension(tensor_attribute.dims(i)); + const_node->dim(i) = tensor_attribute.dims(i); } // TODO Support other data types