aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarumol Prangnawarat <narumol.prangnawarat@arm.com>2019-08-06 17:34:22 +0100
committerNarumol Prangnawarat <narumol.prangnawarat@arm.com>2019-08-06 16:57:44 +0000
commit3c4eb3520ad5da2720dfdd8f4b7a5333f8b9da80 (patch)
tree5758fa43fd3cdfc7baca9b56d53455b245b2ce9e
parentc2291fcefde372032aaa5a2b8260801331c76c7c (diff)
downloadarmnn-3c4eb3520ad5da2720dfdd8f4b7a5333f8b9da80.tar.gz
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
-rw-r--r--src/backends/cl/ClLayerSupport.cpp7
-rw-r--r--src/backends/neon/NeonLayerSupport.cpp6
2 files changed, 0 insertions, 13 deletions
diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp
index cca265f30c..811bf8ada7 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 b61279c133..b3a57e2cd5 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);
}