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/NEActivationLayerKernel.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/NEActivationLayerKernel.cpp')
| -rw-r--r-- | src/core/NEON/kernels/NEActivationLayerKernel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/NEON/kernels/NEActivationLayerKernel.cpp b/src/core/NEON/kernels/NEActivationLayerKernel.cpp index 67fc45bc70..8dfce0f7b5 100644 --- a/src/core/NEON/kernels/NEActivationLayerKernel.cpp +++ b/src/core/NEON/kernels/NEActivationLayerKernel.cpp @@ -81,7 +81,7 @@ void NEActivationLayerKernel::configure(ITensor *input, ITensor *output, Activat { ActivationFunction::TANH, &NEActivationLayerKernel::activation<ActivationFunction::TANH, float> }, }; -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 // Activation functions : FP16 static std::map<ActivationFunction, ActivationFunctionExecutorPtr> act_map_f16 = { @@ -96,7 +96,7 @@ void NEActivationLayerKernel::configure(ITensor *input, ITensor *output, Activat { ActivationFunction::SQUARE, &NEActivationLayerKernel::activation<ActivationFunction::SQUARE, float16_t> }, { ActivationFunction::TANH, &NEActivationLayerKernel::activation<ActivationFunction::TANH, float16_t> }, }; -#endif /* ARM_COMPUTE_ENABLE_FP16*/ +#endif /* ARM_COMPUTE_AARCH64_V8_2*/ // Activation functions : QS8 static std::map<ActivationFunction, ActivationFunctionExecutorPtr> act_map_qs8 = @@ -140,11 +140,11 @@ void NEActivationLayerKernel::configure(ITensor *input, ITensor *output, Activat case DataType::F32: _func = act_map_f32[activation_info.activation()]; break; -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 case DataType::F16: _func = act_map_f16[activation_info.activation()]; break; -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ default: ARM_COMPUTE_ERROR("Unsupported data type."); } @@ -174,7 +174,7 @@ void NEActivationLayerKernel::configure(ITensor *input, ITensor *output, Activat ICPPKernel::configure(win); } -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 template <ActivationLayerInfo::ActivationFunction F, typename T> typename std::enable_if<std::is_same<T, float16_t>::value, void>::type NEActivationLayerKernel::activation(const Window &window) { @@ -305,7 +305,7 @@ typename std::enable_if<std::is_same<T, float16_t>::value, void>::type NEActivat }, input, output); } -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ template <ActivationLayerInfo::ActivationFunction F, typename T> typename std::enable_if<std::is_same<T, float>::value, void>::type NEActivationLayerKernel::activation(const Window &window) |