diff options
| author | Giorgio Arena <giorgio.arena@arm.com> | 2018-02-16 15:17:23 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:49:16 +0000 |
| commit | 99ac60bca77e9977c844cc1293751d63ddc3065c (patch) | |
| tree | 30867264809a61c817e5c543a6ac997620f4beaa /src/core/CL/cl_kernels/batchnormalization_layer.cl | |
| parent | 60954c671ffdc3422bbdb728fc022eb6896c1e17 (diff) | |
| download | ComputeLibrary-99ac60bca77e9977c844cc1293751d63ddc3065c.tar.gz | |
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 <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'src/core/CL/cl_kernels/batchnormalization_layer.cl')
| -rw-r--r-- | src/core/CL/cl_kernels/batchnormalization_layer.cl | 13 |
1 files changed, 5 insertions, 8 deletions
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. * |