diff options
author | Jim Flynn <jim.flynn@arm.com> | 2019-05-22 14:24:13 +0100 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2019-05-28 17:50:33 +0100 |
commit | e242f2dc646f41e9162aaaf74e057ce39fcb92df (patch) | |
tree | d6c49b559c34d1d306b1e901501dded1c18f71c5 /include/armnn/Descriptors.hpp | |
parent | 2f2778f36e59537bbd47fb8b21e73c6c5a949584 (diff) | |
download | armnn-e242f2dc646f41e9162aaaf74e057ce39fcb92df.tar.gz |
IVGCVSW-3119 Rename MergerLayer to ConcatLayer
!android-nn-driver:1210
Change-Id: I940b3b9e421c92bfd55ae996f7bc54ac077f2604
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'include/armnn/Descriptors.hpp')
-rw-r--r-- | include/armnn/Descriptors.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index dcbb8c4675..25bf818987 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -54,8 +54,8 @@ struct SoftmaxDescriptor float m_Beta; }; -/// @brief An OriginsDescriptor for the MergerLayer. -/// Descriptor to configure the merging process. Number of views must be equal to the number of inputs, and +/// @brief An OriginsDescriptor for the ConcatLayer. +/// Descriptor to configure the concatenation process. Number of views must be equal to the number of inputs, and /// their order must match - e.g. first view corresponds to the first input, second view to the second input, etc. struct OriginsDescriptor { @@ -144,12 +144,12 @@ OriginsDescriptor CreateMergerDescriptorForConcatenation(TensorShapeIt first, return CreateDescriptorForConcatenation(first, last, concatenationDimension); } -/// @brief Convenience template to create an OriginsDescriptor to use when creating a MergerLayer for performing +/// @brief Convenience template to create an OriginsDescriptor to use when creating a ConcatLayer for performing /// concatenation of a number of input tensors. template <typename TensorShapeIt> OriginsDescriptor CreateDescriptorForConcatenation(TensorShapeIt first, - TensorShapeIt last, - unsigned int concatenationDimension) + TensorShapeIt last, + unsigned int concatenationDimension) { auto numInputs = std::distance(first, last); |