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/Deprecated.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/armnn/Deprecated.hpp') diff --git a/include/armnn/Deprecated.hpp b/include/armnn/Deprecated.hpp index 2b9240fbc4..c493adb308 100644 --- a/include/armnn/Deprecated.hpp +++ b/include/armnn/Deprecated.hpp @@ -34,13 +34,15 @@ # define ARMNN_NO_DEPRECATE_WARN_END #endif -#define ARMNN_SUPRESS_DEPRECATE_WARNING(func) \ +#define ARMNN_SUPPRESS_DEPRECATE_WARNING(func) \ ARMNN_NO_DEPRECATE_WARN_BEGIN \ func; \ ARMNN_NO_DEPRECATE_WARN_END #define ARMNN_DEPRECATED [[deprecated]] #define ARMNN_DEPRECATED_MSG(message) [[deprecated(message)]] +#define ARMNN_DEPRECATED_MSG_REMOVAL_DATE(message, removed_in_release) \ +[[deprecated("Expected to be removed in release " #removed_in_release ". " message)]] #if defined(__GNUC__) && (__GNUC__ < 6) # define ARMNN_DEPRECATED_ENUM -- cgit v1.2.1