commit 906f94631aa7ef590b9d8ff45507e818a0d1ac2c
author Jim Flynn <jim.flynn@arm.com> Fri May 10 13:55:21 2019 +0100
committer Matteo Martincigh <matteo.martincigh@arm.com> Tue May 14 10:35:28 2019 +0000
tree bbb9d805b9424f92fe4f6a7030878e101873b03f
parent 305620201159eb47e005a46d60f80c6a2c763d51

IVGCVSW-3076 Add ConcatLayer methods to public API

!android-nn-driver:1120

Change-Id: I5192fa3deb4ea9766d38ad0bf4dfbfa0b4924c41
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

src/backends/backendsCommon/LayerSupportBase.cpp

diff --git a/src/backends/backendsCommon/LayerSupportBase.cpp b/src/backends/backendsCommon/LayerSupportBase.cpp
index b37fa33..7760c07 100644
--- a/src/backends/backendsCommon/LayerSupportBase.cpp
+++ b/src/backends/backendsCommon/LayerSupportBase.cpp
@@ -68,6 +68,16 @@
     return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported);
 }
 
+bool LayerSupportBase::IsConcatSupported(const std::vector<const TensorInfo*> inputs,
+                                         const TensorInfo& output,
+                                         const OriginsDescriptor& descriptor,
+                                         Optional<std::string&> reasonIfUnsupported) const
+{
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
+    return IsMergerSupported(inputs, output, descriptor, reasonIfUnsupported);
+    ARMNN_NO_DEPRECATE_WARN_END
+}
+
 bool LayerSupportBase::IsConstantSupported(const TensorInfo& output,
                                            Optional<std::string&> reasonIfUnsupported) const
 {

src/backends/backendsCommon/LayerSupportBase.hpp

diff --git a/src/backends/backendsCommon/LayerSupportBase.hpp b/src/backends/backendsCommon/LayerSupportBase.hpp
index 0c32a64..88d5792 100644
--- a/src/backends/backendsCommon/LayerSupportBase.hpp
+++ b/src/backends/backendsCommon/LayerSupportBase.hpp
@@ -37,6 +37,11 @@
                                    const BatchToSpaceNdDescriptor& descriptor,
                                    Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
 
+    bool IsConcatSupported(const std::vector<const TensorInfo*> inputs,
+                           const TensorInfo& output,
+                           const OriginsDescriptor& descriptor,
+                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+
     bool IsConstantSupported(const TensorInfo& output,
                              Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
 
@@ -173,6 +178,7 @@
                           const TensorInfo& output,
                           Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
 
+    ARMNN_DEPRECATED_MSG("Use IsConcatSupported instead")
     bool IsMergerSupported(const std::vector<const TensorInfo*> inputs,
                            const TensorInfo& output,
                            const OriginsDescriptor& descriptor,

src/backends/backendsCommon/WorkloadFactory.cpp

diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp
index d9774b0..9ed0e29 100644
--- a/src/backends/backendsCommon/WorkloadFactory.cpp
+++ b/src/backends/backendsCommon/WorkloadFactory.cpp
@@ -554,7 +554,9 @@
 
             const TensorInfo& output = layer.GetOutputSlot(0).GetTensorInfo();
 
+            ARMNN_NO_DEPRECATE_WARN_BEGIN
             result = layerSupportObject->IsMergerSupported(inputPtrs, output, cLayer->GetParameters(), reason);
+            ARMNN_NO_DEPRECATE_WARN_END
             break;
         }
         case LayerType::Multiplication:

src/backends/backendsCommon/test/MergerTestImpl.hpp

diff --git a/src/backends/backendsCommon/test/MergerTestImpl.hpp b/src/backends/backendsCommon/test/MergerTestImpl.hpp
index 2511bd4..35ab2bc 100644
--- a/src/backends/backendsCommon/test/MergerTestImpl.hpp
+++ b/src/backends/backendsCommon/test/MergerTestImpl.hpp
@@ -33,7 +33,9 @@
     descriptor = CreateMergerDescriptorForConcatenation(inputShapes.begin(),
                                                         inputShapes.end(),
                                                         concatAxis);
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     IConnectableLayer* merger = net->AddMergerLayer(descriptor, "merger");
+    ARMNN_NO_DEPRECATE_WARN_END
 
     for (unsigned int i = 0; i < inputShapes.size(); ++i)
     {