From 99ac60bca77e9977c844cc1293751d63ddc3065c Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Fri, 16 Feb 2018 15:17:23 +0000 Subject: COMPMID-853 Fuse CL DepthwiseConvolution with Activation for QASYM8 Change-Id: I287908f76af458ad4b4d865d353dc37e33877250 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/120839 Tested-by: Jenkins Reviewed-by: Anthony Barbier Reviewed-by: Georgios Pinitas --- src/core/CL/cl_kernels/batchnormalization_layer.cl | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/core/CL/cl_kernels/batchnormalization_layer.cl') diff --git a/src/core/CL/cl_kernels/batchnormalization_layer.cl b/src/core/CL/cl_kernels/batchnormalization_layer.cl index 5ddeb1a6a1..0b61b5638c 100644 --- a/src/core/CL/cl_kernels/batchnormalization_layer.cl +++ b/src/core/CL/cl_kernels/batchnormalization_layer.cl @@ -44,15 +44,12 @@ #endif /* FIXED_POINT_POSITION */ -#if defined(LU_BRELU) -#define ACTIVATION_FUNC(x) CLAMP(x, (DATA_TYPE)B_VAL, (DATA_TYPE)A_VAL) -#elif defined(BRELU) -#define ACTIVATION_FUNC(x) CLAMP(x, (DATA_TYPE)0, (DATA_TYPE)A_VAL) -#elif defined(RELU) -#define ACTIVATION_FUNC(x) max(x, (DATA_TYPE)0) -#else /* FUSED_ACT */ +#if defined(FUSED_ACTIVATION) +#include "activation_layer.cl" +#define ACTIVATION_FUNC(x) ACTIVATION_OP(FUSED_ACTIVATION, x) +#else /* defined(FUSED_ACTIVATION) */ #define ACTIVATION_FUNC(x) (x) -#endif /* FUSED_ACT */ +#endif /* defined(FUSED_ACTIVATION) */ /** Apply batch normalization. * -- cgit v1.2.1