diff options
Diffstat (limited to 'src/core/NEON/kernels/batchnormalization/impl/NEON')
-rw-r--r-- | src/core/NEON/kernels/batchnormalization/impl/NEON/fp16.cpp | 11 | ||||
-rw-r--r-- | src/core/NEON/kernels/batchnormalization/impl/NEON/fp32.cpp | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/core/NEON/kernels/batchnormalization/impl/NEON/fp16.cpp b/src/core/NEON/kernels/batchnormalization/impl/NEON/fp16.cpp index dfadef34f7..fd17b98f7b 100644 --- a/src/core/NEON/kernels/batchnormalization/impl/NEON/fp16.cpp +++ b/src/core/NEON/kernels/batchnormalization/impl/NEON/fp16.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Arm Limited. + * Copyright (c) 2020-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -138,7 +138,14 @@ namespace cpu void fp16_neon_batch_normalization(ITensor *src, ITensor *dst, const ITensor *mean, const ITensor *var, const ITensor *beta, const ITensor *gamma, float epsilon, ActivationLayerInfo &act_info, const Window &window) { - fused_map[act_info.activation()](src, dst, mean, var, beta, gamma, epsilon, act_info, window); + if(act_info.enabled()) + { + fused_map[act_info.activation()](src, dst, mean, var, beta, gamma, epsilon, act_info, window); + } + else + { + batch_normalization<detail::dummy<float16_t, 8>>(src, dst, mean, var, beta, gamma, epsilon, act_info, window); + } } } // namespace cpu } // namespace arm_compute diff --git a/src/core/NEON/kernels/batchnormalization/impl/NEON/fp32.cpp b/src/core/NEON/kernels/batchnormalization/impl/NEON/fp32.cpp index a24f7f624a..5b375e5d4d 100644 --- a/src/core/NEON/kernels/batchnormalization/impl/NEON/fp32.cpp +++ b/src/core/NEON/kernels/batchnormalization/impl/NEON/fp32.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Arm Limited. + * Copyright (c) 2020-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -137,7 +137,14 @@ namespace cpu void fp32_neon_batch_normalization(ITensor *src, ITensor *dst, const ITensor *mean, const ITensor *var, const ITensor *beta, const ITensor *gamma, float epsilon, ActivationLayerInfo &act_info, const Window &window) { - fused_map[act_info.activation()](src, dst, mean, var, beta, gamma, epsilon, act_info, window); + if(act_info.enabled()) + { + fused_map[act_info.activation()](src, dst, mean, var, beta, gamma, epsilon, act_info, window); + } + else + { + batch_normalization<detail::dummy<float, 4>>(src, dst, mean, var, beta, gamma, epsilon, act_info, window); + } } } // namespace cpu } // namespace arm_compute |