From fb2b416a6451f2f78314fe71396297cd0c02ed47 Mon Sep 17 00:00:00 2001 From: Tracy Narine Date: Mon, 31 Jul 2023 15:18:28 +0100 Subject: IVGCVSW-7933 Deprecated code: remove forwarding headers for moved headers * Removing deprecated headers that were added in 22.02 * Fixed a few locations where the forward header was still used Signed-off-by: Tracy Narine Change-Id: Ied42d0ecc750adadfbc053e0a3133d346f1ab343 --- src/armnn/Layer.hpp | 2 +- src/backends/backendsCommon/CMakeLists.txt | 7 ------- src/backends/backendsCommon/DynamicBackend.hpp | 9 --------- src/backends/backendsCommon/IBackendContext.hpp | 9 --------- src/backends/backendsCommon/IMemoryManager.hpp | 9 --------- src/backends/backendsCommon/ITensorHandle.hpp | 9 --------- src/backends/backendsCommon/ITensorHandleFactory.hpp | 9 --------- src/backends/backendsCommon/OptimizationViews.hpp | 9 --------- src/backends/backendsCommon/WorkloadInfo.hpp | 9 --------- .../backendsCommon/test/layerTests/Pooling2dTestImpl.cpp | 4 ++-- .../backendsCommon/test/layerTests/Pooling3dTestImpl.cpp | 6 +++--- 11 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 src/backends/backendsCommon/DynamicBackend.hpp delete mode 100644 src/backends/backendsCommon/IBackendContext.hpp delete mode 100644 src/backends/backendsCommon/IMemoryManager.hpp delete mode 100644 src/backends/backendsCommon/ITensorHandle.hpp delete mode 100644 src/backends/backendsCommon/ITensorHandleFactory.hpp delete mode 100644 src/backends/backendsCommon/OptimizationViews.hpp delete mode 100644 src/backends/backendsCommon/WorkloadInfo.hpp diff --git a/src/armnn/Layer.hpp b/src/armnn/Layer.hpp index 7bcfa3a49b..f3769e7432 100644 --- a/src/armnn/Layer.hpp +++ b/src/armnn/Layer.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include "InternalTypes.hpp" #include "SerializeLayerParameters.hpp" #include "DllExport.hpp" diff --git a/src/backends/backendsCommon/CMakeLists.txt b/src/backends/backendsCommon/CMakeLists.txt index 977067b48f..117bda161f 100644 --- a/src/backends/backendsCommon/CMakeLists.txt +++ b/src/backends/backendsCommon/CMakeLists.txt @@ -6,19 +6,14 @@ if(NOT DISABLE_DYNAMIC_BACKENDS) list(APPEND armnnBackendsCommon_sources DynamicBackend.cpp - DynamicBackend.hpp DynamicBackendUtils.cpp DynamicBackendUtils.hpp ) endif() list(APPEND armnnBackendsCommon_sources - IBackendContext.hpp IBackendInternal.cpp - IMemoryManager.hpp - ITensorHandle.hpp ITensorHandleFactory.cpp - ITensorHandleFactory.hpp LayerSupportBase.cpp LayerSupportBase.hpp LayerSupportRules.hpp @@ -33,7 +28,6 @@ list(APPEND armnnBackendsCommon_sources MemSyncWorkload.cpp MemSyncWorkload.hpp OptimizationViews.cpp - OptimizationViews.hpp TensorHandle.cpp TensorHandleFactoryRegistry.cpp TensorHandleFactoryRegistry.hpp @@ -43,7 +37,6 @@ list(APPEND armnnBackendsCommon_sources WorkloadData.cpp WorkloadFactory.cpp WorkloadFactoryBase.hpp - WorkloadInfo.hpp WorkloadUtils.cpp WorkloadUtils.hpp ) diff --git a/src/backends/backendsCommon/DynamicBackend.hpp b/src/backends/backendsCommon/DynamicBackend.hpp deleted file mode 100644 index a76d156f00..0000000000 --- a/src/backends/backendsCommon/DynamicBackend.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// -// Copyright © 2019 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -// This file is depricated and will be removed soon. -// Please use the new header in armnn/backends instead. -// This will use the new armnn/backends header. -#include diff --git a/src/backends/backendsCommon/IBackendContext.hpp b/src/backends/backendsCommon/IBackendContext.hpp deleted file mode 100644 index f3a670a98f..0000000000 --- a/src/backends/backendsCommon/IBackendContext.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// -// Copyright © 2019 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -// This file is depricated and will be removed soon. -// Please use the new header in armnn/backends instead. -// This will use the new armnn/backends header. -#include diff --git a/src/backends/backendsCommon/IMemoryManager.hpp b/src/backends/backendsCommon/IMemoryManager.hpp deleted file mode 100644 index eeda457480..0000000000 --- a/src/backends/backendsCommon/IMemoryManager.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// -// Copyright © 2019 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -// This file is depricated and will be removed soon. -// Please use the new header in armnn/backends instead. -// This will use the new armnn/backends header. -#include diff --git a/src/backends/backendsCommon/ITensorHandle.hpp b/src/backends/backendsCommon/ITensorHandle.hpp deleted file mode 100644 index 7d950c5e3a..0000000000 --- a/src/backends/backendsCommon/ITensorHandle.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// -// Copyright © 2019 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -// This file is depricated and will be removed soon. -// Please use the new header in armnn/backends instead. -// This will use the new armnn/backends header. -#include diff --git a/src/backends/backendsCommon/ITensorHandleFactory.hpp b/src/backends/backendsCommon/ITensorHandleFactory.hpp deleted file mode 100644 index 09dc45315a..0000000000 --- a/src/backends/backendsCommon/ITensorHandleFactory.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// -// Copyright © 2019 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -// This file is depricated and will be removed soon. -// Please use the new header in armnn/backends instead. -// This will use the new armnn/backends header. -#include diff --git a/src/backends/backendsCommon/OptimizationViews.hpp b/src/backends/backendsCommon/OptimizationViews.hpp deleted file mode 100644 index fa3eed3bca..0000000000 --- a/src/backends/backendsCommon/OptimizationViews.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// -// Copyright © 2019 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -// This file is depricated and will be removed soon. -// Please use the new header in armnn/backends instead. -// This will use the new armnn/backends header. -#include diff --git a/src/backends/backendsCommon/WorkloadInfo.hpp b/src/backends/backendsCommon/WorkloadInfo.hpp deleted file mode 100644 index 36916d4df2..0000000000 --- a/src/backends/backendsCommon/WorkloadInfo.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -// This file is depricated and will be removed soon. -// Please use the new header in armnn/backends instead. -// This will use the new armnn/backends header. -#include diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp index 11605f0b28..19beffec23 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017, 2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp index a241aea3f3..759c3c570c 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2021 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2021, 2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include @@ -1689,4 +1689,4 @@ LayerTestResult ComparePooling3dInt16Test( return ComparePooling3dTestCommon( workloadFactory, memoryManager, refWorkloadFactory, tensorHandleFactory, refTensorHandleFactory, poolingType, dataLayout); -} \ No newline at end of file +} -- cgit v1.2.1