aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/InternalTypes.hpp
diff options
context:
space:
mode:
authorJim Flynn <jim.flynn@arm.com>2019-05-22 14:24:13 +0100
committerJim Flynn <jim.flynn@arm.com>2019-05-28 17:50:33 +0100
commite242f2dc646f41e9162aaaf74e057ce39fcb92df (patch)
treed6c49b559c34d1d306b1e901501dded1c18f71c5 /src/armnn/InternalTypes.hpp
parent2f2778f36e59537bbd47fb8b21e73c6c5a949584 (diff)
downloadarmnn-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 'src/armnn/InternalTypes.hpp')
-rw-r--r--src/armnn/InternalTypes.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp
index 5765b5bcf1..9a215e6d39 100644
--- a/src/armnn/InternalTypes.hpp
+++ b/src/armnn/InternalTypes.hpp
@@ -18,6 +18,7 @@ enum class LayerType
Addition,
BatchNormalization,
BatchToSpaceNd,
+ Concat,
Constant,
ConvertFp16ToFp32,
ConvertFp32ToFp16,
@@ -40,7 +41,6 @@ enum class LayerType
Mean,
MemCopy,
Merge,
- Merger,
Minimum,
Multiplication,
Normalization,