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/backends/backendsCommon/LayerSupportBase.cpp | |
| 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/backends/backendsCommon/LayerSupportBase.cpp')
| -rw-r--r-- | src/backends/backendsCommon/LayerSupportBase.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/backends/backendsCommon/LayerSupportBase.cpp b/src/backends/backendsCommon/LayerSupportBase.cpp index 9fcb496ba3..71b17456c1 100644 --- a/src/backends/backendsCommon/LayerSupportBase.cpp +++ b/src/backends/backendsCommon/LayerSupportBase.cpp @@ -73,9 +73,7 @@ bool LayerSupportBase::IsConcatSupported(const std::vector<const TensorInfo*> in const OriginsDescriptor& descriptor, Optional<std::string&> reasonIfUnsupported) const { - ARMNN_NO_DEPRECATE_WARN_BEGIN - return IsMergerSupported(inputs, output, descriptor, reasonIfUnsupported); - ARMNN_NO_DEPRECATE_WARN_END + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } bool LayerSupportBase::IsConstantSupported(const TensorInfo& output, @@ -286,7 +284,7 @@ bool LayerSupportBase::IsMergerSupported(const std::vector<const TensorInfo*> in const OriginsDescriptor& descriptor, Optional<std::string&> reasonIfUnsupported) const { - return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); + return IsConcatSupported(inputs, output, descriptor, reasonIfUnsupported); } bool LayerSupportBase::IsMinimumSupported(const TensorInfo& input0, |