diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-07-02 20:02:20 +0100 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-07-06 16:51:32 +0000 |
| commit | 5aa1a0b7ca5eed010e4b297a95b1c4851f741328 (patch) | |
| tree | ba882de9e86589dfdd33937d538a89bbdf01c40e /src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp | |
| parent | 42550c039105597ff6acd4e5efc0ee3c7c20b08e (diff) | |
| download | ComputeLibrary-5aa1a0b7ca5eed010e4b297a95b1c4851f741328.tar.gz | |
COMPID-3324: Clean GEMM kernels
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I170de1671e061a78740caee31fb4a1b8642c1369
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3505
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp')
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp b/src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp index 088353e5f3..284f2dc1a0 100644 --- a/src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp +++ b/src/core/NEON/kernels/arm_gemm/merges/a64_merge_fp32_12x8.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Arm Limited. + * Copyright (c) 2019-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -30,8 +30,8 @@ void MergeResults<12, 8, false>(float *out, const float *in, const int ldout, co { const float *inptr = in; float nullbias[12]; - float minval = - std::numeric_limits<float>::infinity(); - float maxval = std::numeric_limits<float>::infinity(); + float minval = - static_cast<float>(std::numeric_limits<float>::infinity()); + float maxval = static_cast<float>(std::numeric_limits<float>::infinity()); switch(act.type) { @@ -1106,11 +1106,7 @@ void MergeResults<12, 8, false>(float *out, const float *in, const int ldout, co } else { - const float *biasptr = nullbias; - if (bias) - { - biasptr = bias + i; - } + const float *biasptr = bias ? bias + i : nullbias; switch(height) { |