diff options
| author | Nikhil Raj <nikhil.raj@arm.com> | 2018-11-19 14:51:07 +0000 |
|---|---|---|
| committer | Nikhil Raj <nikhil.raj@arm.com> | 2018-11-19 14:51:07 +0000 |
| commit | 8599a415c159aa867db12853b3195f0f0a51ee6b (patch) | |
| tree | f85987c71dc745d7da7c672466723c26e39290b6 /src/backends/backendsCommon/WorkloadFactory.cpp | |
| parent | 1d67a6905daed13354e66f00549e12fea62170ed (diff) | |
| download | armnn-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/backendsCommon/WorkloadFactory.cpp')
| -rw-r--r-- | src/backends/backendsCommon/WorkloadFactory.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp index dc38f1a721..2e2824e521 100644 --- a/src/backends/backendsCommon/WorkloadFactory.cpp +++ b/src/backends/backendsCommon/WorkloadFactory.cpp @@ -471,7 +471,9 @@ bool IWorkloadFactory::IsLayerSupported(const BackendId& backendId, auto endPtr = boost::make_transform_iterator(inputs.end(), getTensorInfoPtr); std::vector<const TensorInfo*> inputPtrs(beginPtr, endPtr); - result = layerSupportObject->IsMergerSupported(inputPtrs, cLayer->GetParameters(), reason); + const TensorInfo& output = layer.GetOutputSlot(0).GetTensorInfo(); + + result = layerSupportObject->IsMergerSupported(inputPtrs, output, cLayer->GetParameters(), reason); break; } case LayerType::Multiplication: |