From 3c4eb3520ad5da2720dfdd8f4b7a5333f8b9da80 Mon Sep 17 00:00:00 2001 From: Narumol Prangnawarat Date: Tue, 6 Aug 2019 17:34:22 +0100 Subject: IVGCVSW-3614 Remove limitation of axis=1 support for Softmax in Cl and Neon Signed-off-by: Narumol Prangnawarat Change-Id: Id990ae7445080f6b4d5a0e6f942f871879a52f75 --- src/backends/cl/ClLayerSupport.cpp | 7 ------- src/backends/neon/NeonLayerSupport.cpp | 6 ------ 2 files changed, 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 reasonIfUnsupported) const { - if (!(descriptor.m_Axis == 1 || - (descriptor.m_Axis < 0 && static_cast(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 reasonIfUnsupported) const { - if (!(descriptor.m_Axis == 1 || - (descriptor.m_Axis < 0 && static_cast(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); } -- cgit v1.2.1