aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/InternalTypes.hpp
diff options
context:
space:
mode:
authorNattapat Chaimanowong <nattapat.chaimanowong@arm.com>2019-04-05 13:37:19 +0100
committerNattapat Chaimanowong <nattapat.chaimanowong@arm.com>2019-04-05 13:37:29 +0100
commit1f88630874fe346cd0cca8d8e38e0fb96cc1a3f4 (patch)
tree41acf0281797c5d4e9e515032ac989428efcb5b8 /src/armnn/InternalTypes.hpp
parent647aab364aa13490427533c427496ad725b47f7a (diff)
downloadarmnn-1f88630874fe346cd0cca8d8e38e0fb96cc1a3f4.tar.gz
IVGCVSW-2915 Add Merge Layer and no-op factory method
Change-Id: I54549671e0d3b207904cf9796a843eb2b0a631f7 Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
Diffstat (limited to 'src/armnn/InternalTypes.hpp')
-rw-r--r--src/armnn/InternalTypes.hpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp
index 1972e9c1b5..7c7c601d95 100644
--- a/src/armnn/InternalTypes.hpp
+++ b/src/armnn/InternalTypes.hpp
@@ -39,6 +39,7 @@ enum class LayerType
Maximum,
Mean,
MemCopy,
+ Merge,
Merger,
Minimum,
Multiplication,