diff options
author | Jim Flynn <jim.flynn@arm.com> | 2019-05-20 12:49:28 +0100 |
---|---|---|
committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-05-20 16:47:20 +0000 |
commit | 825af454a1df237dc3b5e4996ed85c71daa72284 (patch) | |
tree | 047fb43424cb6c4b50adc65ab7f0fdb0e03a37dd /include | |
parent | f02e6cd728a0bceea221120ec039a4b66436d51d (diff) | |
download | armnn-825af454a1df237dc3b5e4996ed85c71daa72284.tar.gz |
IVGCVSW-3125 Deprecate CreateMergerDescriptorForConcatenation function
!android-nn-driver:1183
Change-Id: Ia69995b7f09cb86b64611e8efd315413e3064ca1
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/armnn/Descriptors.hpp | 15 |
1 files changed, 13 insertions, 2 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 <cstdint> @@ -134,11 +135,21 @@ private: uint32_t** m_ViewSizes; }; +template <typename TensorShapeIt> +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 <typename TensorShapeIt> -OriginsDescriptor CreateMergerDescriptorForConcatenation(TensorShapeIt first, TensorShapeIt last, - unsigned int concatenationDimension) +OriginsDescriptor CreateDescriptorForConcatenation(TensorShapeIt first, + TensorShapeIt last, + unsigned int concatenationDimension) { auto numInputs = std::distance(first, last); |