From 54f366afa63522b8c0ea3b0e5e8d3012a4412681 Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Mon, 25 Sep 2017 15:36:14 +0100 Subject: COMPMID-417: Fix CL compiler warnings Change-Id: If2c90f7352bff64abbf2faec7f33340e6873b5cd Reviewed-on: http://mpd-gerrit.cambridge.arm.com/89020 Reviewed-by: Georgios Pinitas Tested-by: Kaizen --- src/core/CL/cl_kernels/batchnormalization_layer.cl | 1 - src/core/CL/cl_kernels/direct_convolution3x3.cl | 2 ++ src/core/CL/cl_kernels/fill_border.cl | 3 --- src/core/CL/cl_kernels/transpose.cl | 3 +++ 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/core') diff --git a/src/core/CL/cl_kernels/batchnormalization_layer.cl b/src/core/CL/cl_kernels/batchnormalization_layer.cl index 904d5b3045..b7423d8757 100644 --- a/src/core/CL/cl_kernels/batchnormalization_layer.cl +++ b/src/core/CL/cl_kernels/batchnormalization_layer.cl @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - #include "helpers.h" #if defined(FIXED_POINT_POSITION) diff --git a/src/core/CL/cl_kernels/direct_convolution3x3.cl b/src/core/CL/cl_kernels/direct_convolution3x3.cl index 1a228dd74c..d094eca115 100644 --- a/src/core/CL/cl_kernels/direct_convolution3x3.cl +++ b/src/core/CL/cl_kernels/direct_convolution3x3.cl @@ -34,6 +34,8 @@ MULQ_SAT_IMPL(qs32x8, qs32x8) #else /* FIXED_POINT_POSITION */ +#undef CONVERT_SAT + #define ADD_OP(a, b) ((a) + (b)) #define MUL_OP(a, b) ((a) * (b)) #define CONVERT_SAT(a, b) ((a)) diff --git a/src/core/CL/cl_kernels/fill_border.cl b/src/core/CL/cl_kernels/fill_border.cl index 2db8c67877..fbd4f6ae0f 100644 --- a/src/core/CL/cl_kernels/fill_border.cl +++ b/src/core/CL/cl_kernels/fill_border.cl @@ -21,13 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "fixed_point.h" #include "helpers.h" #if defined(FIXED_POINT_POSITION) - #include "fixed_point.h" - #endif /* FIXED_POINT_POSITION */ /** Fill N pixel of the padding edge of a single channel image by replicating the closest valid pixel. diff --git a/src/core/CL/cl_kernels/transpose.cl b/src/core/CL/cl_kernels/transpose.cl index daa0129e7d..c9930050ee 100644 --- a/src/core/CL/cl_kernels/transpose.cl +++ b/src/core/CL/cl_kernels/transpose.cl @@ -100,6 +100,9 @@ #error DATA_TYPE_IN_BYTES not set for the transpose OpenCL kernel #endif /* not DATA_TYPE_IN_BYTES */ +#undef VLOAD +#undef VSTORE + #if DATA_TYPE_IN_BYTES == 4 #define DATA_TYPE uint #define TRANSPOSE() TRANSPOSE_4x4(u0, u1, u2, u3) -- cgit v1.2.1