From 462e75e217a11b92b8df8c3434f2491ef70487e3 Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Wed, 16 Dec 2020 13:19:03 +0000 Subject: 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 Change-Id: Iabdf7feaef9cb9b41a2fc78e73473ebcfcc3e091 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4706 Tested-by: Arm Jenkins Reviewed-by: Manuel Bottini Comments-Addressed: Arm Jenkins --- src/core/CL/cl_kernels/elementwise_operation.cl | 4 ++-- 1 file 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) -- cgit v1.2.1