diff options
| author | Michalis Spyrou <michalis.spyrou@arm.com> | 2020-01-24 12:05:05 +0000 |
|---|---|---|
| committer | Michalis Spyrou <michalis.spyrou@arm.com> | 2020-01-27 14:59:36 +0000 |
| commit | 6c89ffac750010cb9335794defe8a366c04db937 (patch) | |
| tree | d7513790d98de354514c4e84dcb36be31f50e346 /src | |
| parent | 5c09ae8d3f82ddf8bf9438fc67e1991b62ae88e3 (diff) | |
| download | ComputeLibrary-6c89ffac750010cb9335794defe8a366c04db937.tar.gz | |
COMPMID-2819: Fix supported types in DepthwiseReshapeKernel
Add support for all types in validation of
CLDepthwiseConvolutionLayerReshapeWeightsKernel. Also
added a few missing parentheses in reduction_operation.cl.
Change-Id: I7371ce6d5e402e9c2faafd7948e4643298bc1ace
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2641
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/CL/cl_kernels/reduction_operation.cl | 6 | ||||
| -rw-r--r-- | src/core/CL/kernels/CLDepthwiseConvolutionLayerReshapeWeightsKernel.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/CL/cl_kernels/reduction_operation.cl b/src/core/CL/cl_kernels/reduction_operation.cl index 79d0d0683e..0c393345e2 100644 --- a/src/core/CL/cl_kernels/reduction_operation.cl +++ b/src/core/CL/cl_kernels/reduction_operation.cl @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019 ARM Limited. + * Copyright (c) 2016-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -31,8 +31,8 @@ #define ISGREATER(x, y) (x > y) ? 1 : 0 #define ISLESS(x, y) (x < y) ? 1 : 0 #else // !defined(WIDTH) -#define ISGREATER(x, y) select(int16)0, int16) - 1, x > y) -#define ISLESS(x, y) select(int16)0, int16) - 1, x < y) +#define ISGREATER(x, y) select((int16)0, (int16)-1, x > y) +#define ISLESS(x, y) select((int16)0, (int16)-1, x < y) #endif // defined(WIDTH) #endif // defined(FLOAT_DATA_TYPE) diff --git a/src/core/CL/kernels/CLDepthwiseConvolutionLayerReshapeWeightsKernel.cpp b/src/core/CL/kernels/CLDepthwiseConvolutionLayerReshapeWeightsKernel.cpp index ef53e09787..4c927fd3e2 100644 --- a/src/core/CL/kernels/CLDepthwiseConvolutionLayerReshapeWeightsKernel.cpp +++ b/src/core/CL/kernels/CLDepthwiseConvolutionLayerReshapeWeightsKernel.cpp @@ -52,7 +52,7 @@ Status validate_arguments(const ITensorInfo *input, const ITensorInfo *output, c ARM_COMPUTE_RETURN_ERROR_ON(info.c0 != 4); ARM_COMPUTE_RETURN_ERROR_ON(input->dimension(idx_h) != 3); ARM_COMPUTE_RETURN_ERROR_ON(input->dimension(idx_w) != 3); - ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::QASYMM8, DataType::QASYMM8_SIGNED); + ARM_COMPUTE_RETURN_ERROR_ON(input->data_type() == DataType::UNKNOWN); if(output->total_size() != 0) { |