From 5ce897f80a1a6ade8a07d61c7aaaf70d2aa5ee02 Mon Sep 17 00:00:00 2001
From: Georgios Pinitas <georgios.pinitas@arm.com>
Date: Wed, 29 Apr 2020 11:44:10 +0100
Subject: COMPMID-3108: Add Winograd 3x3,4x4 FP16 support for NEON

Change-Id: I20680dc74a3d709297539e2132417308a7aecc9d
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3159
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
---
 .../convolution/winograd/winograd_transforms/output.hpp        | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/core/NEON/kernels/convolution/winograd/winograd_transforms/output.hpp')

diff --git a/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output.hpp b/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output.hpp
index fe47ccbde9..ed88098938 100644
--- a/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output.hpp
+++ b/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output.hpp
@@ -48,15 +48,9 @@ MEMBERFN()
       _n_channels(n_channels),
       _output_min((activation.type == arm_gemm::Activation::Type::ReLU ||
                    activation.type == arm_gemm::Activation::Type::BoundedReLU)
-                      ? static_cast<TOut>(0.0f)
-                      : (std::numeric_limits<TOut>::has_infinity)
-                            ? -std::numeric_limits<TOut>::infinity()
-                            : std::numeric_limits<TOut>::lowest()),
+                      ? static_cast<TOut>(0.0f) : TypeBounds<TOut>::lower()),
       _output_max((activation.type == arm_gemm::Activation::Type::BoundedReLU)
-                      ? static_cast<TOut>(activation.param1)
-                      : (std::numeric_limits<TOut>::has_infinity)
-                            ? std::numeric_limits<TOut>::infinity()
-                            : std::numeric_limits<TOut>::max()),
+                      ? static_cast<TOut>(activation.param1) : TypeBounds<TOut>::upper()),
       _matrix_base(nullptr), _biases(nullptr), _matrix_stride(0),
       _matrix_row_stride(0), _matrix_batch_stride(0), _outptr(nullptr),
       _tiles_M(iceildiv(n_rows, output_tile_rows)),
-- 
cgit v1.2.1