commit 825af454a1df237dc3b5e4996ed85c71daa72284
author Jim Flynn <jim.flynn@arm.com> Mon May 20 12:49:28 2019 +0100
committer Matteo Martincigh <matteo.martincigh@arm.com> Mon May 20 16:47:20 2019 +0000
tree 047fb43424cb6c4b50adc65ab7f0fdb0e03a37dd
parent f02e6cd728a0bceea221120ec039a4b66436d51d

IVGCVSW-3125 Deprecate CreateMergerDescriptorForConcatenation function

!android-nn-driver:1183

Change-Id: Ia69995b7f09cb86b64611e8efd315413e3064ca1
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

src/backends/backendsCommon/test/LayerTests.cpp

diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp
index 90aceee..5d05959 100644
--- a/src/backends/backendsCommon/test/LayerTests.cpp
+++ b/src/backends/backendsCommon/test/LayerTests.cpp
@@ -3251,7 +3251,7 @@
     inputTensorInfo = outputTensorInfo;
 }
 
-armnn::OriginsDescriptor CreateMergerDescriptorForConcatenation(
+armnn::OriginsDescriptor CreateDescriptorForConcatenation(
         const std::vector<armnn::TensorInfo> & inputTensorInfos,
         unsigned int concatDim)
 {
@@ -3262,9 +3262,9 @@
         shapes.push_back(it.GetShape());
     }
 
-    return armnn::CreateMergerDescriptorForConcatenation(shapes.begin(),
-                                                         shapes.end(),
-                                                         concatDim);
+    return armnn::CreateDescriptorForConcatenation(shapes.begin(),
+                                                   shapes.end(),
+                                                   concatDim);
 }
 
 //
@@ -3515,7 +3515,7 @@
     std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo);
 
     armnn::MergerQueueDescriptor queueDescriptor;
-    armnn::OriginsDescriptor viewsDescriptor = CreateMergerDescriptorForConcatenation(inputTensorInfos, concatDim);
+    armnn::OriginsDescriptor viewsDescriptor = CreateDescriptorForConcatenation(inputTensorInfos, concatDim);
     queueDescriptor.m_Parameters = viewsDescriptor;
 
     if (useSubtensor)