From 6dbcc0e4d2fd0c61602a1a0c4a0ac548da713087 Mon Sep 17 00:00:00 2001 From: Sheri Zhang Date: Mon, 12 Apr 2021 10:53:57 +0100 Subject: Fix OpenCL kernel compiling failure with array initializer The issue is related with clang version, clang 3.9 has the problem, clange 4.0 works. The workaround is to add an extra {} to make this work. Partial resolves: COMPMID-4348 Signed-off-by: Sheri Zhang Change-Id: Ia079cbb3c44d617b1b42cb2af758b5a8ba1a032e Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5399 Tested-by: Arm Jenkins Reviewed-by: Manuel Bottini Comments-Addressed: Arm Jenkins --- src/core/CL/cl_kernels/winograd_output_transform.cl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/core/CL/cl_kernels/winograd_output_transform.cl') diff --git a/src/core/CL/cl_kernels/winograd_output_transform.cl b/src/core/CL/cl_kernels/winograd_output_transform.cl index b050c56cde..674a138d48 100644 --- a/src/core/CL/cl_kernels/winograd_output_transform.cl +++ b/src/core/CL/cl_kernels/winograd_output_transform.cl @@ -1043,10 +1043,10 @@ __kernel void winograd_output_transform_4x4_5x5_nhwc( const int bout = GET_SPATIAL_IDX(2, 1, 0); // BATCH SIZE IDX #if defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - TILE(DATA_TYPE, 8, N0, in) = { { 0 } }; - TILE(DATA_TYPE, 4, N0, out) = { { 0 } }; - TILE(DATA_TYPE, 4, N0, tmp) = { { 0 } }; - TILE(uint, 8, 1, src_indirect_y) = { { 0 } }; + TILE(DATA_TYPE, 8, N0, in) = { { { 0 } } }; + TILE(DATA_TYPE, 4, N0, out) = { { { 0 } } }; + TILE(DATA_TYPE, 4, N0, tmp) = { { { 0 } } }; + TILE(uint, 8, 1, src_indirect_y) = { { { 0 } } }; LOOP_UNROLLING(int, i, 0, 8, 1) { @@ -1081,7 +1081,7 @@ __kernel void winograd_output_transform_4x4_5x5_nhwc( T_ACTIVATION(DATA_TYPE, 4, N0, ACTIVATION_TYPE, A_VAL, B_VAL, out, out); - TILE(uint, 4, 1, dst_indirect_y) = { { 0 } }; + TILE(uint, 4, 1, dst_indirect_y) = { { { 0 } } }; // Calculate the destination indirect Y #if defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) @@ -1105,9 +1105,9 @@ __kernel void winograd_output_transform_4x4_5x5_nhwc( #else // defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) // Calculate the indirect Y for the source tensor - TILE(DATA_TYPE, 64, N0, in) = { { 0 } }; - TILE(DATA_TYPE, 6, N0, tmp) = { { 0 } }; - TILE(uint, 64, 1, src_indirect_y) = { { 0 } }; + TILE(DATA_TYPE, 64, N0, in) = { { { 0 } } }; + TILE(DATA_TYPE, 6, N0, tmp) = { { { 0 } } }; + TILE(uint, 64, 1, src_indirect_y) = { { { 0 } } }; LOOP_UNROLLING(int, i, 0, 64, 1) { @@ -1138,7 +1138,7 @@ __kernel void winograd_output_transform_4x4_5x5_nhwc( } // Compute the output tile - TILE(DATA_TYPE, 16, N0, out) = { { 0 } }; + TILE(DATA_TYPE, 16, N0, out) = { { { 0 } } }; // in * A, with in = A^T * in as above LOOP_UNROLLING(int, i, 0, 4, 1) @@ -1173,7 +1173,7 @@ __kernel void winograd_output_transform_4x4_5x5_nhwc( T_ACTIVATION(DATA_TYPE, 16, N0, ACTIVATION_TYPE, A_VAL, B_VAL, out, out); - TILE(uint, 16, 1, dst_indirect_y) = { { 0 } }; + TILE(uint, 16, 1, dst_indirect_y) = { { { 0 } } }; // Calculate the destination indirect Y LOOP_UNROLLING(int, yk, 0, 4, 1) -- cgit v1.2.1