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/IRuntime.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/armnn/IRuntime.hpp') diff --git a/include/armnn/IRuntime.hpp b/include/armnn/IRuntime.hpp index 908fe7692d..a46830c95a 100644 --- a/include/armnn/IRuntime.hpp +++ b/include/armnn/IRuntime.hpp @@ -31,7 +31,7 @@ using IRuntimePtr = std::unique_ptr; struct INetworkProperties { - ARMNN_DEPRECATED_MSG("Please use INetworkProperties constructor with MemorySource argument") + ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Please use INetworkProperties constructor with MemorySource argument", "22.02") INetworkProperties(bool importEnabled = false, bool exportEnabled = false, bool asyncEnabled = false, @@ -45,7 +45,7 @@ struct INetworkProperties m_OutputSource(m_ExportEnabled ? MemorySource::Malloc : MemorySource::Undefined) {} - ARMNN_DEPRECATED_MSG("Please use INetworkProperties constructor without numThreads argument") + ARMNN_DEPRECATED_MSG_REMOVAL_DATE("Please use INetworkProperties constructor without numThreads argument", "22.02") INetworkProperties(bool asyncEnabled, MemorySource inputSource, MemorySource outputSource, -- cgit v1.2.1