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 <tracy.narine@arm.com>
Change-Id: Ied42d0ecc750adadfbc053e0a3133d346f1ab343
diff --git a/src/armnn/Layer.hpp b/src/armnn/Layer.hpp
index 7bcfa3a..f3769e7 100644
--- a/src/armnn/Layer.hpp
+++ b/src/armnn/Layer.hpp
@@ -10,7 +10,7 @@
#include <OutputHandler.hpp>
#include <backendsCommon/TensorHandleFactoryRegistry.hpp>
#include <backendsCommon/WorkloadDataCollector.hpp>
-#include <backendsCommon/WorkloadInfo.hpp>
+#include <armnn/backends/WorkloadInfo.hpp>
#include "InternalTypes.hpp"
#include "SerializeLayerParameters.hpp"
#include "DllExport.hpp"
diff --git a/src/backends/backendsCommon/CMakeLists.txt b/src/backends/backendsCommon/CMakeLists.txt
index 977067b..117bda1 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 @@
MemSyncWorkload.cpp
MemSyncWorkload.hpp
OptimizationViews.cpp
- OptimizationViews.hpp
TensorHandle.cpp
TensorHandleFactoryRegistry.cpp
TensorHandleFactoryRegistry.hpp
@@ -43,7 +37,6 @@
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 a76d156..0000000
--- 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 <armnn/backends/DynamicBackend.hpp>
diff --git a/src/backends/backendsCommon/IBackendContext.hpp b/src/backends/backendsCommon/IBackendContext.hpp
deleted file mode 100644
index f3a670a..0000000
--- 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 <armnn/backends/IBackendContext.hpp>
diff --git a/src/backends/backendsCommon/IMemoryManager.hpp b/src/backends/backendsCommon/IMemoryManager.hpp
deleted file mode 100644
index eeda457..0000000
--- 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 <armnn/backends/IMemoryManager.hpp>
diff --git a/src/backends/backendsCommon/ITensorHandle.hpp b/src/backends/backendsCommon/ITensorHandle.hpp
deleted file mode 100644
index 7d950c5..0000000
--- 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 <armnn/backends/ITensorHandle.hpp>
diff --git a/src/backends/backendsCommon/ITensorHandleFactory.hpp b/src/backends/backendsCommon/ITensorHandleFactory.hpp
deleted file mode 100644
index 09dc453..0000000
--- 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 <armnn/backends/ITensorHandleFactory.hpp>
diff --git a/src/backends/backendsCommon/OptimizationViews.hpp b/src/backends/backendsCommon/OptimizationViews.hpp
deleted file mode 100644
index fa3eed3..0000000
--- 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 <armnn/backends/OptimizationViews.hpp>
diff --git a/src/backends/backendsCommon/WorkloadInfo.hpp b/src/backends/backendsCommon/WorkloadInfo.hpp
deleted file mode 100644
index 36916d4..0000000
--- 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 <armnn/backends/WorkloadInfo.hpp>
diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp
index 11605f0..19beffe 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 <armnn/utility/NumericCast.hpp>
#include <armnn/BackendHelper.hpp>
-#include <backendsCommon/WorkloadInfo.hpp>
+#include <armnn/backends/WorkloadInfo.hpp>
#include <armnnTestUtils/TensorCopyUtils.hpp>
#include <armnnTestUtils/WorkloadTestUtils.hpp>
diff --git a/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling3dTestImpl.cpp
index a241aea..759c3c5 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 <armnn/utility/NumericCast.hpp>
#include <armnn/BackendHelper.hpp>
-#include <backendsCommon/WorkloadInfo.hpp>
+#include <armnn/backends/WorkloadInfo.hpp>
#include <armnnTestUtils/TensorCopyUtils.hpp>
#include <armnnTestUtils/WorkloadTestUtils.hpp>
@@ -1689,4 +1689,4 @@
return ComparePooling3dTestCommon<armnn::DataType::QSymmS16>(
workloadFactory, memoryManager, refWorkloadFactory, tensorHandleFactory, refTensorHandleFactory,
poolingType, dataLayout);
-}
\ No newline at end of file
+}