aboutsummaryrefslogtreecommitdiff
path: root/src/backends/cl/ClLayerSupport.cpp
diff options
context:
space:
mode:
authorNikhil Raj <nikhil.raj@arm.com>2018-11-19 14:51:07 +0000
committerNikhil Raj <nikhil.raj@arm.com>2018-11-19 14:51:07 +0000
commit8599a415c159aa867db12853b3195f0f0a51ee6b (patch)
treef85987c71dc745d7da7c672466723c26e39290b6 /src/backends/cl/ClLayerSupport.cpp
parent1d67a6905daed13354e66f00549e12fea62170ed (diff)
downloadarmnn-8599a415c159aa867db12853b3195f0f0a51ee6b.tar.gz
IVGCVSW-2043 - Merger using ACL for innermost concat axis
* Add ClMergerWorkload and NeonMergerWorkload to call ACL for innermost concat axis * Modify layer support to call ClMergerWorkloadValidate and NeonMergerWorkloadValidate when concat axis is inner most * Add m_ConcatAxis to MergerDescriptor * Modify MergerQueueDescriptor::Validate to check sub tensor only when using subtensor !android-nn-driver:166 Change-Id: I56676b43964c8d6d726387b41b3cc34a512c0f0a
Diffstat (limited to 'src/backends/cl/ClLayerSupport.cpp')
-rw-r--r--src/backends/cl/ClLayerSupport.cpp22
1 files changed, 17 insertions, 5 deletions
diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp
index 039f1c24f0..a5030beb47 100644
--- a/src/backends/cl/ClLayerSupport.cpp
+++ b/src/backends/cl/ClLayerSupport.cpp
@@ -27,6 +27,7 @@
#include "workloads/ClL2NormalizationFloatWorkload.hpp"
#include "workloads/ClLstmFloatWorkload.hpp"
#include "workloads/ClMeanWorkload.hpp"
+#include "workloads/ClMergerWorkload.hpp"
#include "workloads/ClMultiplicationWorkload.hpp"
#include "workloads/ClNormalizationFloatWorkload.hpp"
#include "workloads/ClPadWorkload.hpp"
@@ -366,14 +367,25 @@ bool ClLayerSupport::IsMeanSupported(const TensorInfo& input,
}
bool ClLayerSupport::IsMergerSupported(const std::vector<const TensorInfo*> inputs,
+ const TensorInfo& output,
const OriginsDescriptor& descriptor,
Optional<std::string&> reasonIfUnsupported) const
{
- ignore_unused(descriptor);
- return IsSupportedForDataTypeCl(reasonIfUnsupported,
- inputs[0]->GetDataType(),
- &TrueFunc<>,
- &FalseFuncU8<>);
+ if(descriptor.GetNumDimensions() - descriptor.GetConcatAxis() == 1)
+ {
+ FORWARD_WORKLOAD_VALIDATE_FUNC(ClMergerWorkloadValidate,
+ reasonIfUnsupported,
+ inputs,
+ output,
+ descriptor);
+ }
+ else
+ {
+ return IsSupportedForDataTypeCl(reasonIfUnsupported,
+ inputs[0]->GetDataType(),
+ &TrueFunc<>,
+ &FalseFuncU8<>);
+ }
}
bool ClLayerSupport::IsMultiplicationSupported(const TensorInfo& input0,