diff options
author | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-05-01 13:03:59 +0100 |
---|---|---|
committer | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-05-07 15:35:57 +0000 |
commit | 299fdd31bd8e1add3ac557a5e630de55b1b6659c (patch) | |
tree | a2ecde5f639d10789fed84ee9cc300abf4b6e03a /arm_compute/runtime/NEON | |
parent | dc5d34319a673f6cbcd346a0c7046fb7fd0106ec (diff) | |
download | ComputeLibrary-299fdd31bd8e1add3ac557a5e630de55b1b6659c.tar.gz |
COMPMID-2177 Fix clang warnings
Change-Id: I4beacfd714ee3ed771fd174cce5d8009a2961380
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1065
Reviewed-by: Giuseppe Rossini <giuseppe.rossini@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'arm_compute/runtime/NEON')
5 files changed, 33 insertions, 33 deletions
diff --git a/arm_compute/runtime/NEON/functions/NECropResize.h b/arm_compute/runtime/NEON/functions/NECropResize.h index e790e68b5f..53e8f7f7a5 100644 --- a/arm_compute/runtime/NEON/functions/NECropResize.h +++ b/arm_compute/runtime/NEON/functions/NECropResize.h @@ -98,10 +98,10 @@ public: InterpolationPolicy _method; float _extrapolation_value; - std::unique_ptr<NECropKernel[]> _crop; - std::unique_ptr<NEScale[]> _scale; - std::unique_ptr<Tensor[]> _crop_results{ nullptr }; - std::unique_ptr<Tensor[]> _scaled_results{ nullptr }; + std::vector<std::unique_ptr<NECropKernel>> _crop; + std::vector<std::unique_ptr<NEScale>> _scale; + std::vector<std::unique_ptr<Tensor>> _crop_results; + std::vector<std::unique_ptr<Tensor>> _scaled_results; }; } // namespace arm_compute #endif /* __ARM_COMPUTE_NEON_CROP_RESIZE_H__ */ diff --git a/arm_compute/runtime/NEON/functions/NEDepthConcatenateLayer.h b/arm_compute/runtime/NEON/functions/NEDepthConcatenateLayer.h index e2f2c4c44c..b3bf752b40 100644 --- a/arm_compute/runtime/NEON/functions/NEDepthConcatenateLayer.h +++ b/arm_compute/runtime/NEON/functions/NEDepthConcatenateLayer.h @@ -84,10 +84,10 @@ public: void run() override; private: - std::vector<ITensor *> _inputs_vector; - std::unique_ptr<NEDepthConcatenateLayerKernel[]> _concat_kernels_vector; - std::unique_ptr<NEFillBorderKernel[]> _border_handlers_vector; - unsigned int _num_inputs; + std::vector<ITensor *> _inputs_vector; + std::vector<std::unique_ptr<NEDepthConcatenateLayerKernel>> _concat_kernels_vector; + std::vector<std::unique_ptr<NEFillBorderKernel>> _border_handlers_vector; + unsigned int _num_inputs; }; } // namespace arm_compute #endif /* __ARM_COMPUTE_NEDEPTHCONCATENATE_H__ */ diff --git a/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h b/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h index dbe0ecdf66..47fcd5e60f 100644 --- a/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h +++ b/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017 ARM Limited. + * Copyright (c) 2016-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -91,10 +91,10 @@ public: void run() override; private: - std::unique_ptr<NEFillBorderKernel[]> _horizontal_border_handler; - std::unique_ptr<NEFillBorderKernel[]> _vertical_border_handler; - std::unique_ptr<NEGaussianPyramidHorKernel[]> _horizontal_reduction; - std::unique_ptr<NEGaussianPyramidVertKernel[]> _vertical_reduction; + std::vector<std::unique_ptr<NEFillBorderKernel>> _horizontal_border_handler; + std::vector<std::unique_ptr<NEFillBorderKernel>> _vertical_border_handler; + std::vector<std::unique_ptr<NEGaussianPyramidHorKernel>> _horizontal_reduction; + std::vector<std::unique_ptr<NEGaussianPyramidVertKernel>> _vertical_reduction; }; /** Basic function to execute gaussian pyramid with ORB scale factor. This function calls the following NEON kernels and functions: @@ -115,8 +115,8 @@ public: void run() override; private: - std::unique_ptr<NEGaussian5x5[]> _gaus5x5; - std::unique_ptr<NEScale[]> _scale_nearest; + std::vector<std::unique_ptr<NEGaussian5x5>> _gaus5x5; + std::vector<std::unique_ptr<NEScale>> _scale_nearest; }; } #endif /*__ARM_COMPUTE_NEGAUSSIANPYRAMID_H__ */ diff --git a/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h b/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h index 0d268ca565..e21f4639c1 100644 --- a/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h +++ b/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017 ARM Limited. + * Copyright (c) 2016-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -91,12 +91,12 @@ public: private: MemoryGroup _memory_group; NEHOGGradient _gradient_kernel; - std::unique_ptr<NEHOGOrientationBinningKernel[]> _orient_bin_kernel; - std::unique_ptr<NEHOGBlockNormalizationKernel[]> _block_norm_kernel; - std::unique_ptr<NEHOGDetector[]> _hog_detect_kernel; + std::vector<std::unique_ptr<NEHOGOrientationBinningKernel>> _orient_bin_kernel; + std::vector<std::unique_ptr<NEHOGBlockNormalizationKernel>> _block_norm_kernel; + std::vector<std::unique_ptr<NEHOGDetector>> _hog_detect_kernel; std::unique_ptr<CPPDetectionWindowNonMaximaSuppressionKernel> _non_maxima_kernel; - std::unique_ptr<Tensor[]> _hog_space; - std::unique_ptr<Tensor[]> _hog_norm_space; + std::vector<std::unique_ptr<Tensor>> _hog_space; + std::vector<std::unique_ptr<Tensor>> _hog_norm_space; IDetectionWindowArray *_detection_windows; Tensor _mag; Tensor _phase; diff --git a/arm_compute/runtime/NEON/functions/NEOpticalFlow.h b/arm_compute/runtime/NEON/functions/NEOpticalFlow.h index ad703f0788..320247d260 100644 --- a/arm_compute/runtime/NEON/functions/NEOpticalFlow.h +++ b/arm_compute/runtime/NEON/functions/NEOpticalFlow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 ARM Limited. + * Copyright (c) 2016-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -86,17 +86,17 @@ public: void run() override; private: - MemoryGroup _memory_group; - std::unique_ptr<NEScharr3x3[]> _func_scharr; - std::unique_ptr<NELKTrackerKernel[]> _kernel_tracker; - std::unique_ptr<Tensor[]> _scharr_gx; - std::unique_ptr<Tensor[]> _scharr_gy; - IKeyPointArray *_new_points; - const IKeyPointArray *_new_points_estimates; - const IKeyPointArray *_old_points; - LKInternalKeypointArray _new_points_internal; - LKInternalKeypointArray _old_points_internal; - unsigned int _num_levels; + MemoryGroup _memory_group; + std::vector<std::unique_ptr<NEScharr3x3>> _func_scharr; + std::vector<std::unique_ptr<NELKTrackerKernel>> _kernel_tracker; + std::vector<std::unique_ptr<Tensor>> _scharr_gx; + std::vector<std::unique_ptr<Tensor>> _scharr_gy; + IKeyPointArray *_new_points; + const IKeyPointArray *_new_points_estimates; + const IKeyPointArray *_old_points; + LKInternalKeypointArray _new_points_internal; + LKInternalKeypointArray _old_points_internal; + unsigned int _num_levels; }; } #endif /*__ARM_COMPUTE_NEOPTICALFLOW_H__ */ |