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/LayerVisitorBase.hpp | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'include/armnn/LayerVisitorBase.hpp') diff --git a/include/armnn/LayerVisitorBase.hpp b/include/armnn/LayerVisitorBase.hpp index 43fc7b976e..3d43725527 100644 --- a/include/armnn/LayerVisitorBase.hpp +++ b/include/armnn/LayerVisitorBase.hpp @@ -30,8 +30,6 @@ protected: virtual ~LayerVisitorBase() {} public: - void VisitAbsLayer(const IConnectableLayer*, - const char*) override { DefaultPolicy::Apply(__func__); } void VisitActivationLayer(const IConnectableLayer*, const ActivationDescriptor&, @@ -99,9 +97,6 @@ public: const ElementwiseUnaryDescriptor&, const char*) override { DefaultPolicy::Apply(__func__); } - void VisitEqualLayer(const IConnectableLayer*, - const char*) override { DefaultPolicy::Apply(__func__); } - void VisitFillLayer(const IConnectableLayer*, const FillDescriptor&, const char*) override { DefaultPolicy::Apply(__func__); } @@ -119,17 +114,10 @@ public: const Optional&, const char*) override { DefaultPolicy::Apply(__func__); } - ARMNN_DEPRECATED_MSG("Use VisitGatherLayer with descriptor instead") - void VisitGatherLayer(const IConnectableLayer*, - const char*) override { DefaultPolicy::Apply(__func__); } - void VisitGatherLayer(const IConnectableLayer*, const GatherDescriptor&, const char*) override { DefaultPolicy::Apply(__func__); } - void VisitGreaterLayer(const IConnectableLayer*, - const char*) override { DefaultPolicy::Apply(__func__); } - void VisitInputLayer(const IConnectableLayer*, LayerBindingId, const char*) override { DefaultPolicy::Apply(__func__); } @@ -165,10 +153,6 @@ public: void VisitMergeLayer(const IConnectableLayer*, const char*) override { DefaultPolicy::Apply(__func__); } - void VisitMergerLayer(const IConnectableLayer*, - const MergerDescriptor&, - const char*) override { DefaultPolicy::Apply(__func__); } - void VisitMinimumLayer(const IConnectableLayer*, const char*) override { DefaultPolicy::Apply(__func__); } @@ -221,17 +205,10 @@ public: const ReshapeDescriptor&, const char*) override { DefaultPolicy::Apply(__func__); } - void VisitResizeBilinearLayer(const IConnectableLayer*, - const ResizeBilinearDescriptor&, - const char*) override { DefaultPolicy::Apply(__func__); } - void VisitResizeLayer(const IConnectableLayer*, const ResizeDescriptor&, const char*) override { DefaultPolicy::Apply(__func__); } - void VisitRsqrtLayer(const IConnectableLayer*, - const char*) override { DefaultPolicy::Apply(__func__); } - void VisitSliceLayer(const IConnectableLayer*, const SliceDescriptor&, const char*) override { DefaultPolicy::Apply(__func__); } -- cgit v1.2.1