From 2210a5334bbd7d09f11db08a2a7a941a088a0f61 Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Wed, 22 Jan 2020 17:09:12 +0000 Subject: IVGCVSW-4371 Fixed backend compile IsReshapeSupported failure Change-Id: I71617cc35620bc5ff4e36797e41a58f5f959c07d Signed-off-by: Jim Flynn --- include/armnn/ILayerSupport.hpp | 5 +++++ src/backends/backendsCommon/LayerSupportBase.cpp | 9 ++++++++- src/backends/backendsCommon/LayerSupportBase.hpp | 4 ++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/armnn/ILayerSupport.hpp b/include/armnn/ILayerSupport.hpp index fdd7fbb55c..825f64b9b0 100644 --- a/include/armnn/ILayerSupport.hpp +++ b/include/armnn/ILayerSupport.hpp @@ -275,6 +275,11 @@ public: const QuantizedLstmInputParamsInfo& paramsInfo, Optional reasonIfUnsupported = EmptyOptional()) const = 0; + ARMNN_DEPRECATED_MSG("Use IsReshapeSupported with output tensor info argument instead") + virtual bool IsReshapeSupported(const TensorInfo& input, + const ReshapeDescriptor& descriptor, + Optional reasonIfUnsupported = EmptyOptional()) const = 0; + virtual bool IsReshapeSupported(const TensorInfo& input, const TensorInfo& output, const ReshapeDescriptor& descriptor, diff --git a/src/backends/backendsCommon/LayerSupportBase.cpp b/src/backends/backendsCommon/LayerSupportBase.cpp index 604a388a1f..da0d3b1d33 100644 --- a/src/backends/backendsCommon/LayerSupportBase.cpp +++ b/src/backends/backendsCommon/LayerSupportBase.cpp @@ -419,13 +419,20 @@ bool LayerSupportBase::IsQuantizedLstmSupported(const TensorInfo& input, } bool LayerSupportBase::IsReshapeSupported(const TensorInfo& input, - const TensorInfo& output, const ReshapeDescriptor& descriptor, Optional reasonIfUnsupported) const { return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } +bool LayerSupportBase::IsReshapeSupported(const TensorInfo& input, + const TensorInfo& output, + const ReshapeDescriptor& descriptor, + Optional reasonIfUnsupported) const +{ + return IsReshapeSupported(input, descriptor, reasonIfUnsupported); +} + bool LayerSupportBase::IsResizeBilinearSupported(const TensorInfo& input, const TensorInfo& output, Optional reasonIfUnsupported) const diff --git a/src/backends/backendsCommon/LayerSupportBase.hpp b/src/backends/backendsCommon/LayerSupportBase.hpp index 5568fca018..607ac488c7 100644 --- a/src/backends/backendsCommon/LayerSupportBase.hpp +++ b/src/backends/backendsCommon/LayerSupportBase.hpp @@ -259,6 +259,10 @@ public: const QuantizedLstmInputParamsInfo& paramsInfo, Optional reasonIfUnsupported = EmptyOptional()) const override; + bool IsReshapeSupported(const TensorInfo& input, + const ReshapeDescriptor& descriptor, + Optional reasonIfUnsupported = EmptyOptional()) const override; + bool IsReshapeSupported(const TensorInfo& input, const TensorInfo& output, const ReshapeDescriptor& descriptor, -- cgit v1.2.1