diff options
author | Jan Eilers <jan.eilers@arm.com> | 2021-09-24 15:45:46 +0100 |
---|---|---|
committer | Jan Eilers <jan.eilers@arm.com> | 2021-10-02 16:27:39 +0100 |
commit | 1b2654fb799c3d25ffcef4d31b5d026d359e2f8f (patch) | |
tree | 0397fdf24f286715e26a0e63bddaa0502f64caf7 /include/armnn/Descriptors.hpp | |
parent | b63a31170aee1d28267d83a4bc67b57708fb6b05 (diff) | |
download | armnn-1b2654fb799c3d25ffcef4d31b5d026d359e2f8f.tar.gz |
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 <jan.eilers@arm.com>
Change-Id: Id13b6f37a74d26eadeda2da1dc92915e725ed5a5
Diffstat (limited to 'include/armnn/Descriptors.hpp')
-rw-r--r-- | include/armnn/Descriptors.hpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 9a5128a127..b412bbdcc9 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -243,14 +243,6 @@ private: uint32_t** m_ViewSizes; }; -template <typename TensorShapeIt> -ARMNN_DEPRECATED_MSG("Use CreateDescriptorForConcatenation instead") -OriginsDescriptor CreateMergerDescriptorForConcatenation(TensorShapeIt first, - TensorShapeIt last, - unsigned int concatenationDimension) -{ - return CreateDescriptorForConcatenation(first, last, concatenationDimension); -} /// @brief Convenience template to create an OriginsDescriptor to use when creating a ConcatLayer for performing /// concatenation of a number of input tensors. @@ -402,7 +394,7 @@ struct FullyConnectedDescriptor : BaseDescriptor } /// Get the number of views/inputs. - ARMNN_DEPRECATED_MSG("Use GetNumInputs instead") + ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Use GetNumInputs instead", "22.05") uint32_t GetNumViews() const; /// Get the number of views/inputs. @@ -839,7 +831,10 @@ struct GatherDescriptor : BaseDescriptor }; /// A ResizeBilinearDescriptor for the ResizeBilinearLayer. -struct ResizeBilinearDescriptor : BaseDescriptor +struct ARMNN_DEPRECATED_MSG_REMOVAL_DATE( + "ResizeBilinearDescriptor is not supported anymore. Use ResizeDescriptor instead.", + "22.08") + ResizeBilinearDescriptor : BaseDescriptor { ResizeBilinearDescriptor() : m_TargetWidth(0) @@ -849,6 +844,7 @@ struct ResizeBilinearDescriptor : BaseDescriptor , m_HalfPixelCenters(false) {} + ARMNN_NO_DEPRECATE_WARN_BEGIN bool operator ==(const ResizeBilinearDescriptor& rhs) const { return m_TargetWidth == rhs.m_TargetWidth && @@ -857,6 +853,7 @@ struct ResizeBilinearDescriptor : BaseDescriptor m_AlignCorners == rhs.m_AlignCorners && m_HalfPixelCenters == rhs.m_HalfPixelCenters; } + ARMNN_NO_DEPRECATE_WARN_END /// Target width value. uint32_t m_TargetWidth; |