diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2019-05-10 13:55:21 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-05-14 10:35:28 +0000 |
| commit | 906f94631aa7ef590b9d8ff45507e818a0d1ac2c (patch) | |
| tree | bbb9d805b9424f92fe4f6a7030878e101873b03f /src/armnn/Network.hpp | |
| parent | 305620201159eb47e005a46d60f80c6a2c763d51 (diff) | |
| download | armnn-906f94631aa7ef590b9d8ff45507e818a0d1ac2c.tar.gz | |
IVGCVSW-3076 Add ConcatLayer methods to public API
!android-nn-driver:1120
Change-Id: I5192fa3deb4ea9766d38ad0bf4dfbfa0b4924c41
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/armnn/Network.hpp')
| -rw-r--r-- | src/armnn/Network.hpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index 660ca87d13..a569a7c847 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -37,6 +37,9 @@ public: IConnectableLayer* AddBatchToSpaceNdLayer(const BatchToSpaceNdDescriptor& batchToSpaceNdDescriptor, const char* name = nullptr) override; + IConnectableLayer* AddConcatLayer(const OriginsDescriptor& mergerDescriptor, + const char* name = nullptr) override; + IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, const Optional<ConstTensor>& biases, @@ -115,8 +118,9 @@ public: IConnectableLayer* AddSplitterLayer(const ViewsDescriptor& splitterDescriptor, const char* name = nullptr) override; + ARMNN_DEPRECATED_MSG("Use AddConcatLayer instead") IConnectableLayer* AddMergerLayer(const OriginsDescriptor& mergerDescriptor, - const char* name = nullptr) override; + const char* name = nullptr) override; IConnectableLayer* AddAdditionLayer(const char* name = nullptr) override; |