diff options
Diffstat (limited to 'src/backends')
-rw-r--r-- | src/backends/backendsCommon/LayerSupportBase.cpp | 10 | ||||
-rw-r--r-- | src/backends/backendsCommon/LayerSupportBase.hpp | 6 | ||||
-rw-r--r-- | src/backends/backendsCommon/WorkloadFactory.cpp | 2 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/MergerTestImpl.hpp | 2 | ||||
-rw-r--r-- | src/backends/cl/ClLayerSupport.cpp | 10 | ||||
-rw-r--r-- | src/backends/cl/ClLayerSupport.hpp | 6 | ||||
-rw-r--r-- | src/backends/neon/NeonLayerSupport.cpp | 10 | ||||
-rw-r--r-- | src/backends/neon/NeonLayerSupport.hpp | 6 | ||||
-rw-r--r-- | src/backends/reference/RefLayerSupport.cpp | 10 | ||||
-rw-r--r-- | src/backends/reference/RefLayerSupport.hpp | 6 |
10 files changed, 68 insertions, 0 deletions
diff --git a/src/backends/backendsCommon/LayerSupportBase.cpp b/src/backends/backendsCommon/LayerSupportBase.cpp index b37fa331ad..7760c079ac 100644 --- a/src/backends/backendsCommon/LayerSupportBase.cpp +++ b/src/backends/backendsCommon/LayerSupportBase.cpp @@ -68,6 +68,16 @@ bool LayerSupportBase::IsBatchToSpaceNdSupported(const TensorInfo& input, 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 { diff --git a/src/backends/backendsCommon/LayerSupportBase.hpp b/src/backends/backendsCommon/LayerSupportBase.hpp index 0c32a640b3..88d5792819 100644 --- a/src/backends/backendsCommon/LayerSupportBase.hpp +++ b/src/backends/backendsCommon/LayerSupportBase.hpp @@ -37,6 +37,11 @@ public: 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 @@ public: 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, diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp index d9774b063d..9ed0e29673 100644 --- a/src/backends/backendsCommon/WorkloadFactory.cpp +++ b/src/backends/backendsCommon/WorkloadFactory.cpp @@ -554,7 +554,9 @@ bool IWorkloadFactory::IsLayerSupported(const BackendId& backendId, 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: diff --git a/src/backends/backendsCommon/test/MergerTestImpl.hpp b/src/backends/backendsCommon/test/MergerTestImpl.hpp index 2511bd44ba..35ab2bc861 100644 --- a/src/backends/backendsCommon/test/MergerTestImpl.hpp +++ b/src/backends/backendsCommon/test/MergerTestImpl.hpp @@ -33,7 +33,9 @@ INetworkPtr CreateMergerNetwork(const std::vector<TensorShape>& inputShapes, 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) { diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index 73c9e49c4f..a557870cea 100644 --- a/src/backends/cl/ClLayerSupport.cpp +++ b/src/backends/cl/ClLayerSupport.cpp @@ -185,6 +185,16 @@ bool ClLayerSupport::IsBatchToSpaceNdSupported(const TensorInfo& input, descriptor); } +bool ClLayerSupport::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 ClLayerSupport::IsConstantSupported(const TensorInfo& output, Optional<std::string&> reasonIfUnsupported) const { diff --git a/src/backends/cl/ClLayerSupport.hpp b/src/backends/cl/ClLayerSupport.hpp index e9a9e68005..b634d46768 100644 --- a/src/backends/cl/ClLayerSupport.hpp +++ b/src/backends/cl/ClLayerSupport.hpp @@ -36,6 +36,11 @@ public: 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; @@ -138,6 +143,7 @@ public: 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, diff --git a/src/backends/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp index c257dd373a..9bd48cf860 100644 --- a/src/backends/neon/NeonLayerSupport.cpp +++ b/src/backends/neon/NeonLayerSupport.cpp @@ -142,6 +142,16 @@ bool NeonLayerSupport::IsBatchNormalizationSupported(const TensorInfo& input, descriptor); } +bool NeonLayerSupport::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 NeonLayerSupport::IsConstantSupported(const TensorInfo& output, Optional<std::string&> reasonIfUnsupported) const { diff --git a/src/backends/neon/NeonLayerSupport.hpp b/src/backends/neon/NeonLayerSupport.hpp index a5aae0bde9..8312bb977a 100644 --- a/src/backends/neon/NeonLayerSupport.hpp +++ b/src/backends/neon/NeonLayerSupport.hpp @@ -31,6 +31,11 @@ public: const BatchNormalizationDescriptor& 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; @@ -101,6 +106,7 @@ public: 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, diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index a1d8e7de81..f79c152139 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -293,6 +293,16 @@ bool RefLayerSupport::IsBatchToSpaceNdSupported(const TensorInfo& input, &TrueFunc<>)); } +bool RefLayerSupport::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 RefLayerSupport::IsConstantSupported(const TensorInfo& output, Optional<std::string&> reasonIfUnsupported) const { diff --git a/src/backends/reference/RefLayerSupport.hpp b/src/backends/reference/RefLayerSupport.hpp index 9b1a95cdcd..a4ae01e403 100644 --- a/src/backends/reference/RefLayerSupport.hpp +++ b/src/backends/reference/RefLayerSupport.hpp @@ -36,6 +36,11 @@ public: 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; @@ -162,6 +167,7 @@ public: const MeanDescriptor& descriptor, 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, |