diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-12-16 13:19:03 +0000 |
|---|---|---|
| committer | TeresaARM <teresa.charlinreyes@arm.com> | 2020-12-16 15:04:10 +0000 |
| commit | 462e75e217a11b92b8df8c3434f2491ef70487e3 (patch) | |
| tree | 34ee385aec4299f7e7ceb2a38e331e49b2e77ed1 | |
| parent | 6cca99386ffdc64b7c5b6f90d74df3bfee98c0dc (diff) | |
| download | ComputeLibrary-462e75e217a11b92b8df8c3434f2491ef70487e3.tar.gz | |
NeuralNetwork VTS tests LOGICAL_AND and LOGICAL_OR fail with R29
Explicitly cast scalar to vector for LOGICAL_AND and LOGICAL_OR
Resolves COMPUTE-12536
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Iabdf7feaef9cb9b41a2fc78e73473ebcfcc3e091
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4706
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Manuel Bottini <manuel.bottini@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
| -rw-r--r-- | src/core/CL/cl_kernels/elementwise_operation.cl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/CL/cl_kernels/elementwise_operation.cl b/src/core/CL/cl_kernels/elementwise_operation.cl index f38f6202ad..11e0612205 100644 --- a/src/core/CL/cl_kernels/elementwise_operation.cl +++ b/src/core/CL/cl_kernels/elementwise_operation.cl @@ -42,8 +42,8 @@ #define POWER(x, y) pow(x, y) #define PRELU(x, y) (select(y * x, x, CONVERT((x > (DATA_TYPE_OUT)0), SELECT_VEC_DATA_TYPE(DATA_TYPE_OUT, VEC_SIZE_OUT)))) -#define AND(x, y) (CONVERT((x && y), VEC_DATA_TYPE(DATA_TYPE_OUT, VEC_SIZE_OUT)) & 1) -#define OR(x, y) (CONVERT((x || y), VEC_DATA_TYPE(DATA_TYPE_OUT, VEC_SIZE_OUT)) & 1) +#define AND(x, y) (CONVERT((x && y), VEC_DATA_TYPE(DATA_TYPE_OUT, VEC_SIZE_OUT)) & ((VEC_DATA_TYPE(DATA_TYPE_OUT, VEC_SIZE_OUT))1)) +#define OR(x, y) (CONVERT((x || y), VEC_DATA_TYPE(DATA_TYPE_OUT, VEC_SIZE_OUT)) & ((VEC_DATA_TYPE(DATA_TYPE_OUT, VEC_SIZE_OUT))1)) #define OP_FUN_NAME_STR(op) elementwise_operation_##op #define OP_FUN_NAME(op) OP_FUN_NAME_STR(op) |