diff options
author | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-04-05 13:37:19 +0100 |
---|---|---|
committer | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-04-05 13:37:29 +0100 |
commit | 1f88630874fe346cd0cca8d8e38e0fb96cc1a3f4 (patch) | |
tree | 41acf0281797c5d4e9e515032ac989428efcb5b8 /src/armnn/LayersFwd.hpp | |
parent | 647aab364aa13490427533c427496ad725b47f7a (diff) | |
download | armnn-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/LayersFwd.hpp')
-rw-r--r-- | src/armnn/LayersFwd.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/armnn/LayersFwd.hpp b/src/armnn/LayersFwd.hpp index 9d87aeeee3..0bd68e04af 100644 --- a/src/armnn/LayersFwd.hpp +++ b/src/armnn/LayersFwd.hpp @@ -31,6 +31,7 @@ #include "layers/MaximumLayer.hpp" #include "layers/MeanLayer.hpp" #include "layers/MemCopyLayer.hpp" +#include "layers/MergeLayer.hpp" #include "layers/MergerLayer.hpp" #include "layers/MinimumLayer.hpp" #include "layers/MultiplicationLayer.hpp" @@ -102,6 +103,7 @@ DECLARE_LAYER(Lstm) DECLARE_LAYER(Maximum) DECLARE_LAYER(Mean) DECLARE_LAYER(MemCopy) +DECLARE_LAYER(Merge) DECLARE_LAYER(Merger) DECLARE_LAYER(Minimum) DECLARE_LAYER(Multiplication) |