commit a07ce151674e28a3e755f1c48785b599f1d34827
author Georgios Pinitas <georgios.pinitas@arm.com> Fri Oct 11 17:38:50 2019 +0100
committer Michalis Spyrou <michalis.spyrou@arm.com> Wed Oct 16 10:49:36 2019 +0000
tree 7c4f699f990f1b58975867bf5f693b681e3efd76
parent db8485ac24135f17e9882c76196924435abc064f

COMPMID-2741: [CL] GEMMMatrixMultiplyReshaped clCreateKernel Error

Using the accumulator type during the activation in gemm for mixed
precision operations as some OpenCL compiler versions complain for
mixing float data types for primitive built-ins.

Change-Id: I1c4b394c57962aeebb541de572614a7e3ee3f223
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2080
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

src/core/CL/cl_kernels/gemm.cl

diff --git a/src/core/CL/cl_kernels/gemm.cl b/src/core/CL/cl_kernels/gemm.cl
index 57a5af8..66d0e10 100644
--- a/src/core/CL/cl_kernels/gemm.cl
+++ b/src/core/CL/cl_kernels/gemm.cl
@@ -2094,7 +2094,11 @@
 #endif // defined(BETA)
 
 #if defined(ACTIVATION_TYPE)
+#if defined(MIXED_PRECISION)
     ACTIVATION_BLOCK(M0, ACTIVATION_TYPE, DATA_TYPE_ACCUMULATOR, c, A_VAL, B_VAL);
+#else  // defined(MIXED_PRECISION)
+    ACTIVATION_BLOCK(M0, ACTIVATION_TYPE, DATA_TYPE, c, A_VAL, B_VAL);
+#endif // defined(MIXED_PRECISION)
 #endif // defined(ACTIVATION_TYPE)
 
     // Store output block
@@ -2570,7 +2574,11 @@
 #endif // defined(BETA)
 
 #if defined(ACTIVATION_TYPE)
+#if defined(MIXED_PRECISION)
+    ACTIVATION_BLOCK(M0, ACTIVATION_TYPE, DATA_TYPE_ACCUMULATOR, c, A_VAL, B_VAL);
+#else  // defined(MIXED_PRECISION)
     ACTIVATION_BLOCK(M0, ACTIVATION_TYPE, DATA_TYPE, c, A_VAL, B_VAL);
+#endif // defined(MIXED_PRECISION)
 #endif // defined(ACTIVATION_TYPE)
 
     // Store output block