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 /src/armnnSerializer/Serializer.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 'src/armnnSerializer/Serializer.hpp')
-rw-r--r-- | src/armnnSerializer/Serializer.hpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index 1161095c33..2f827ac059 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -104,10 +104,6 @@ private: uint32_t m_layerId; private: - ARMNN_DEPRECATED_MSG("Use VisitElementwiseUnaryLayer instead") - void SerializeAbsLayer(const armnn::IConnectableLayer* layer, - const char* name = nullptr); - void SerializeActivationLayer(const armnn::IConnectableLayer* layer, const armnn::ActivationDescriptor& descriptor, const char* name = nullptr); @@ -181,9 +177,6 @@ private: const armnn::ElementwiseUnaryDescriptor& descriptor, const char* name = nullptr); - ARMNN_DEPRECATED_MSG("Use VisitComparisonLayer instead") - void SerializeEqualLayer(const armnn::IConnectableLayer* layer, const char* name); - void SerializeFillLayer(const armnn::IConnectableLayer* layer, const armnn::FillDescriptor& fillDescriptor, const char* name = nullptr); @@ -199,9 +192,6 @@ private: const armnn::GatherDescriptor& gatherDescriptor, const char* name = nullptr); - ARMNN_DEPRECATED_MSG("Use VisitComparisonLayer instead") - void SerializeGreaterLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr); - void SerializeInputLayer(const armnn::IConnectableLayer* layer, armnn::LayerBindingId id, const char* name = nullptr); @@ -240,11 +230,6 @@ private: void SerializeMergeLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr); - ARMNN_DEPRECATED_MSG("Use VisitConcatLayer instead") - void SerializeMergerLayer(const armnn::IConnectableLayer* layer, - const armnn::MergerDescriptor& mergerDescriptor, - const char* name = nullptr); - void SerializeMultiplicationLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr); @@ -294,15 +279,6 @@ private: const armnn::ResizeDescriptor& resizeDescriptor, const char* name = nullptr); - ARMNN_DEPRECATED_MSG("Use VisitResizeLayer instead") - void SerializeResizeBilinearLayer(const armnn::IConnectableLayer* layer, - const armnn::ResizeBilinearDescriptor& resizeDescriptor, - const char* name = nullptr); - - ARMNN_DEPRECATED_MSG("Use VisitElementwiseUnaryLayer instead") - void SerializeRsqrtLayer(const armnn::IConnectableLayer* layer, - const char* name = nullptr); - void SerializeSliceLayer(const armnn::IConnectableLayer* layer, const armnn::SliceDescriptor& sliceDescriptor, const char* name = nullptr); |