aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarumol Prangnawarat <narumol.prangnawarat@arm.com>2019-04-15 14:14:27 +0100
committerNarumol Prangnawarat <narumol.prangnawarat@arm.com>2019-04-16 11:11:24 +0000
commitb98bbcfa2a809c4ad025883c059ae49c82b37cbd (patch)
treec6c6323063b243036bb73d4481bd5ed0a7a9233d
parente571d33a4550ab3bea6f42dda3ec88d5924e9c00 (diff)
downloadarmnn-b98bbcfa2a809c4ad025883c059ae49c82b37cbd.tar.gz
IVGCVSW-2425 Add unit test for Logistic (Sigmoid) in NEON
Change-Id: I557b76ea8c066161f3eb866daabca63694d46f4e Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
-rw-r--r--src/backends/neon/test/NeonLayerTests.cpp4
-rw-r--r--src/backends/neon/workloads/NeonActivationWorkload.cpp7
2 files changed, 4 insertions, 7 deletions
diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp
index b34e2ddc60..9454244620 100644
--- a/src/backends/neon/test/NeonLayerTests.cpp
+++ b/src/backends/neon/test/NeonLayerTests.cpp
@@ -279,6 +279,10 @@ ARMNN_AUTO_TEST_CASE(ConstantLinearActivation, ConstantLinearActivationTest)
ARMNN_AUTO_TEST_CASE(ReLu1Uint8, BoundedReLuUint8UpperAndLowerBoundTest)
ARMNN_AUTO_TEST_CASE(ReLu6Uint8, BoundedReLuUint8UpperBoundOnlyTest)
+// Sigmoid
+ARMNN_AUTO_TEST_CASE(SimpleSigmoid, SimpleSigmoidTest)
+ARMNN_AUTO_TEST_CASE(SimpleSigmoidUint8, SimpleSigmoidUint8Test)
+
// Softmax
ARMNN_AUTO_TEST_CASE(SimpleSoftmaxBeta1, SimpleSoftmaxTest, 1.0f)
ARMNN_AUTO_TEST_CASE(SimpleSoftmaxBeta2, SimpleSoftmaxTest, 2.0f)
diff --git a/src/backends/neon/workloads/NeonActivationWorkload.cpp b/src/backends/neon/workloads/NeonActivationWorkload.cpp
index c75a138301..7715e5fb33 100644
--- a/src/backends/neon/workloads/NeonActivationWorkload.cpp
+++ b/src/backends/neon/workloads/NeonActivationWorkload.cpp
@@ -22,13 +22,6 @@ arm_compute::Status NeonActivationWorkloadValidate(const TensorInfo& input,
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,
- "Neon: Logistic Activations unsupported with QAsymm8 data type."};
- }
-
return arm_compute::NEActivationLayer::validate(&aclInput,
&aclOutput,
activationLayerInfo);