From 825af454a1df237dc3b5e4996ed85c71daa72284 Mon Sep 17 00:00:00 2001 From: Jim Flynn 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 --- include/armnn/Descriptors.hpp | 15 +++++++++++++-- src/armnn/test/CreateWorkload.hpp | 6 +++--- src/armnnSerializer/test/SerializerTests.cpp | 4 ++-- src/backends/backendsCommon/test/LayerTests.cpp | 10 +++++----- src/backends/backendsCommon/test/MergerTestImpl.hpp | 6 +++--- 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 5be59aaa03..dcbb8c4675 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -4,6 +4,7 @@ // #pragma once +#include "Deprecated.hpp" #include "DescriptorsFwd.hpp" #include @@ -134,11 +135,21 @@ private: uint32_t** m_ViewSizes; }; +template +ARMNN_DEPRECATED_MSG("Use CreateDescriptorForConcatenation instead") +OriginsDescriptor CreateMergerDescriptorForConcatenation(TensorShapeIt first, + TensorShapeIt last, + unsigned int concatenationDimension) +{ + return CreateDescriptorForConcatenation(first, last, concatenationDimension); +} + /// @brief Convenience template to create an OriginsDescriptor to use when creating a MergerLayer for performing /// concatenation of a number of input tensors. template -OriginsDescriptor CreateMergerDescriptorForConcatenation(TensorShapeIt first, TensorShapeIt last, - unsigned int concatenationDimension) +OriginsDescriptor CreateDescriptorForConcatenation(TensorShapeIt first, + TensorShapeIt last, + unsigned int concatenationDimension) { auto numInputs = std::distance(first, last); diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index f758aaa80b..be52eadb57 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -1069,9 +1069,9 @@ std::unique_ptr CreateMergerWorkloadTest(armnn::IWorkloadFactory std::vector inputShapes{{ 2, 3, 2, 5 }, { 2, 3, 2, 5 }}; - descriptor = CreateMergerDescriptorForConcatenation(inputShapes.begin(), - inputShapes.end(), - concatAxis); + descriptor = CreateDescriptorForConcatenation(inputShapes.begin(), + inputShapes.end(), + concatAxis); Layer* const merger = graph.AddLayer(descriptor, "merger"); BOOST_TEST_CHECKPOINT("created merger layer"); diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 42111e6155..01eae2ebbf 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -1280,7 +1280,7 @@ BOOST_AUTO_TEST_CASE(SerializeMerger) const std::vector shapes({inputInfo.GetShape(), inputInfo.GetShape()}); armnn::OriginsDescriptor descriptor = - armnn::CreateMergerDescriptorForConcatenation(shapes.begin(), shapes.end(), 0); + armnn::CreateDescriptorForConcatenation(shapes.begin(), shapes.end(), 0); armnn::INetworkPtr network = armnn::INetwork::Create(); armnn::IConnectableLayer* const inputLayerOne = network->AddInputLayer(0); @@ -1375,7 +1375,7 @@ BOOST_AUTO_TEST_CASE(EnsureMergerLayerBackwardCompatibility) const std::vector shapes({inputInfo.GetShape(), inputInfo.GetShape()}); armnn::OriginsDescriptor descriptor = - armnn::CreateMergerDescriptorForConcatenation(shapes.begin(), shapes.end(), 0); + armnn::CreateDescriptorForConcatenation(shapes.begin(), shapes.end(), 0); MergerLayerVerifier verifier(layerName, {inputInfo, inputInfo}, {outputInfo}, descriptor); deserializedNetwork->Accept(verifier); 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 & 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 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& 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