From d93603325ac3f2911ee24f8a98a5a79caf29c0ca Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Tue, 30 Aug 2022 14:27:10 +0100 Subject: IVGCVSW-7006 Remove deprecated code due to be removed in 22.08 * AddConv and AddDWConv with weights and bias * ResizeBilinearDescriptor * b,blacklist option in accuracy tool !android-nn-driver:8172 Signed-off-by: Teresa Charlin Change-Id: Ibbc04fd18be7f938b11590bf67cd7af103cb4d99 --- include/armnn/Descriptors.hpp | 37 --------------------------------- include/armnn/DescriptorsFwd.hpp | 1 - include/armnn/INetwork.hpp | 36 -------------------------------- include/armnn/backends/WorkloadData.hpp | 10 --------- 4 files changed, 84 deletions(-) (limited to 'include/armnn') diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 493ce65976..2540073090 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -921,43 +921,6 @@ struct GatherDescriptor : BaseDescriptor int32_t m_Axis; }; -/// A ResizeBilinearDescriptor for the ResizeBilinearLayer. -struct ARMNN_DEPRECATED_MSG_REMOVAL_DATE( - "ResizeBilinearDescriptor is not supported anymore. Use ResizeDescriptor instead.", - "22.08") - ResizeBilinearDescriptor : BaseDescriptor -{ - ResizeBilinearDescriptor() - : m_TargetWidth(0) - , m_TargetHeight(0) - , m_DataLayout(DataLayout::NCHW) - , m_AlignCorners(false) - , m_HalfPixelCenters(false) - {} - - ARMNN_NO_DEPRECATE_WARN_BEGIN - bool operator ==(const ResizeBilinearDescriptor& rhs) const - { - return m_TargetWidth == rhs.m_TargetWidth && - m_TargetHeight == rhs.m_TargetHeight && - m_DataLayout == rhs.m_DataLayout && - m_AlignCorners == rhs.m_AlignCorners && - m_HalfPixelCenters == rhs.m_HalfPixelCenters; - } - ARMNN_NO_DEPRECATE_WARN_END - - /// Target width value. - uint32_t m_TargetWidth; - /// Target height value. - uint32_t m_TargetHeight; - /// The data layout to be used (NCHW, NHWC). - DataLayout m_DataLayout; - /// Aligned corners - bool m_AlignCorners; - /// Half Pixel Centers - bool m_HalfPixelCenters; -}; - /// A ResizeDescriptor for the ResizeLayer. struct ResizeDescriptor : BaseDescriptor { diff --git a/include/armnn/DescriptorsFwd.hpp b/include/armnn/DescriptorsFwd.hpp index c0c1cc238d..08833504bb 100644 --- a/include/armnn/DescriptorsFwd.hpp +++ b/include/armnn/DescriptorsFwd.hpp @@ -39,7 +39,6 @@ struct Pooling3dDescriptor; struct PreCompiledDescriptor; struct QLstmDescriptor; struct ReshapeDescriptor; -struct ResizeBilinearDescriptor; struct ResizeDescriptor; struct ReduceDescriptor; struct SliceDescriptor; diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp index ecc888d9c1..fefb2ebc2d 100644 --- a/include/armnn/INetwork.hpp +++ b/include/armnn/INetwork.hpp @@ -295,29 +295,6 @@ public: IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, const char* name = nullptr); - /// Adds a 2D convolution layer to the network. - /// @param convolution2dDescriptor - Description of the 2D convolution layer. - /// @param weights - Tensor for the weights data. - /// @param biases - Optional tensor for the bias data. If specified, must match the output tensor shape. - /// @param name - Optional name for the layer. - /// @return - Interface for configuring the layer. - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This AddConvolution2dLayer overload is deprecated", "22.08") - IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, - const ConstTensor& weights, - const Optional& biases, - const char* name = nullptr); - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This AddConvolution2dLayer overload is deprecated", "22.08") - IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, - const ConstTensor& weights, - const char* name = nullptr); - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This AddConvolution2dLayer overload is deprecated", "22.08") - IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor, - const ConstTensor& weights, - const ConstTensor& biases, - const char* name = nullptr); - /// Adds a 3D convolution layer to the network. /// @param convolution3dDescriptor - Description of the 3D convolution layer. /// @param name - Optional name for the layer. @@ -339,19 +316,6 @@ public: IConnectableLayer* AddDepthwiseConvolution2dLayer(const DepthwiseConvolution2dDescriptor& convolution2dDescriptor, const char* name = nullptr); - /// Adds a 2D depthwise convolution layer to the network. - /// @param convolution2dDescriptor - Description of the 2D depthwise convolution layer. - /// @param weights - Tensor for the weights. Expected format: [channelMultiplier, inputChannels, height, width]. - /// @param biases Optional tensor for the bias data. If specified, must match the output tensor shape. - /// @param name - Optional name for the layer. - /// @return - Interface for configuring the layer. - ARMNN_DEPRECATED_MSG("This AddDepthwiseConvolution2dLayer overload is deprecated") - IConnectableLayer* AddDepthwiseConvolution2dLayer( - const DepthwiseConvolution2dDescriptor& convolution2dDescriptor, - const ConstTensor& weights, - const Optional& biases, - const char* name = nullptr); - /// Adds a Dequantize layer to the network. /// @return - Interface for configuring the layer. IConnectableLayer* AddDequantizeLayer(const char* name = nullptr); diff --git a/include/armnn/backends/WorkloadData.hpp b/include/armnn/backends/WorkloadData.hpp index 00962ed52c..214ea7b060 100644 --- a/include/armnn/backends/WorkloadData.hpp +++ b/include/armnn/backends/WorkloadData.hpp @@ -353,16 +353,6 @@ struct RankQueueDescriptor : QueueDescriptor void Validate(const WorkloadInfo& workloadInfo) const; }; -ARMNN_NO_DEPRECATE_WARN_BEGIN -struct -ARMNN_DEPRECATED_MSG_REMOVAL_DATE("ResizeBilinearQueueDescriptor is deprecated use ResizeQueueDescriptor instead", - "22.08") -ResizeBilinearQueueDescriptor : QueueDescriptorWithParameters -{ - void Validate(const WorkloadInfo& workloadInfo) const; -}; -ARMNN_NO_DEPRECATE_WARN_END - struct ResizeQueueDescriptor : QueueDescriptorWithParameters { void Validate(const WorkloadInfo& workloadInfo) const; -- cgit v1.2.1