diff options
| author | Michele Di Giorgio <michele.digiorgio@arm.com> | 2020-04-29 17:25:20 +0100 |
|---|---|---|
| committer | Michele Di Giorgio <michele.digiorgio@arm.com> | 2020-05-01 08:35:56 +0000 |
| commit | bc0e1c969261f4ba65451dc5fe29acfb80671f68 (patch) | |
| tree | 52f566a2991bd8572eee4854f447053a5601589b /src | |
| parent | 51ca6ae70680f6c7aaa1900fe6ff4d3ee4e90b08 (diff) | |
| download | ComputeLibrary-bc0e1c969261f4ba65451dc5fe29acfb80671f68.tar.gz | |
COMPMID-3069: Allow different quantization info in NEElementwiseMin/Max
Change-Id: I97f9f7e9f054b2a812a23b25cfb21033f76a9101
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3125
Reviewed-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/NEON/kernels/NEElementwiseOperationKernel.cpp | 9 | ||||
| -rw-r--r-- | src/runtime/NEON/functions/NEElementwiseOperators.cpp | 10 |
2 files changed, 0 insertions, 19 deletions
diff --git a/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp b/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp index 444ee8e0d3..0579dc67f4 100644 --- a/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp +++ b/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp @@ -24,26 +24,17 @@ #include "arm_compute/core/NEON/kernels/NEElementwiseOperationKernel.h" #include "arm_compute/core/CPP/Validate.h" -#include "arm_compute/core/Error.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/IAccessWindow.h" -#include "arm_compute/core/ITensor.h" #include "arm_compute/core/NEON/NEAsymm.h" #include "arm_compute/core/NEON/NEFixedPoint.h" #include "arm_compute/core/NEON/wrapper/wrapper.h" -#include "arm_compute/core/TensorInfo.h" -#include "arm_compute/core/Validate.h" -#include <algorithm> #include <arm_neon.h> -#include <cstdint> #include <map> -#include <string> namespace arm_compute { -class Coordinates; - namespace { float32x4x4_t load_quantized(const uint8_t *input1_ptr, const int32x4_t &offset, const float32x4_t &scale) diff --git a/src/runtime/NEON/functions/NEElementwiseOperators.cpp b/src/runtime/NEON/functions/NEElementwiseOperators.cpp index 7451c6ff2b..926ae1fa21 100644 --- a/src/runtime/NEON/functions/NEElementwiseOperators.cpp +++ b/src/runtime/NEON/functions/NEElementwiseOperators.cpp @@ -43,11 +43,6 @@ void NEElementwiseMax::configure(ITensor *input1, ITensor *input2, ITensor *outp Status NEElementwiseMax::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, const ActivationLayerInfo &act_info) { ARM_COMPUTE_RETURN_ERROR_ON(act_info.enabled()); - if(input1->data_type() == DataType::QASYMM8_SIGNED) - { - ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input1, output); - ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_QUANTIZATION_INFO(input1, input2, output); - } return NEArithmeticOperationKernel::validate(ArithmeticOperation::MAX, input1, input2, output); } @@ -62,11 +57,6 @@ void NEElementwiseMin::configure(ITensor *input1, ITensor *input2, ITensor *outp Status NEElementwiseMin::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, const ActivationLayerInfo &act_info) { ARM_COMPUTE_RETURN_ERROR_ON(act_info.enabled()); - if(input1->data_type() == DataType::QASYMM8_SIGNED) - { - ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input1, output); - ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_QUANTIZATION_INFO(input1, input2, output); - } return NEArithmeticOperationKernel::validate(ArithmeticOperation::MIN, input1, input2, output); } |