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 /src/armnnSerializer/Serializer.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 'src/armnnSerializer/Serializer.hpp')
| -rw-r--r-- | src/armnnSerializer/Serializer.hpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index 4a718378b5..2e2816a182 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -61,6 +61,10 @@ public: const armnn::ConstTensor& gamma, const char* name = nullptr) override; + void VisitConcatLayer(const armnn::IConnectableLayer* layer, + const armnn::ConcatDescriptor& concatDescriptor, + const char* name = nullptr) override; + void VisitConstantLayer(const armnn::IConnectableLayer* layer, const armnn::ConstTensor& input, const char* = nullptr) override; @@ -132,8 +136,9 @@ public: void VisitMergeLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr) override; + ARMNN_DEPRECATED_MSG("Use VisitConcatLayer instead") void VisitMergerLayer(const armnn::IConnectableLayer* layer, - const armnn::OriginsDescriptor& mergerDescriptor, + const armnn::MergerDescriptor& mergerDescriptor, const char* name = nullptr) override; void VisitMultiplicationLayer(const armnn::IConnectableLayer* layer, |