aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Flynn <jim.flynn@arm.com>2020-01-22 17:09:12 +0000
committerTeresaARM <teresa.charlinreyes@arm.com>2020-01-23 11:09:24 +0000
commit2210a5334bbd7d09f11db08a2a7a941a088a0f61 (patch)
tree0dcd83fed2afd504f3e728e1f619b599fe53f3df
parent3ad1d7d83b72f5dffebedeb410e9ffbb6b6b2521 (diff)
downloadarmnn-2210a5334bbd7d09f11db08a2a7a941a088a0f61.tar.gz
IVGCVSW-4371 Fixed backend compile IsReshapeSupported failure
Change-Id: I71617cc35620bc5ff4e36797e41a58f5f959c07d Signed-off-by: Jim Flynn <jim.flynn@arm.com>
-rw-r--r--include/armnn/ILayerSupport.hpp5
-rw-r--r--src/backends/backendsCommon/LayerSupportBase.cpp9
-rw-r--r--src/backends/backendsCommon/LayerSupportBase.hpp4
3 files changed, 17 insertions, 1 deletions
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<std::string&> 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<std::string&> 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<std::string&> reasonIfUnsupported) const
{
return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported);
}
+bool LayerSupportBase::IsReshapeSupported(const TensorInfo& input,
+ const TensorInfo& output,
+ const ReshapeDescriptor& descriptor,
+ Optional<std::string&> reasonIfUnsupported) const
+{
+ return IsReshapeSupported(input, descriptor, reasonIfUnsupported);
+}
+
bool LayerSupportBase::IsResizeBilinearSupported(const TensorInfo& input,
const TensorInfo& output,
Optional<std::string&> 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
@@ -260,6 +260,10 @@ public:
Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
bool IsReshapeSupported(const TensorInfo& input,
+ const ReshapeDescriptor& descriptor,
+ Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;
+
+ bool IsReshapeSupported(const TensorInfo& input,
const TensorInfo& output,
const ReshapeDescriptor& descriptor,
Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override;