diff options
| author | Michele Di Giorgio <michele.digiorgio@arm.com> | 2019-09-23 16:49:49 +0100 |
|---|---|---|
| committer | Michele Di Giorgio <michele.digiorgio@arm.com> | 2019-09-30 16:45:51 +0000 |
| commit | 9637b2e4fc33b2264aa5586dd6b2ed1045db5075 (patch) | |
| tree | a22d4dd2ff18f86a2da2920151002415b80fefca /src | |
| parent | cecb0a75a9de0a12d30f8fabbe16a656c722afa1 (diff) | |
| download | ComputeLibrary-9637b2e4fc33b2264aa5586dd6b2ed1045db5075.tar.gz | |
COMPMID-2671: Change ArgMinMax NEON/CL output type to Signed32
Change-Id: I718f3884928271c5b0afb259d5bfe9df284f18e6
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1995
Reviewed-by: Georgios Pinitas <georgios.pinitas@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/CL/kernels/CLReductionOperationKernel.cpp | 7 | ||||
| -rw-r--r-- | src/core/NEON/kernels/NEReductionOperationKernel.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/CL/kernels/CLReductionOperationKernel.cpp b/src/core/CL/kernels/CLReductionOperationKernel.cpp index ee33a72792..8e92b591d1 100644 --- a/src/core/CL/kernels/CLReductionOperationKernel.cpp +++ b/src/core/CL/kernels/CLReductionOperationKernel.cpp @@ -36,8 +36,8 @@ #include "support/ToolchainSupport.h" -using namespace arm_compute; - +namespace arm_compute +{ namespace { // OpenCL kernel requires input width to be a power of 2 for x-axis. @@ -65,7 +65,7 @@ Status validate_arguments(const ITensorInfo *input, const ITensorInfo *output, u if(op == ReductionOperation::ARG_IDX_MAX || op == ReductionOperation::ARG_IDX_MIN) { ARM_COMPUTE_RETURN_ERROR_ON_MSG(input->data_type() == DataType::QASYMM8, "Not supported operation for QASYMM8"); - ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(output, 1, DataType::U32); + ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(output, 1, DataType::U32, DataType::S32); } else { @@ -376,3 +376,4 @@ void CLReductionOperationKernel::run(const Window &window, cl::CommandQueue &que ARM_COMPUTE_ERROR("Not supported"); } } +} // namespace arm_compute diff --git a/src/core/NEON/kernels/NEReductionOperationKernel.cpp b/src/core/NEON/kernels/NEReductionOperationKernel.cpp index ffa4fa3565..85abda598d 100644 --- a/src/core/NEON/kernels/NEReductionOperationKernel.cpp +++ b/src/core/NEON/kernels/NEReductionOperationKernel.cpp @@ -1186,7 +1186,7 @@ Status validate_arguments(const ITensorInfo *input, const ITensorInfo *output, u } else { - ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(output, 1, DataType::U32); + ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(output, 1, DataType::U32, DataType::S32); } const TensorShape output_shape = arm_compute::misc::shape_calculator::compute_reduced_shape(input->tensor_shape(), axis); |