diff options
| author | Usama Arif <usama.arif@arm.com> | 2019-05-10 17:07:27 +0100 |
|---|---|---|
| committer | Usama Arif <usama.arif@arm.com> | 2019-05-15 14:04:19 +0000 |
| commit | 6a98a6e322bfb03f98ac9c4dfdc932ec4bea1fd7 (patch) | |
| tree | 8a21fd98641709708acba3b9cb00b5690ab5e3ec /src/core/CL/cl_kernels/depthwise_convolution_quantized.cl | |
| parent | c61321061b77763ed4569e4342ba3347a873ccb8 (diff) | |
| download | ComputeLibrary-6a98a6e322bfb03f98ac9c4dfdc932ec4bea1fd7.tar.gz | |
COMPMID-2194: Refactor activation function macro in OpenCL. Change all activation calls to macro from activation_float_helpers.h
The different kernels now call the macro from
activation_float_helpers.h. activation_helpers.h is now removed.
Change-Id: I2e1314c6bc891809e88590d99e048072541cca14
Signed-off-by: Usama Arif <usama.arif@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1123
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/CL/cl_kernels/depthwise_convolution_quantized.cl')
| -rw-r--r-- | src/core/CL/cl_kernels/depthwise_convolution_quantized.cl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/CL/cl_kernels/depthwise_convolution_quantized.cl b/src/core/CL/cl_kernels/depthwise_convolution_quantized.cl index 8d145a038e..13568b035d 100644 --- a/src/core/CL/cl_kernels/depthwise_convolution_quantized.cl +++ b/src/core/CL/cl_kernels/depthwise_convolution_quantized.cl @@ -26,16 +26,16 @@ #if defined(WEIGHTS_OFFSET) && defined(INPUT_OFFSET) && defined(K_OFFSET) && ((defined(OUTPUT_OFFSET) && defined(OUTPUT_MULTIPLIER) && defined(OUTPUT_SHIFT)) || defined(REAL_MULTIPLIER)) -#if defined(FUSED_ACTIVATION) +#if defined(ACTIVATION_TYPE) && defined(CONST_0) #define DATA_TYPE uchar #ifndef VEC_SIZE #define VEC_SIZE 8 #endif /* VEC_SIZE */ #include "activation_layer_qa8.cl" -#define ACTIVATION_FUNC(x) PERFORM_ACTIVATION_QA8(FUSED_ACTIVATION, x) -#else /* defined(FUSED_ACTIVATION) */ +#define ACTIVATION_FUNC(x) PERFORM_ACTIVATION_QA8(ACTIVATION_TYPE, x) +#else /* defined(ACTIVATION_TYPE) && defined(CONST_0) */ #define ACTIVATION_FUNC(x) (x) -#endif /* defined(FUSED_ACTIVATION) */ +#endif /* defined(ACTIVATION_TYPE) && defined(CONST_0) */ #if defined(ARM_COMPUTE_OPENCL_DOT8_ENABLED) && defined(cl_arm_integer_dot_product_int8) #if defined(ARM_COMPUTE_OPENCL_DOT8_ACC_ENABLED) && defined(cl_arm_integer_dot_product_accumulate_int8) |