From 30bf9f420746b7ebfc8032fe11a5b62f3e83d4c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9D=B4=ED=95=9C=EC=A2=85/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84?= =?utf8?q?=EC=9E=90?= Date: Fri, 28 Sep 2018 15:01:48 +0900 Subject: [PATCH] [neurun] Update type of Node Params (#2843) Params for each node has used raw integer, this commit updates it to have use `operand::Index`. Signed-off-by: Hanjoung Lee --- runtimes/neurun/src/graph/operation/AvgPool2D.cc | 12 ++++++------ runtimes/neurun/src/graph/operation/AvgPool2D.h | 12 ++++++------ runtimes/neurun/src/graph/operation/Concat.cc | 2 +- runtimes/neurun/src/graph/operation/Concat.h | 2 +- runtimes/neurun/src/graph/operation/Conv2D.cc | 8 ++++---- runtimes/neurun/src/graph/operation/Conv2D.h | 8 ++++---- runtimes/neurun/src/graph/operation/FullyConnected.cc | 2 +- runtimes/neurun/src/graph/operation/FullyConnected.h | 2 +- runtimes/neurun/src/graph/operation/MaxPool2D.cc | 12 ++++++------ runtimes/neurun/src/graph/operation/MaxPool2D.h | 12 ++++++------ runtimes/neurun/src/graph/operation/Softmax.cc | 2 +- runtimes/neurun/src/graph/operation/Softmax.h | 2 +- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/runtimes/neurun/src/graph/operation/AvgPool2D.cc b/runtimes/neurun/src/graph/operation/AvgPool2D.cc index b2612c6..adcdd3c 100644 --- a/runtimes/neurun/src/graph/operation/AvgPool2D.cc +++ b/runtimes/neurun/src/graph/operation/AvgPool2D.cc @@ -52,13 +52,13 @@ Node::Node(const graph::operation::Node::InitParam &init_param) setInputs({init_param.inputs[0]}); setOutputs({init_param.outputs[0]}); - _param.padding_index = init_param.inputs[1]; - _param.hstride_index = init_param.inputs[2]; - _param.vstride_index = init_param.inputs[3]; + _param.padding_index = operand::Index{init_param.inputs[1]}; + _param.hstride_index = operand::Index{init_param.inputs[2]}; + _param.vstride_index = operand::Index{init_param.inputs[3]}; - _param.kw_index = init_param.inputs[4]; - _param.kh_index = init_param.inputs[5]; - _param.activation_index = init_param.inputs[6]; + _param.kw_index = operand::Index{init_param.inputs[4]}; + _param.kh_index = operand::Index{init_param.inputs[5]}; + _param.activation_index = operand::Index{init_param.inputs[6]}; } void Node::setInputs(const operand::IndexSet &indexes) diff --git a/runtimes/neurun/src/graph/operation/AvgPool2D.h b/runtimes/neurun/src/graph/operation/AvgPool2D.h index f632136..2858c9c 100644 --- a/runtimes/neurun/src/graph/operation/AvgPool2D.h +++ b/runtimes/neurun/src/graph/operation/AvgPool2D.h @@ -34,14 +34,14 @@ namespace Implicit struct Param { - int32_t kw_index; - int32_t kh_index; + operand::Index kw_index; + operand::Index kh_index; - int32_t hstride_index; - int32_t vstride_index; + operand::Index hstride_index; + operand::Index vstride_index; - int32_t padding_index; - int32_t activation_index; + operand::Index padding_index; + operand::Index activation_index; }; class Node : public graph::operation::Node diff --git a/runtimes/neurun/src/graph/operation/Concat.cc b/runtimes/neurun/src/graph/operation/Concat.cc index 952cf68..21c47c6 100644 --- a/runtimes/neurun/src/graph/operation/Concat.cc +++ b/runtimes/neurun/src/graph/operation/Concat.cc @@ -53,7 +53,7 @@ Node::Node(const graph::operation::Node::InitParam &init_param) } setOutputs({init_param.outputs[0]}); - _param.axis_index = init_param.inputs[init_param.input_count - 1]; + _param.axis_index = operand::Index{init_param.inputs[init_param.input_count - 1]}; } void Node::setOutputs(const operand::IndexSet &indexes) diff --git a/runtimes/neurun/src/graph/operation/Concat.h b/runtimes/neurun/src/graph/operation/Concat.h index 0979fd6..69aabcc 100644 --- a/runtimes/neurun/src/graph/operation/Concat.h +++ b/runtimes/neurun/src/graph/operation/Concat.h @@ -32,7 +32,7 @@ namespace Concat struct Param { - int32_t axis_index; + operand::Index axis_index; }; class Node : public graph::operation::Node diff --git a/runtimes/neurun/src/graph/operation/Conv2D.cc b/runtimes/neurun/src/graph/operation/Conv2D.cc index f88955d..61b1d79 100644 --- a/runtimes/neurun/src/graph/operation/Conv2D.cc +++ b/runtimes/neurun/src/graph/operation/Conv2D.cc @@ -52,10 +52,10 @@ Node::Node(const graph::operation::Node::InitParam &init_param) setInputs({init_param.inputs[0], init_param.inputs[1], init_param.inputs[2]}); setOutputs({init_param.outputs[0]}); - _param.padding_index = init_param.inputs[3]; - _param.hstride_index = init_param.inputs[4]; - _param.vstride_index = init_param.inputs[5]; - _param.activation_index = init_param.inputs[6]; + _param.padding_index = operand::Index{init_param.inputs[3]}; + _param.hstride_index = operand::Index{init_param.inputs[4]}; + _param.vstride_index = operand::Index{init_param.inputs[5]}; + _param.activation_index = operand::Index{init_param.inputs[6]}; } void Node::setInputs(const operand::IndexSet &indexes) diff --git a/runtimes/neurun/src/graph/operation/Conv2D.h b/runtimes/neurun/src/graph/operation/Conv2D.h index 949fb26..f9a5245 100644 --- a/runtimes/neurun/src/graph/operation/Conv2D.h +++ b/runtimes/neurun/src/graph/operation/Conv2D.h @@ -34,11 +34,11 @@ namespace Implicit struct Param { - int32_t hstride_index; - int32_t vstride_index; + operand::Index hstride_index; + operand::Index vstride_index; - int32_t padding_index; - int32_t activation_index; + operand::Index padding_index; + operand::Index activation_index; }; class Node : public graph::operation::Node diff --git a/runtimes/neurun/src/graph/operation/FullyConnected.cc b/runtimes/neurun/src/graph/operation/FullyConnected.cc index 0a6553d..db3cf05 100644 --- a/runtimes/neurun/src/graph/operation/FullyConnected.cc +++ b/runtimes/neurun/src/graph/operation/FullyConnected.cc @@ -46,7 +46,7 @@ Node::Node(const graph::operation::Node::InitParam &init_param) setInputs({init_param.inputs[0], init_param.inputs[1], init_param.inputs[2]}); setOutputs({init_param.outputs[0]}); - _param.activation_index = init_param.inputs[3]; + _param.activation_index = operand::Index{init_param.inputs[3]}; } void Node::setInputs(const operand::IndexSet &indexes) diff --git a/runtimes/neurun/src/graph/operation/FullyConnected.h b/runtimes/neurun/src/graph/operation/FullyConnected.h index 9448a22..e222be7 100644 --- a/runtimes/neurun/src/graph/operation/FullyConnected.h +++ b/runtimes/neurun/src/graph/operation/FullyConnected.h @@ -32,7 +32,7 @@ namespace FullyConnected struct Param { - int32_t activation_index; + operand::Index activation_index; }; class Node : public graph::operation::Node diff --git a/runtimes/neurun/src/graph/operation/MaxPool2D.cc b/runtimes/neurun/src/graph/operation/MaxPool2D.cc index 76648ba..eec0972 100644 --- a/runtimes/neurun/src/graph/operation/MaxPool2D.cc +++ b/runtimes/neurun/src/graph/operation/MaxPool2D.cc @@ -52,13 +52,13 @@ Node::Node(const graph::operation::Node::InitParam &init_param) setInputs({init_param.inputs[0]}); setOutputs({init_param.outputs[0]}); - _param.padding_index = init_param.inputs[1]; - _param.hstride_index = init_param.inputs[2]; - _param.vstride_index = init_param.inputs[3]; + _param.padding_index = operand::Index{init_param.inputs[1]}; + _param.hstride_index = operand::Index{init_param.inputs[2]}; + _param.vstride_index = operand::Index{init_param.inputs[3]}; - _param.kw_index = init_param.inputs[4]; - _param.kh_index = init_param.inputs[5]; - _param.activation_index = init_param.inputs[6]; + _param.kw_index = operand::Index{init_param.inputs[4]}; + _param.kh_index = operand::Index{init_param.inputs[5]}; + _param.activation_index = operand::Index{init_param.inputs[6]}; } void Node::setInputs(const operand::IndexSet &indexes) diff --git a/runtimes/neurun/src/graph/operation/MaxPool2D.h b/runtimes/neurun/src/graph/operation/MaxPool2D.h index 99e52be..203b126 100644 --- a/runtimes/neurun/src/graph/operation/MaxPool2D.h +++ b/runtimes/neurun/src/graph/operation/MaxPool2D.h @@ -34,14 +34,14 @@ namespace Implicit struct Param { - int32_t kw_index; - int32_t kh_index; + operand::Index kw_index; + operand::Index kh_index; - int32_t hstride_index; - int32_t vstride_index; + operand::Index hstride_index; + operand::Index vstride_index; - int32_t padding_index; - int32_t activation_index; + operand::Index padding_index; + operand::Index activation_index; }; class Node : public graph::operation::Node diff --git a/runtimes/neurun/src/graph/operation/Softmax.cc b/runtimes/neurun/src/graph/operation/Softmax.cc index 3b3c866..a6385a2 100644 --- a/runtimes/neurun/src/graph/operation/Softmax.cc +++ b/runtimes/neurun/src/graph/operation/Softmax.cc @@ -44,7 +44,7 @@ Node::Node(const graph::operation::Node::InitParam &init_param) setInputs({init_param.inputs[0]}); setOutputs({init_param.outputs[0]}); - _param.scale_index = init_param.inputs[1]; + _param.scale_index = operand::Index{init_param.inputs[1]}; } void Node::setInputs(const operand::IndexSet &indexes) diff --git a/runtimes/neurun/src/graph/operation/Softmax.h b/runtimes/neurun/src/graph/operation/Softmax.h index 61c7a15..8ab44f8 100644 --- a/runtimes/neurun/src/graph/operation/Softmax.h +++ b/runtimes/neurun/src/graph/operation/Softmax.h @@ -32,7 +32,7 @@ namespace Softmax struct Param { - int32_t scale_index; + operand::Index scale_index; }; class Node : public graph::operation::Node -- 2.7.4