From: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Date: Tue, 6 Aug 2019 16:34:22 +0000 (+0100)
Subject: IVGCVSW-3614 Remove limitation of axis=1 support for Softmax in Cl and Neon
X-Git-Tag: submit/tizen/20200316.035456~379
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c4eb3520ad5da2720dfdd8f4b7a5333f8b9da80;p=platform%2Fupstream%2Farmnn.git

IVGCVSW-3614 Remove limitation of axis=1 support for Softmax in Cl and Neon

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: Id990ae7445080f6b4d5a0e6f942f871879a52f75
---

diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp
index cca265f..811bf8a 100644
--- a/src/backends/cl/ClLayerSupport.cpp
+++ b/src/backends/cl/ClLayerSupport.cpp
@@ -605,13 +605,6 @@ bool ClLayerSupport::IsSoftmaxSupported(const TensorInfo& input,
                                         const SoftmaxDescriptor& descriptor,
                                         Optional<std::string&> reasonIfUnsupported) const
 {
-    if (!(descriptor.m_Axis == 1 ||
-         (descriptor.m_Axis < 0 && static_cast<int>(input.GetNumDimensions()) + descriptor.m_Axis == 1)))
-    {
-        SetValueChecked(reasonIfUnsupported, "Cl Softmax: Only supports Axis equal to 1.");
-        return false;
-    }
-    ignore_unused(descriptor);
     FORWARD_WORKLOAD_VALIDATE_FUNC(ClSoftmaxWorkloadValidate, reasonIfUnsupported, input, output, descriptor);
 }
 
diff --git a/src/backends/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp
index b61279c..b3a57e2 100644
--- a/src/backends/neon/NeonLayerSupport.cpp
+++ b/src/backends/neon/NeonLayerSupport.cpp
@@ -549,12 +549,6 @@ bool NeonLayerSupport::IsSoftmaxSupported(const TensorInfo& input,
                                           const SoftmaxDescriptor& descriptor,
                                           Optional<std::string&> reasonIfUnsupported) const
 {
-    if (!(descriptor.m_Axis == 1 ||
-         (descriptor.m_Axis < 0 && static_cast<int>(input.GetNumDimensions()) + descriptor.m_Axis == 1)))
-    {
-        SetValueChecked(reasonIfUnsupported, "Neon Softmax: Only supports Axis equal to 1.");
-        return false;
-    }
     FORWARD_WORKLOAD_VALIDATE_FUNC(NeonSoftmaxWorkloadValidate, reasonIfUnsupported, input, output, descriptor);
 }