commit b5b9bdf14d032f3133d5a76835742bbc8291494d
author Finn Williams <finn.williams@arm.com> Mon Feb 18 10:07:34 2019 +0000
committer derek.lamberti <derek.lamberti@arm.com> Thu Feb 21 18:18:52 2019 +0000
tree 3ab262f58da46a632f3d98332789caf7209ed1d7
parent e74e55418dbd40b91e8b32b74611870fac9f206e

IVGCVSW-2424 Add LOGISTIC Operator Support (CL)

 * Added Logistic tests in ClLayerTests
 * Removed check for QuantisedAsymm8 in CLActivationWorkload

Change-Id: I6950e18109504d8426b727cb6b7d19898c899024
Signed-off-by: Finn Williams <finn.williams@arm.com>

src/backends/cl/test/ClLayerTests.cpp

diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp
index 641e964..23b4dc4 100644
--- a/src/backends/cl/test/ClLayerTests.cpp
+++ b/src/backends/cl/test/ClLayerTests.cpp
@@ -42,6 +42,9 @@
 ARMNN_AUTO_TEST_CASE(ReLu1Uint8, BoundedReLuUint8UpperAndLowerBoundTest)
 ARMNN_AUTO_TEST_CASE(ReLu6Uint8, BoundedReLuUint8UpperBoundOnlyTest)
 
+ARMNN_AUTO_TEST_CASE(Logistic, SimpleSigmoidTest)
+ARMNN_AUTO_TEST_CASE(LogisticUint8, SimpleSigmoidUint8Test)
+
 // Batch To Space
 ARMNN_AUTO_TEST_CASE(BatchToSpaceNdNhwcFloat321, BatchToSpaceNdNhwcFloat32Test1)
 ARMNN_AUTO_TEST_CASE(BatchToSpaceNdNhwcFloat322, BatchToSpaceNdNhwcFloat32Test2)

src/backends/cl/workloads/ClActivationWorkload.cpp

diff --git a/src/backends/cl/workloads/ClActivationWorkload.cpp b/src/backends/cl/workloads/ClActivationWorkload.cpp
index 9b65856..6856520 100644
--- a/src/backends/cl/workloads/ClActivationWorkload.cpp
+++ b/src/backends/cl/workloads/ClActivationWorkload.cpp
@@ -24,13 +24,6 @@
     const arm_compute::ActivationLayerInfo activationLayerInfo =
         ConvertActivationDescriptorToAclActivationLayerInfo(descriptor);
 
-    if (input.GetDataType() == DataType::QuantisedAsymm8 &&
-        activationLayerInfo.activation() == arm_compute::ActivationLayerInfo::ActivationFunction::LOGISTIC)
-    {
-        return arm_compute::Status{arm_compute::ErrorCode::RUNTIME_ERROR,
-                                   "CL: Logistic Activations unsupported with QAsymm8 data type."};
-    }
-
     return arm_compute::CLActivationLayer::validate(&aclInput,
                                                     &aclOutput,
                                                     activationLayerInfo);