diff options
Diffstat (limited to 'src/core/NEON/kernels/arm_gemm/merges')
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/merges/a64_merge_float_to_half_12x8.hpp | 5 | ||||
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/merges/list.hpp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/NEON/kernels/arm_gemm/merges/a64_merge_float_to_half_12x8.hpp b/src/core/NEON/kernels/arm_gemm/merges/a64_merge_float_to_half_12x8.hpp index 12a090112d..9708fe189d 100644 --- a/src/core/NEON/kernels/arm_gemm/merges/a64_merge_float_to_half_12x8.hpp +++ b/src/core/NEON/kernels/arm_gemm/merges/a64_merge_float_to_half_12x8.hpp @@ -23,7 +23,8 @@ */ #pragma once -#if defined(__aarch64__) && defined(__ARM_FEATURE_FP16_SCALAR_ARITHMETIC) +// This should be possible on any AArch64 target, but some old compilers don't support __fp16 arguments. +#if defined(__aarch64__) && defined(__ARM_FP16_ARGS) #include <arm_neon.h> @@ -270,4 +271,4 @@ inline void MergeResults<12, 8>(__fp16 *out, const float *in, int ldout, int y0, } } -#endif // __aarch64__ && __ARM_FEATURE_FP16_SCALAR_ARITHMETIC +#endif // __aarch64__ && __ARM_FP16_ARGS diff --git a/src/core/NEON/kernels/arm_gemm/merges/list.hpp b/src/core/NEON/kernels/arm_gemm/merges/list.hpp index 7d56e58f44..d93f1b0e6e 100644 --- a/src/core/NEON/kernels/arm_gemm/merges/list.hpp +++ b/src/core/NEON/kernels/arm_gemm/merges/list.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - #include "a32_merge_float_8x6.hpp" #include "a64_merge_float_12x8.hpp" #include "a64_merge_float_to_half_12x8.hpp" |