From 490bf2e8e87999c6e5a32bd734595cb2906c7c57 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Fri, 29 Sep 2017 11:24:55 +0100 Subject: COMPMID-417 Fix bare metal build for armv7a Change-Id: I566a41061b75c3a1dad5374fcdc84372e6cfbe89 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/89670 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- src/core/NEON/kernels/NEDirectConvolutionLayerKernel.cpp | 2 +- src/core/NEON/kernels/NEFillBorderKernel.cpp | 2 +- src/core/NEON/kernels/NEFillInnerBorderKernel.cpp | 2 +- src/core/NEON/kernels/NELKTrackerKernel.cpp | 9 +++++---- src/core/NEON/kernels/NENormalizationLayerKernel.cpp | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/core/NEON') diff --git a/src/core/NEON/kernels/NEDirectConvolutionLayerKernel.cpp b/src/core/NEON/kernels/NEDirectConvolutionLayerKernel.cpp index c8e11133bd..2766d698d9 100644 --- a/src/core/NEON/kernels/NEDirectConvolutionLayerKernel.cpp +++ b/src/core/NEON/kernels/NEDirectConvolutionLayerKernel.cpp @@ -203,7 +203,7 @@ inline void internal_vst1q(qint16_t *p, const qint16x8_t &v) vst1q_qs16(p, v); } -inline void internal_vst1q(int *p, const qint32x4x2_t &v) +inline void internal_vst1q(int32_t *p, const qint32x4x2_t &v) { vst1q_s32(p, v.val[0]); vst1q_s32(p + 4, v.val[1]); diff --git a/src/core/NEON/kernels/NEFillBorderKernel.cpp b/src/core/NEON/kernels/NEFillBorderKernel.cpp index 9505a2520f..593a529c3f 100644 --- a/src/core/NEON/kernels/NEFillBorderKernel.cpp +++ b/src/core/NEON/kernels/NEFillBorderKernel.cpp @@ -99,7 +99,7 @@ class Coordinates; } // namespace arm_compute NEFillBorderKernel::NEFillBorderKernel() - : _tensor(nullptr), _border_size(0), _mode(BorderMode::UNDEFINED), _constant_border_value(0) + : _tensor(nullptr), _border_size(0), _mode(BorderMode::UNDEFINED), _constant_border_value(static_cast(0.f)) { } diff --git a/src/core/NEON/kernels/NEFillInnerBorderKernel.cpp b/src/core/NEON/kernels/NEFillInnerBorderKernel.cpp index 017e259ca4..d1cff6f62d 100644 --- a/src/core/NEON/kernels/NEFillInnerBorderKernel.cpp +++ b/src/core/NEON/kernels/NEFillInnerBorderKernel.cpp @@ -42,7 +42,7 @@ class Coordinates; } // namespace arm_compute NEFillInnerBorderKernel::NEFillInnerBorderKernel() - : _tensor(nullptr), _border_size(0), _constant_border_value(0) + : _tensor(nullptr), _border_size(0), _constant_border_value(static_cast(0.f)) { } diff --git a/src/core/NEON/kernels/NELKTrackerKernel.cpp b/src/core/NEON/kernels/NELKTrackerKernel.cpp index 6fac7975df..004ecd07ef 100644 --- a/src/core/NEON/kernels/NELKTrackerKernel.cpp +++ b/src/core/NEON/kernels/NELKTrackerKernel.cpp @@ -130,7 +130,7 @@ void NELKTrackerKernel::init_keypoints(int start, int end) } } -std::tuple NELKTrackerKernel::compute_spatial_gradient_matrix(const NELKInternalKeypoint &keypoint, int *bilinear_ix, int *bilinear_iy) +std::tuple NELKTrackerKernel::compute_spatial_gradient_matrix(const NELKInternalKeypoint &keypoint, int32_t *bilinear_ix, int32_t *bilinear_iy) { int iA11 = 0; int iA12 = 0; @@ -218,7 +218,8 @@ std::tuple NELKTrackerKernel::compute_spatial_gradient_matrix(con return std::make_tuple(iA11, iA12, iA22); } -std::pair NELKTrackerKernel::compute_image_mismatch_vector(const NELKInternalKeypoint &old_keypoint, const NELKInternalKeypoint &new_keypoint, const int *bilinear_ix, const int *bilinear_iy) +std::pair NELKTrackerKernel::compute_image_mismatch_vector(const NELKInternalKeypoint &old_keypoint, const NELKInternalKeypoint &new_keypoint, const int32_t *bilinear_ix, + const int32_t *bilinear_iy) { int ib1 = 0; int ib2 = 0; @@ -402,8 +403,8 @@ void NELKTrackerKernel::run(const Window &window, const ThreadInfo &info) init_keypoints(list_start, list_end); const int buffer_size = _window_dimension * _window_dimension; - int bilinear_ix[buffer_size]; - int bilinear_iy[buffer_size]; + int32_t bilinear_ix[buffer_size]; + int32_t bilinear_iy[buffer_size]; const int half_window = _window_dimension / 2; diff --git a/src/core/NEON/kernels/NENormalizationLayerKernel.cpp b/src/core/NEON/kernels/NENormalizationLayerKernel.cpp index fc3f5f2fab..d6d26e2d12 100644 --- a/src/core/NEON/kernels/NENormalizationLayerKernel.cpp +++ b/src/core/NEON/kernels/NENormalizationLayerKernel.cpp @@ -61,7 +61,7 @@ void NENormalizationLayerKernel::configure(const ITensor *input, const ITensor * ARM_COMPUTE_ERROR_ON_VALUE_NOT_REPRESENTABLE_IN_FIXED_POINT(norm_info.scale_coeff(), input); } - const unsigned int border_width = (norm_info.type() == NormType::CROSS_MAP) ? 0 : std::min(norm_info.norm_size() / 2, 3U); + const unsigned int border_width = (norm_info.type() == NormType::CROSS_MAP) ? 0 : std::min(norm_info.norm_size() / 2, 3U); _input = input; _input_squared = input_squared; -- cgit v1.2.1