diff options
| author | Ioan-Cristian Szabo <ioan-cristian.szabo@arm.com> | 2017-10-26 15:42:24 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
| commit | 33fd07bd27be3cba183b7cacef63ea220c770c23 (patch) | |
| tree | 0ccd4269992a90542697c85a0bd1c690872327b5 /src/core/NEON/kernels/NEPoolingLayerKernel.cpp | |
| parent | eae4ce085ed44c67de6d87eeba7726570ac23787 (diff) | |
| download | ComputeLibrary-33fd07bd27be3cba183b7cacef63ea220c770c23.tar.gz | |
COMPMID-634: Enable clang with libc++ to compile for Android (32 and 64 bits)
Change-Id: I693f64e70cd478e93675a8b04360128ded3b60d4
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/93015
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/NEPoolingLayerKernel.cpp')
| -rw-r--r-- | src/core/NEON/kernels/NEPoolingLayerKernel.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/NEON/kernels/NEPoolingLayerKernel.cpp b/src/core/NEON/kernels/NEPoolingLayerKernel.cpp index 8d4e46500f..0024e33723 100644 --- a/src/core/NEON/kernels/NEPoolingLayerKernel.cpp +++ b/src/core/NEON/kernels/NEPoolingLayerKernel.cpp @@ -173,7 +173,7 @@ void NEPoolingLayerKernel::configure(const ITensor *input, ITensor *output, cons } num_elems_horizontal_window = (pool_stride_x == 2) ? 4 : 8; break; -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 case DataType::F16: switch(pool_size) { @@ -192,7 +192,7 @@ void NEPoolingLayerKernel::configure(const ITensor *input, ITensor *output, cons break; } break; -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ case DataType::F32: switch(pool_size) { @@ -536,7 +536,7 @@ void NEPoolingLayerKernel::pooling2_q16(const Window &window_input, const Window template <PoolingType pooling_type> void NEPoolingLayerKernel::pooling3_f16(const Window &window_input, const Window &window) { -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 Iterator input(_input, window_input); Iterator output(_output, window); @@ -595,17 +595,17 @@ void NEPoolingLayerKernel::pooling3_f16(const Window &window_input, const Window *(reinterpret_cast<float16_t *>(output.ptr())) = vget_lane_f16(res, 0); }, input, output); -#else /* ARM_COMPUTE_ENABLE_FP16 */ +#else /* ARM_COMPUTE_AARCH64_V8_2 */ ARM_COMPUTE_UNUSED(window_input); ARM_COMPUTE_UNUSED(window); ARM_COMPUTE_ERROR("FP16 Not supported! Recompile the library with arch=arm64-v8.2-a"); -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ } template <PoolingType pooling_type> void NEPoolingLayerKernel::pooling2_f16(const Window &window_input, const Window &window) { -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 Iterator input(_input, window_input); Iterator output(_output, window); constexpr int pool_size = 2; @@ -654,11 +654,11 @@ void NEPoolingLayerKernel::pooling2_f16(const Window &window_input, const Window vst1q_f16(reinterpret_cast<float16_t *>(output.ptr()), res); }, input, output); -#else /* ARM_COMPUTE_ENABLE_FP16 */ +#else /* ARM_COMPUTE_AARCH64_V8_2 */ ARM_COMPUTE_UNUSED(window_input); ARM_COMPUTE_UNUSED(window); ARM_COMPUTE_ERROR("FP16 Not supported! Recompile the library with arch=arm64-v8.2-a"); -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ } template <PoolingType pooling_type> |