COMPMID-2194: Refactor activation function macro in OpenCL. New Macros for activation.
This commit contains the new macros for activation. Only the
activation_layer utilizes the new macros in this commit.
Change-Id: I2fa8567cc876e8cb67a1e876652bc348b7ed23ea
Signed-off-by: Usama Arif <usama.arif@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1104
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
diff --git a/src/core/CL/cl_kernels/activation_layer.cl b/src/core/CL/cl_kernels/activation_layer.cl
index cf1f434..d820753 100644
--- a/src/core/CL/cl_kernels/activation_layer.cl
+++ b/src/core/CL/cl_kernels/activation_layer.cl
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2018 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -21,12 +21,11 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
+#if defined(ACT) && defined(DATA_TYPE) && defined(VEC_SIZE)
+
#define TYPE VEC_DATA_TYPE(DATA_TYPE, VEC_SIZE)
-#define SELECT_TYPE VEC_DATA_TYPE(SELECT_DATA_TYPE, VEC_SIZE)
-#include "activation_helpers.h"
-
-#if defined(ACT)
+#include "activation_float_helpers.h"
/** This performs an activation function floating point inputs.
*
@@ -74,11 +73,11 @@
TYPE data = VLOAD(VEC_SIZE)(0, (__global DATA_TYPE *)input.ptr);
// Perform activation
- data = ACTIVATION_OP(ACT, data);
+ data = ACTIVATION(ACT, DATA_TYPE, data, A_VAL, B_VAL);
// Store result
VSTORE(VEC_SIZE)
(data, 0, (__global DATA_TYPE *)output.ptr);
}
-#endif /* defined(ACT) */
\ No newline at end of file
+#endif /* defined(ACT) */