aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Flynn <jim.flynn@arm.com>2019-05-13 13:52:56 +0100
committerDavid Monahan <david.monahan@arm.com>2019-05-14 07:20:40 +0000
commit073d7a3e829dd52f47bcd4e2d0ab4b04cc811b32 (patch)
treecb4095c697f5786a67454bc9877c3bb3ec4cbeb1
parenta3e23ca280eaf119e559869fee19d58cc4497e8d (diff)
downloadandroid-nn-driver-073d7a3e829dd52f47bcd4e2d0ab4b04cc811b32.tar.gz
IVGCVSW-3076 Add ConcatLayer methods to public API
!armnn:1119 Change-Id: Ic187f49427e38345f279537ed10a9275980c1360 Signed-off-by: Jim Flynn <jim.flynn@arm.com>
-rw-r--r--1.0/HalPolicy.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp
index 158f0e36..fa29f860 100644
--- a/1.0/HalPolicy.cpp
+++ b/1.0/HalPolicy.cpp
@@ -292,7 +292,7 @@ bool HalPolicy::ConvertConcatenation(const Operation& operation, const Model& mo
std::transform(inputHandles.begin(), inputHandles.end(), std::back_inserter(inputTensorInfos),
[](const LayerInputHandle& h) -> const armnn::TensorInfo*{ return &h.GetTensorInfo(); });
if (!IsLayerSupportedForAnyBackend(__func__,
- armnn::IsMergerSupported,
+ armnn::IsConcatSupported,
data.m_Backends,
inputTensorInfos,
outputInfo,
@@ -301,7 +301,7 @@ bool HalPolicy::ConvertConcatenation(const Operation& operation, const Model& mo
return false;
}
- armnn::IConnectableLayer* layer = data.m_Network->AddMergerLayer(mergerDescriptor);
+ armnn::IConnectableLayer* layer = data.m_Network->AddConcatLayer(mergerDescriptor);
assert(layer != nullptr);
layer->GetOutputSlot(0).SetTensorInfo(outputInfo);