From 825af454a1df237dc3b5e4996ed85c71daa72284 Mon Sep 17 00:00:00 2001
From: Jim Flynn <jim.flynn@arm.com>
Date: Mon, 20 May 2019 12:49:28 +0100
Subject: 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     | 10 +++++-----
 src/backends/backendsCommon/test/MergerTestImpl.hpp |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/backends/backendsCommon')

diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp
index 90aceee619..5d059598a5 100644
--- a/src/backends/backendsCommon/test/LayerTests.cpp
+++ b/src/backends/backendsCommon/test/LayerTests.cpp
@@ -3251,7 +3251,7 @@ void PermuteTensorData(
     inputTensorInfo = outputTensorInfo;
 }
 
-armnn::OriginsDescriptor CreateMergerDescriptorForConcatenation(
+armnn::OriginsDescriptor CreateDescriptorForConcatenation(
         const std::vector<armnn::TensorInfo> & inputTensorInfos,
         unsigned int concatDim)
 {
@@ -3262,9 +3262,9 @@ armnn::OriginsDescriptor CreateMergerDescriptorForConcatenation(
         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 @@ void Concatenate(
     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)
diff --git a/src/backends/backendsCommon/test/MergerTestImpl.hpp b/src/backends/backendsCommon/test/MergerTestImpl.hpp
index edf5e2b7be..8483cf02d8 100644
--- a/src/backends/backendsCommon/test/MergerTestImpl.hpp
+++ b/src/backends/backendsCommon/test/MergerTestImpl.hpp
@@ -30,9 +30,9 @@ INetworkPtr CreateMergerNetwork(const std::vector<TensorShape>& inputShapes,
 
     OriginsDescriptor descriptor;
 
-    descriptor = CreateMergerDescriptorForConcatenation(inputShapes.begin(),
-                                                        inputShapes.end(),
-                                                        concatAxis);
+    descriptor = CreateDescriptorForConcatenation(inputShapes.begin(),
+                                                  inputShapes.end(),
+                                                  concatAxis);
     ARMNN_NO_DEPRECATE_WARN_BEGIN
     IConnectableLayer* merger = net->AddMergerLayer(descriptor, "merger");
     ARMNN_NO_DEPRECATE_WARN_END
-- 
cgit v1.2.1