From 6f314db14f0fd242d53f3a9f780158169259b31b Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Mon, 13 Jan 2020 14:07:48 +0000 Subject: COMPMID-2819: Fix nightly build failure in bare metal Change int to int32_t in order to fix bare metal failures on armv7a. Change-Id: I35960a8d6521eed7bb498bb3a7c5c266a1958d8a Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/2576 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Michele Di Giorgio --- .../core/NEON/kernels/detail/NEDirectConvolutionDetail.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arm_compute/core/NEON/kernels/detail/NEDirectConvolutionDetail.h b/arm_compute/core/NEON/kernels/detail/NEDirectConvolutionDetail.h index 788bb649b0..f1cbf2af63 100644 --- a/arm_compute/core/NEON/kernels/detail/NEDirectConvolutionDetail.h +++ b/arm_compute/core/NEON/kernels/detail/NEDirectConvolutionDetail.h @@ -306,10 +306,10 @@ inline float32x4x2_t convolve_3x3(const float *in_top, const float *in_mid, cons template < typename T, REQUIRES_TA(std::is_same::value || std::is_same::value) > inline int32x4_t single_convolve_3x3_dilation(const T *in_top, const T *in_mid, const T *in_low, const int32x4x3_t &m0, const int32x4x3_t &m1, const int32x4x3_t &m2, - size_t dilation_x, int input_offset) + size_t dilation_x, int32_t input_offset) { using VectorType = typename std::conditional::value, uint8x8x3_t, int8x8x3_t>::type; - using OutputTagType = typename wrapper::traits::neon_bitvector_tag_t; + using OutputTagType = typename wrapper::traits::neon_bitvector_tag_t; const int32x4_t v_input_offset = wrapper::vdup_n(input_offset, OutputTagType{}); @@ -432,11 +432,11 @@ inline int32x4x2_t convolve_3x3_dilation(const T *in_top, const T *in_mid, const template < typename T, REQUIRES_TA(std::is_same::value || std::is_same::value) > int32x4x2_t convolve_3x3(const T *in_top, const T *in_mid, const T *in_low, const int32x4x3_t &m0, const int32x4x3_t &m1, const int32x4x3_t &m2, - unsigned int stridex, int input_offset) + unsigned int stridex, int32_t input_offset) { ARM_COMPUTE_ERROR_ON(stridex > 3); using VectorType = typename std::conditional::value, uint8x8x2_t, int8x8x2_t>::type; - using OutputTagType = typename wrapper::traits::neon_bitvector_tag_t; + using OutputTagType = typename wrapper::traits::neon_bitvector_tag_t; const int32x4_t v_input_offset = wrapper::vdup_n(input_offset, OutputTagType{}); @@ -490,8 +490,8 @@ int32x4x2_t convolve_3x3(const T *in_top, const T *in_mid, const T *in_low, int32x4x2_t out { { - wrapper::vdup_n(0, OutputTagType{}), - wrapper::vdup_n(0, OutputTagType{}), + wrapper::vdup_n(static_cast(0), OutputTagType{}), + wrapper::vdup_n(static_cast(0), OutputTagType{}), } }; -- cgit v1.2.1