From ec82b95f26198dc538f94aa90f0febfaf0eb2751 Mon Sep 17 00:00:00 2001 From: Sheri Zhang Date: Thu, 8 Apr 2021 18:37:24 +0100 Subject: Fix OpenCL kernel compiling failure with array initilizer 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. Resolves: COMPMID-4348 Signed-off-by: Sheri Zhang Change-Id: I2d8fc6400f32af5406fbf2d2556127a53b2ce918 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5392 Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- src/core/CL/cl_kernels/winograd_output_transform.cl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 a56ce3de6f..59402bf9b3 100644 --- a/src/core/CL/cl_kernels/winograd_output_transform.cl +++ b/src/core/CL/cl_kernels/winograd_output_transform.cl @@ -690,9 +690,9 @@ __kernel void winograd_output_transform_4x4_3x3_nhwc( #if defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - TILE(DATA_TYPE, 6, N0, in) = { { 0 } }; - TILE(DATA_TYPE, 4, N0, out) = { { 0 } }; - TILE(uint, 6, 1, src_indirect_y) = { { 0 } }; + TILE(DATA_TYPE, 6, N0, in) = {{ { 0 } }}; + TILE(DATA_TYPE, 4, N0, out) = {{ { 0 } }}; + TILE(uint, 6, 1, src_indirect_y) = {{ { 0 } }}; LOOP_UNROLLING(int, i, 0, 6, 1) { @@ -723,7 +723,7 @@ __kernel void winograd_output_transform_4x4_3x3_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) @@ -748,9 +748,9 @@ __kernel void winograd_output_transform_4x4_3x3_nhwc( #else // defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) // Calculate the indirect Y for the source tensor - TILE(DATA_TYPE, 36, N0, in) = { { 0 } }; - TILE(DATA_TYPE, 4, N0, tmp) = { { 0 } }; - TILE(uint, 36, 1, src_indirect_y) = { { 0 } }; + TILE(DATA_TYPE, 36, N0, in) = {{ { 0 } }}; + TILE(DATA_TYPE, 4, N0, tmp) = {{ { 0 } }}; + TILE(uint, 36, 1, src_indirect_y) = {{ { 0 } }}; LOOP_UNROLLING(int, i, 0, 36, 1) { @@ -775,7 +775,7 @@ __kernel void winograd_output_transform_4x4_3x3_nhwc( } // Compute the output tile - TILE(DATA_TYPE, 16, N0, out) = { { 0 } }; + TILE(DATA_TYPE, 16, N0, out) = {{ { 0 } }}; LOOP_UNROLLING(int, i, 0, 4, 1) { @@ -804,7 +804,7 @@ __kernel void winograd_output_transform_4x4_3x3_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