diff options
author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2022-08-30 14:27:10 +0100 |
---|---|---|
committer | Nikhil Raj <nikhil.raj@arm.com> | 2022-09-06 11:30:05 +0100 |
commit | d93603325ac3f2911ee24f8a98a5a79caf29c0ca (patch) | |
tree | 45c6d685659148ea874a71d073c5ca666e333dfa /include/armnn/Descriptors.hpp | |
parent | 06875f4eb0ee3ece2afbeac9d66d45d5f139db51 (diff) | |
download | armnn-d93603325ac3f2911ee24f8a98a5a79caf29c0ca.tar.gz |
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 <teresa.charlinreyes@arm.com>
Change-Id: Ibbc04fd18be7f938b11590bf67cd7af103cb4d99
Diffstat (limited to 'include/armnn/Descriptors.hpp')
-rw-r--r-- | include/armnn/Descriptors.hpp | 37 |
1 files changed, 0 insertions, 37 deletions
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 { |