From 4d2eec0436f75d526c2ec25623ad73c8d1ee9ac3 Mon Sep 17 00:00:00 2001 From: Nikhil Raj Date: Mon, 30 May 2022 11:08:52 +0100 Subject: IVGCVSW-6981 Remove deprecated code 22.05 [Post Release] Signed-off-by: Nikhil Raj Change-Id: I9ccaefbe28ea572e9e2b4a2168574804667f7460 --- include/armnn/backends/CMakeLists.txt | 1 - include/armnn/backends/CpuTensorHandleFwd.hpp | 20 -------------------- include/armnn/backends/IBackendInternal.hpp | 4 ---- include/armnn/backends/TensorHandle.hpp | 13 ------------- 4 files changed, 38 deletions(-) delete mode 100644 include/armnn/backends/CpuTensorHandleFwd.hpp (limited to 'include/armnn/backends') diff --git a/include/armnn/backends/CMakeLists.txt b/include/armnn/backends/CMakeLists.txt index 19046ed977..978916e2b0 100644 --- a/include/armnn/backends/CMakeLists.txt +++ b/include/armnn/backends/CMakeLists.txt @@ -4,7 +4,6 @@ # list(APPEND armnnBackendsAPI_sources - CpuTensorHandleFwd.hpp TensorHandleFwd.hpp DynamicBackend.hpp IBackendInternal.hpp diff --git a/include/armnn/backends/CpuTensorHandleFwd.hpp b/include/armnn/backends/CpuTensorHandleFwd.hpp deleted file mode 100644 index a5a28d8135..0000000000 --- a/include/armnn/backends/CpuTensorHandleFwd.hpp +++ /dev/null @@ -1,20 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -// This file is deprecated and will be removed soon. -// Please use the new file include/armnn/TensorHandleFwd.hpp instead. - -#pragma once - -namespace armnn -{ - -class ConstCpuTensorHandle; -class CpuTensorHandle; -class ScopedCpuTensorHandle; -class PassthroughCpuTensorHandle; -class ConstPassthroughCpuTensorHandle; - -} // namespace armnn diff --git a/include/armnn/backends/IBackendInternal.hpp b/include/armnn/backends/IBackendInternal.hpp index 98f0eaacd7..e393a7e1c5 100644 --- a/include/armnn/backends/IBackendInternal.hpp +++ b/include/armnn/backends/IBackendInternal.hpp @@ -172,10 +172,6 @@ public: return BackendCapabilities("IBackendInternal NullCapabilities"); }; - /// Returns true if backend support the capability false otherwise - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This function has been deprecated in favour of GetCapability", "22.05") - virtual bool HasCapability(BackendCapability /*capabilityClass*/) const { return false; } - /// Signals the backend to use a custom memory allocator provided by the user /// /// \param allocator - a pointer to the provided ICustomAllocator to use with this backend diff --git a/include/armnn/backends/TensorHandle.hpp b/include/armnn/backends/TensorHandle.hpp index 2e6c8485d1..c69f7c8083 100644 --- a/include/armnn/backends/TensorHandle.hpp +++ b/include/armnn/backends/TensorHandle.hpp @@ -251,17 +251,4 @@ private: std::shared_ptr m_TensorHandle; }; -using ConstCpuTensorHandle ARMNN_DEPRECATED_MSG_REMOVAL_DATE("ConstCpuTensorHandle is deprecated, " - "use ConstTensorHandle instead", "22.05") = ConstTensorHandle; -using CpuTensorHandle ARMNN_DEPRECATED_MSG_REMOVAL_DATE("CpuTensorHandle is deprecated, " - "use TensorHandle instead", "22.05") = TensorHandle; -using ScopedCpuTensorHandle ARMNN_DEPRECATED_MSG_REMOVAL_DATE("ScopedCpuTensorHandle is deprecated, " - "use ScopedTensorHandle instead", "22.05") = ScopedTensorHandle; -using PassthroughCpuTensorHandle ARMNN_DEPRECATED_MSG_REMOVAL_DATE("PassthroughCpuTensorHandle is deprecated, use " - "PassthroughTensorHandle instead", - "22.05") = PassthroughTensorHandle; -using ConstPassthroughCpuTensorHandle ARMNN_DEPRECATED_MSG_REMOVAL_DATE("ConstPassthroughCpuTensorHandle is " - "deprecated, use ConstPassthroughTensorHandle " - "instead", "22.05") = ConstPassthroughTensorHandle; - } // namespace armnn -- cgit v1.2.1