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/LayerSupport.cpp | |
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/LayerSupport.cpp')
-rw-r--r-- | src/armnn/LayerSupport.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index 831a846092..47a0d3ec6b 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -130,6 +130,18 @@ bool IsBatchToSpaceNdSupported(const BackendId& backend, descriptor); } +bool IsConcatSupported(const BackendId& backend, + std::vector<const TensorInfo*> inputs, + const TensorInfo& output, + const OriginsDescriptor& descriptor, + char* reasonIfUnsupported, + size_t reasonIfUnsupportedMaxLength) +{ + ARMNN_NO_DEPRECATE_WARN_BEGIN + return IsMergerSupported(backend, inputs, output, descriptor, reasonIfUnsupported, reasonIfUnsupportedMaxLength); + ARMNN_NO_DEPRECATE_WARN_END +} + bool IsConstantSupported(const BackendId& backend, const TensorInfo& output, char* reasonIfUnsupported, @@ -386,6 +398,7 @@ bool IsMergeSupported(const BackendId& backend, FORWARD_LAYER_SUPPORT_FUNC(backend, IsMergeSupported, input0, input1, output); } +ARMNN_DEPRECATED_MSG("Use IsConcatSupported instead") bool IsMergerSupported(const BackendId& backend, std::vector<const TensorInfo*> inputs, const TensorInfo& output, @@ -394,7 +407,10 @@ bool IsMergerSupported(const BackendId& backend, size_t reasonIfUnsupportedMaxLength) { BOOST_ASSERT(inputs.size() > 0); + + ARMNN_NO_DEPRECATE_WARN_BEGIN FORWARD_LAYER_SUPPORT_FUNC(backend, IsMergerSupported, inputs, output, descriptor); + ARMNN_NO_DEPRECATE_WARN_END } bool IsMinimumSupported(const BackendId& backend, |