From e32c8440e4f777e48cff4f7a09bdac6f76ad773d Mon Sep 17 00:00:00 2001
From: Teresa Charlin <teresa.charlinreyes@arm.com>
Date: Thu, 5 Mar 2020 14:41:50 +0000
Subject: IVGCVSW-4539 Add missing Activation Unit Test to CL and Neon    
 *Square, Tanh, SoftReLu, LeakyReLu, Abs, ReLU

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Id7beed0b6770177722bf0f93957706620df81b0d
---
 src/backends/cl/test/ClLayerTests.cpp | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

(limited to 'src/backends/cl/test')

diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp
index d8b0fd156b..a79f1ca1ce 100644
--- a/src/backends/cl/test/ClLayerTests.cpp
+++ b/src/backends/cl/test/ClLayerTests.cpp
@@ -36,19 +36,42 @@ using FactoryType = ClWorkloadFactory;
 // Activation
 ARMNN_AUTO_TEST_CASE(ConstantLinearActivation, ConstantLinearActivationTest)
 
+// Sigmoid Activation / Logistic
+ARMNN_AUTO_TEST_CASE(SimpleSigmoid, SimpleSigmoidTest)
+ARMNN_AUTO_TEST_CASE(SimpleSigmoidUint8, SimpleSigmoidUint8Test)
+
+// BoundedReLU Activation
+ARMNN_AUTO_TEST_CASE(ReLu1, BoundedReLuUpperAndLowerBoundTest)
+ARMNN_AUTO_TEST_CASE(ReLu6, BoundedReLuUpperBoundOnlyTest)
 ARMNN_AUTO_TEST_CASE(ReLu1Uint8, BoundedReLuUint8UpperAndLowerBoundTest)
 ARMNN_AUTO_TEST_CASE(ReLu6Uint8, BoundedReLuUint8UpperBoundOnlyTest)
 
-// Elu Activation
-ARMNN_AUTO_TEST_CASE(Elu, EluTest)
+// ReLU Activation
+ARMNN_AUTO_TEST_CASE(ReLu, ReLuTest)
+ARMNN_AUTO_TEST_CASE(ReLuUint8, ReLuUint8Test)
 
-ARMNN_AUTO_TEST_CASE(Logistic, SimpleSigmoidTest)
-ARMNN_AUTO_TEST_CASE(LogisticUint8, SimpleSigmoidUint8Test)
+// SoftReLU Activation
+ARMNN_AUTO_TEST_CASE(SoftReLu, SoftReLuTest)
+
+// LeakyReLU Activation
+ARMNN_AUTO_TEST_CASE(LeakyReLu, LeakyReLuTest)
+
+// Abs Activation
+ARMNN_AUTO_TEST_CASE(Abs, AbsTest)
 
 // Sqrt Activation
 ARMNN_AUTO_TEST_CASE(Sqrt, SqrtTest)
 ARMNN_AUTO_TEST_CASE(SqrtNN, SqrtNNTest)
 
+// Square Activation
+ARMNN_AUTO_TEST_CASE(Square, SquareTest)
+
+// Tanh Activation
+ARMNN_AUTO_TEST_CASE(Tanh, TanhTest)
+
+// Elu Activation
+ARMNN_AUTO_TEST_CASE(Elu, EluTest)
+
 // Batch To Space
 ARMNN_AUTO_TEST_CASE(BatchToSpaceNdNhwcFloat321, BatchToSpaceNdNhwcTest1<DataType::Float32>)
 ARMNN_AUTO_TEST_CASE(BatchToSpaceNdNhwcFloat322, BatchToSpaceNdNhwcTest2<DataType::Float32>)
@@ -1013,6 +1036,9 @@ ARMNN_COMPARE_REF_FIXTURE_TEST_CASE(CompareSqrtActivationWithReference, Positive
 ARMNN_COMPARE_REF_FIXTURE_TEST_CASE(CompareSquareActivationWithReference, ActivationFixture,
                                     CompareActivationTest, ActivationFunction::Square, 5u)
 
+ARMNN_COMPARE_REF_FIXTURE_TEST_CASE(CompareEluActivationWithReference, ActivationFixture,
+                                    CompareActivationTest, ActivationFunction::Elu, 5u)
+
 #endif
 
 BOOST_AUTO_TEST_SUITE_END()
-- 
cgit v1.2.1