From 18574c1df29d8547354a92f5230f9be5e7c7336d Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Wed, 5 Jun 2019 10:51:07 +0100 Subject: COMPMID-2336: Fix clang-tidy issues Change-Id: Ib9759edaae7c1ed2c5c607abf381667430cf45fc Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/1290 Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas --- arm_compute/graph/GraphBuilder.h | 20 ++++++++++---------- src/core/TensorInfo.cpp | 4 ++-- src/graph/GraphBuilder.cpp | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h index 048c693639..0aaed1da7d 100644 --- a/arm_compute/graph/GraphBuilder.h +++ b/arm_compute/graph/GraphBuilder.h @@ -83,7 +83,7 @@ public: * @return Node ID of the created node, EmptyNodeID in case of error */ static NodeID add_activation_node(Graph &g, NodeParams params, NodeIdxPair input, ActivationLayerInfo act_info, - const QuantizationInfo out_quant_info = QuantizationInfo()); + const QuantizationInfo &out_quant_info = QuantizationInfo()); /** Adds a batch normalization layer node to the graph * * @param[in] g Graph to add the node to @@ -145,8 +145,8 @@ public: Size2D kernel_spatial_extend, unsigned int depth, PadStrideInfo conv_info, unsigned int num_groups = 1, ConvolutionMethod method = ConvolutionMethod::Default, FastMathHint fast_math_hint = FastMathHint::Disabled, ITensorAccessorUPtr weights_accessor = nullptr, ITensorAccessorUPtr bias_accessor = nullptr, - const QuantizationInfo weights_quant_info = QuantizationInfo(), - const QuantizationInfo out_quant_info = QuantizationInfo()); + const QuantizationInfo &weights_quant_info = QuantizationInfo(), + const QuantizationInfo &out_quant_info = QuantizationInfo()); /** Adds a deconvolution layer node to the graph * * @param[in] g Graph to add the node to @@ -173,7 +173,7 @@ public: * * @return Node ID of the created node, EmptyNodeID in case of error */ - static NodeID add_concatenate_node(Graph &g, NodeParams params, const std::vector &inputs, descriptors::ConcatLayerDescriptor concat_descriptor); + static NodeID add_concatenate_node(Graph &g, NodeParams params, const std::vector &inputs, const descriptors::ConcatLayerDescriptor &concat_descriptor); /** Adds a depth-wise convolution layer node to the graph * * @param[in] g Graph to add the node to @@ -193,8 +193,8 @@ public: static NodeID add_depthwise_convolution_node(Graph &g, NodeParams params, NodeIdxPair input, Size2D kernel_spatial_extend, PadStrideInfo conv_info, int depth_multiplier = 1, DepthwiseConvolutionMethod method = DepthwiseConvolutionMethod::Default, - ITensorAccessorUPtr weights_accessor = nullptr, ITensorAccessorUPtr bias_accessor = nullptr, const QuantizationInfo quant_info = QuantizationInfo(), - const QuantizationInfo out_quant_info = QuantizationInfo()); + ITensorAccessorUPtr weights_accessor = nullptr, ITensorAccessorUPtr bias_accessor = nullptr, const QuantizationInfo &quant_info = QuantizationInfo(), + const QuantizationInfo &out_quant_info = QuantizationInfo()); /** Adds an element-wise layer node to the graph * * @param[in] g Graph to add the node to @@ -255,7 +255,7 @@ public: static NodeID add_fully_connected_layer(Graph &g, NodeParams params, NodeIdxPair input, unsigned int num_outputs, NodeID weights_nid, NodeID bias_nid = EmptyNodeID, const FullyConnectedLayerInfo fc_info = FullyConnectedLayerInfo(), - const QuantizationInfo out_quant_info = QuantizationInfo()); + const QuantizationInfo &out_quant_info = QuantizationInfo()); /** Adds a fully connected layer node to the graph * * @param[in] g Graph to add the layer to @@ -273,8 +273,8 @@ public: static NodeID add_fully_connected_layer(Graph &g, NodeParams params, NodeIdxPair input, unsigned int num_outputs, ITensorAccessorUPtr weights_accessor = nullptr, ITensorAccessorUPtr bias_accessor = nullptr, const FullyConnectedLayerInfo fc_info = FullyConnectedLayerInfo(), - const QuantizationInfo weights_quant_info = QuantizationInfo(), - const QuantizationInfo out_quant_info = QuantizationInfo()); + const QuantizationInfo &weights_quant_info = QuantizationInfo(), + const QuantizationInfo &out_quant_info = QuantizationInfo()); /** Adds a generate proposals layer node to the graph * * @param[in] g Graph to add the layer to @@ -363,7 +363,7 @@ public: * * @return Node ID of the created node, EmptyNodeID in case of error */ - static NodeID add_quantization_node(Graph &g, NodeParams params, NodeIdxPair input, QuantizationInfo out_quant_info); + static NodeID add_quantization_node(Graph &g, NodeParams params, NodeIdxPair input, const QuantizationInfo &out_quant_info); /** Adds a reorg layer node to the graph * * @param[in] g Graph to add the node to diff --git a/src/core/TensorInfo.cpp b/src/core/TensorInfo.cpp index b77a47e3e1..1059cf2497 100644 --- a/src/core/TensorInfo.cpp +++ b/src/core/TensorInfo.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 ARM Limited. + * Copyright (c) 2016-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -87,7 +87,7 @@ TensorInfo::TensorInfo(const TensorShape &tensor_shape, size_t num_channels, Dat : TensorInfo() { init(tensor_shape, num_channels, data_type); - _quantization_info = quantization_info; + _quantization_info = std::move(quantization_info); } TensorInfo::TensorInfo(const HOGInfo &hog_info, unsigned int width, unsigned int height) diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index 4626b581ab..68385aa30c 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -134,7 +134,7 @@ NodeID GraphBuilder::add_output_node(Graph &g, NodeParams params, NodeIdxPair in } NodeID GraphBuilder::add_activation_node(Graph &g, NodeParams params, NodeIdxPair input, ActivationLayerInfo act_info, - const QuantizationInfo out_quant_info) + const QuantizationInfo &out_quant_info) { return create_simple_single_input_output_node(g, params, input, act_info, out_quant_info); } @@ -214,8 +214,8 @@ NodeID GraphBuilder::add_convolution_node(Graph &g, NodeParams params, NodeIdxPa Size2D kernel_spatial_extend, unsigned int depth, PadStrideInfo conv_info, unsigned int num_groups, ConvolutionMethod method, FastMathHint fast_math_hint, ITensorAccessorUPtr weights_accessor, ITensorAccessorUPtr bias_accessor, - const QuantizationInfo weights_quant_info, - const QuantizationInfo out_quant_info) + const QuantizationInfo &weights_quant_info, + const QuantizationInfo &out_quant_info) { check_nodeidx_pair(input, g); ARM_COMPUTE_ERROR_ON(depth == 0); @@ -318,14 +318,14 @@ NodeID GraphBuilder::add_deconvolution_node(Graph &g, NodeParams params, NodeIdx return deconv_nid; } -NodeID GraphBuilder::add_concatenate_node(Graph &g, NodeParams params, const std::vector &inputs, descriptors::ConcatLayerDescriptor concat_descriptor) +NodeID GraphBuilder::add_concatenate_node(Graph &g, NodeParams params, const std::vector &inputs, const descriptors::ConcatLayerDescriptor &concat_descriptor) { return create_simple_multiple_input_single_output_node(g, params, inputs, inputs.size(), concat_descriptor); } NodeID GraphBuilder::add_depthwise_convolution_node(Graph &g, NodeParams params, NodeIdxPair input, Size2D kernel_spatial_extend, PadStrideInfo conv_info, int depth_multiplier, DepthwiseConvolutionMethod method, - ITensorAccessorUPtr weights_accessor, ITensorAccessorUPtr bias_accessor, const QuantizationInfo quant_info, const QuantizationInfo out_quant_info) + ITensorAccessorUPtr weights_accessor, ITensorAccessorUPtr bias_accessor, const QuantizationInfo &quant_info, const QuantizationInfo &out_quant_info) { check_nodeidx_pair(input, g); ARM_COMPUTE_ERROR_ON((kernel_spatial_extend.width == 0) || (kernel_spatial_extend.height == 0)); @@ -420,7 +420,7 @@ NodeID GraphBuilder::add_flatten_node(Graph &g, NodeParams params, NodeIdxPair i NodeID GraphBuilder::add_fully_connected_layer(Graph &g, NodeParams params, NodeIdxPair input, unsigned int num_outputs, NodeID weights_nid, NodeID bias_nid, - const FullyConnectedLayerInfo fc_info, const QuantizationInfo out_quant_info) + const FullyConnectedLayerInfo fc_info, const QuantizationInfo &out_quant_info) { check_nodeidx_pair(input, g); ARM_COMPUTE_ERROR_ON(num_outputs == 0); @@ -448,7 +448,7 @@ NodeID GraphBuilder::add_fully_connected_layer(Graph &g, NodeParams params, Node NodeID GraphBuilder::add_fully_connected_layer(Graph &g, NodeParams params, NodeIdxPair input, unsigned int num_outputs, ITensorAccessorUPtr weights_accessor, ITensorAccessorUPtr bias_accessor, const FullyConnectedLayerInfo fc_info, - const QuantizationInfo weights_quant_info, const QuantizationInfo out_quant_info) + const QuantizationInfo &weights_quant_info, const QuantizationInfo &out_quant_info) { check_nodeidx_pair(input, g); ARM_COMPUTE_ERROR_ON(num_outputs == 0); @@ -566,7 +566,7 @@ NodeID GraphBuilder::add_priorbox_node(Graph &g, NodeParams params, NodeIdxPair return prior_nid; } -NodeID GraphBuilder::add_quantization_node(Graph &g, NodeParams params, NodeIdxPair input, QuantizationInfo out_quant_info) +NodeID GraphBuilder::add_quantization_node(Graph &g, NodeParams params, NodeIdxPair input, const QuantizationInfo &out_quant_info) { return create_simple_single_input_output_node(g, params, input, out_quant_info); } -- cgit v1.2.1