From 1b2654fb799c3d25ffcef4d31b5d026d359e2f8f Mon Sep 17 00:00:00 2001 From: Jan Eilers Date: Fri, 24 Sep 2021 15:45:46 +0100 Subject: IVGCVSW-5985 Remove deprecated code * Removes deprecated AddLayer, IsLayerSupported functions * Marks the whole LayerVisitor class as deprecated not just the constructor. This required to wrap all Accept functions in a no deprecate macro because the LayerVisitor is used as a parameter in there * Removes usage of deprecated LayerVisitor and replaces it with ExecuteStrategy. This required a few structural changes in the unit tests * Adds a default implementation for IStrategy called StrategyBase * Changes pyarmnn to use non deprecated constructor for INetworkProperties and adds related unit test * Marks usage of deprecated code in pyarmnn as deprecated. This required to extend INetworkProperties to allow backwards compatibility * Removes deprecated functions from CpuAcc, GpuAcc and Ref backends Note: This patch breaks compatibility with backends that are not updated in this patch !android-nn-driver:6325 Signed-off-by: Jan Eilers Change-Id: Id13b6f37a74d26eadeda2da1dc92915e725ed5a5 --- include/armnn/LayerSupport.hpp | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'include/armnn/LayerSupport.hpp') diff --git a/include/armnn/LayerSupport.hpp b/include/armnn/LayerSupport.hpp index 6f1eb0347b..03b706fafd 100644 --- a/include/armnn/LayerSupport.hpp +++ b/include/armnn/LayerSupport.hpp @@ -214,14 +214,6 @@ bool IsMergeSupported(const BackendId& backend, char* reasonIfUnsupported = nullptr, size_t reasonIfUnsupportedMaxLength = 1024); -/// Deprecated in favor of IBackend and ILayerSupport interfaces -ARMNN_DEPRECATED_MSG("Use IsConcatSupported instead") -bool IsMergerSupported(const BackendId& backend, - const std::vector inputs, - const TensorInfo& output, - const OriginsDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); /// Deprecated in favor of IBackend and ILayerSupport interfaces bool IsMinimumSupported(const BackendId& backend, @@ -317,14 +309,6 @@ bool IsReshapeSupported(const BackendId& backend, char* reasonIfUnsupported = nullptr, size_t reasonIfUnsupportedMaxLength = 1024); -/// Deprecated in favor of IBackend and ILayerSupport interfaces -ARMNN_DEPRECATED_MSG("Use IsResizeSupported instead") -bool IsResizeBilinearSupported(const BackendId& backend, - const TensorInfo& input, - const TensorInfo& output, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - /// Deprecated in favor of IBackend and ILayerSupport interfaces bool IsResizeSupported(const BackendId& backend, const TensorInfo& input, @@ -364,13 +348,6 @@ bool IsSpaceToDepthSupported(const BackendId& backend, char* reasonIfUnsupported = nullptr, size_t reasonIfUnsupportedMaxLength = 1024); -ARMNN_DEPRECATED_MSG("Use IsSplitterSupported with outputs instead") -bool IsSplitterSupported(const BackendId& backend, - const TensorInfo& input, - const ViewsDescriptor& descriptor, - char* reasonIfUnsupported = nullptr, - size_t reasonIfUnsupportedMaxLength = 1024); - /// Deprecated in favor of IBackend and ILayerSupport interfaces bool IsSplitterSupported(const BackendId& backend, const TensorInfo& input, -- cgit v1.2.1