From 5eaf57c67a7ca60081fb9f2ad5d82aaf3bbe7647 Mon Sep 17 00:00:00 2001 From: Sheri Zhang Date: Mon, 4 May 2020 21:38:17 +0100 Subject: COMPMID-3444: Fix CpuAcc Hal 1.3 PRelu failure issue Fix CpuAcc Hal 1.3 Max & Min failure issue Signed-off-by: Sheri Zhang Change-Id: Ib519e6c6717e6608106aebc8c1cd751a731428a3 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3139 Tested-by: Arm Jenkins Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins --- src/core/NEON/kernels/NEElementwiseOperationKernel.cpp | 2 +- tests/validation/NEON/PReluLayer.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp b/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp index 3fd5f39e9f..7b2b5e4f19 100644 --- a/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp +++ b/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp @@ -941,7 +941,7 @@ void elementwise_op_quantized_signed(const ITensor *in1, const ITensor *in2, ITe const auto output_ptr = reinterpret_cast(output.ptr()); const int8_t broadcast_value = *reinterpret_cast(broadcast_input.ptr()); - const float32x4x4_t broadcast_vector = vdequantize(vdupq_n_u8(broadcast_value), broadcast_qinfo); + const float32x4x4_t broadcast_vector = vdequantize(vdupq_n_s8(broadcast_value), broadcast_qinfo); int x = (*broadcast_func)(window_start_x, window_end_x, window_step_x, non_broadcast_input_ptr, broadcast_vector, output_ptr, voffset_non_broadcast, vscale_non_broadcast, voffseto, invvscaleo, !is_broadcast_input_2); diff --git a/tests/validation/NEON/PReluLayer.cpp b/tests/validation/NEON/PReluLayer.cpp index 0630a057d6..bc93c65778 100644 --- a/tests/validation/NEON/PReluLayer.cpp +++ b/tests/validation/NEON/PReluLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -132,9 +132,9 @@ TEST_SUITE_END() // QASYMM8 TEST_SUITE(QASYMM8_SIGNED) FIXTURE_DATA_TEST_CASE(RunSmall, NEPReluLayerQuantizedFixture, framework::DatasetMode::ALL, combine(combine(combine(combine(datasets::SmallShapes(), PReluLayerQASYMM8SignedDataset), - framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.5f, 20) })), - framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.5f, 10) })), - framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.5f, 5) })) + framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.2f, 127) })), + framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.1f, 64) })), + framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.5f, -128) })) ) { -- cgit v1.2.1