From 1e12c5f3e8cb7bc5b5d855555d03f9edc2f02d45 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Wed, 27 Mar 2019 14:29:03 +0900 Subject: [PATCH] Fix build error by conflict (#4873) Fix build error by operationFactory parameter change Signed-off-by: Hyeongseok Oh --- .../frontend/nnapi/wrapper/OperationFactory.cc | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc b/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc index 79f8d00..76fd55c 100644 --- a/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc +++ b/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc @@ -1106,24 +1106,25 @@ OperationFactory::OperationFactory() return new operation::MeanNode{inputs, outputs, param}; }; - _map[ANEURALNETWORKS_LOCAL_RESPONSE_NORMALIZATION] = - [](const OperationFactory::Param &init_param) { - assert(init_param.input_count == 5 && init_param.output_count == 1); + _map[ANEURALNETWORKS_LOCAL_RESPONSE_NORMALIZATION] = [](const OperationFactory::Param &init_param, + neurun::model::operand::Set &) { + assert(init_param.input_count == 5 && init_param.output_count == 1); - operand::IndexSet outputs{init_param.outputs[0]}; + operand::IndexSet outputs{init_param.outputs[0]}; - operand::IndexSet inputs{init_param.inputs[0]}; + operand::IndexSet inputs{init_param.inputs[0]}; - operation::LocalResponseNormalizationNode::Param param; - param.radius_index = operand::Index{init_param.inputs[1]}; - param.bias_index = operand::Index{init_param.inputs[2]}; - param.alpha_index = operand::Index{init_param.inputs[3]}; - param.beta_index = operand::Index{init_param.inputs[4]}; + operation::LocalResponseNormalizationNode::Param param; + param.radius_index = operand::Index{init_param.inputs[1]}; + param.bias_index = operand::Index{init_param.inputs[2]}; + param.alpha_index = operand::Index{init_param.inputs[3]}; + param.beta_index = operand::Index{init_param.inputs[4]}; - return new operation::LocalResponseNormalizationNode{inputs, outputs, param}; - }; + return new operation::LocalResponseNormalizationNode{inputs, outputs, param}; + }; - _map[ANEURALNETWORKS_DEPTH_TO_SPACE] = [](const OperationFactory::Param &init_param) { + _map[ANEURALNETWORKS_DEPTH_TO_SPACE] = [](const OperationFactory::Param &init_param, + neurun::model::operand::Set &) { assert(init_param.input_count == 2 && init_param.output_count == 1); operand::IndexSet outputs{init_param.outputs[0]}; @@ -1140,7 +1141,8 @@ OperationFactory::OperationFactory() return new operation::DepthToSpaceNode{inputs, outputs, param}; }; - _map[ANEURALNETWORKS_REDUCE_MIN_EX] = [](const OperationFactory::Param &init_param) { + _map[ANEURALNETWORKS_REDUCE_MIN_EX] = [](const OperationFactory::Param &init_param, + neurun::model::operand::Set &) { assert(init_param.input_count == 2 && init_param.output_count == 1); operand::IndexSet outputs{init_param.outputs[0]}; -- 2.7.4