IVGCVSW-7209 Remove deprecated code due to be removed in 22.11

* Files deleted when Stabilizing the API

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I0ae73ee36968fa880761c10358bfa827be5fe054

23 files changed, 1 insertions, 194 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14236c7ae8..96f94be84a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -555,13 +555,11 @@ if(BUILD_UNIT_TESTS)
         src/armnn/test/CloneTests.cpp
         src/armnn/test/ConstTensorLayerVisitor.hpp
         src/armnn/test/ConstTensorLayerVisitor.cpp
-        src/armnn/test/CreateWorkload.hpp
         src/armnn/test/EndToEndTest.cpp
         src/armnn/test/ExecutionFrameTest.cpp
         src/armnn/test/FloatingPointConverterTest.cpp
         src/armnn/test/FlowControl.cpp
         src/armnn/test/GraphTests.cpp
-        src/armnn/test/GraphUtils.hpp
         src/armnn/test/InstrumentTests.cpp
         src/armnn/test/InferOutputTests.cpp
         src/armnn/test/InferOutputTests.hpp
@@ -595,13 +593,11 @@ if(BUILD_UNIT_TESTS)
         src/armnn/test/optimizations/SquashEqualSiblingsTests.cpp
         src/armnn/test/optimizations/TransposeAsReshapeTests.cpp
         src/armnn/test/OptionalTest.cpp
-        src/armnn/test/PredicateResult.hpp
         src/armnn/test/ProfilerTests.cpp
         src/armnn/test/ProfilingEventTest.cpp
         src/armnn/test/ShapeInferenceTests.cpp
         src/armnn/test/SubgraphViewTests.cpp
         src/armnn/test/TensorHandleStrategyTest.cpp
-        src/armnn/test/TensorHelpers.hpp
         src/armnn/test/TensorTest.cpp
         src/armnn/test/TestInputOutputLayerVisitor.cpp
         src/armnn/test/TestInputOutputLayerVisitor.hpp
@@ -609,8 +605,6 @@ if(BUILD_UNIT_TESTS)
         src/armnn/test/TestLayerVisitor.hpp
         src/armnn/test/TestNameOnlyLayerVisitor.cpp
         src/armnn/test/TestNameOnlyLayerVisitor.hpp
-        src/armnn/test/TestUtils.hpp
-        src/armnn/test/UnitTests.hpp
         src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp
         src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp
         src/armnn/test/UtilityTests.cpp
diff --git a/src/armnn/CompatibleTypes.hpp b/src/armnn/CompatibleTypes.hpp
deleted file mode 100644
index eecf664b4d..0000000000
--- a/src/armnn/CompatibleTypes.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-#include  <armnnUtils/CompatibleTypes.hpp>
-#pragma message("src/armnn/CompatibleTypes.hpp has been deprecated, it is due for removal in 22.11 release." \
-                " Please use public interface include/armnn/Utils/CompatibleTypes.hpp")
-
diff --git a/src/armnn/SubgraphView.hpp b/src/armnn/SubgraphView.hpp
deleted file mode 100644
index 3e8d028acc..0000000000
--- a/src/armnn/SubgraphView.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-#include <armnn/backends/SubgraphView.hpp>
-
-#pragma message("src/armnn/SubgraphView.hpp has been deprecated, it is due for removal in" \
-                " 22.11 release. Please use include/armnn/backends/SubgraphView.hpp instead.")
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp
deleted file mode 100644
index dea5fe38f0..0000000000
--- a/src/armnn/test/CreateWorkload.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "../../armnnTestUtils/CreateWorkload.hpp"
-#pragma message("src/armnn/test/CreateWorkload.hpp has been deprecated, it is due for removal in"\
-                " 22.11 release. Please use src/armnnTestUtils/CreateWorkload.hpp instead.")
diff --git a/src/armnn/test/GraphUtils.hpp b/src/armnn/test/GraphUtils.hpp
deleted file mode 100644
index cec9b6772a..0000000000
--- a/src/armnn/test/GraphUtils.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "../../armnnTestUtils/GraphUtils.hpp"
-
-#pragma message("src/armnn/test/GraphUtils.hpp has been deprecated, it is due for removal in 22.11 release." \
-                " Please use from armnnTestUtils library, /src/armnnTestUtils/GraphUtils.hpp)
diff --git a/src/armnn/test/PredicateResult.hpp b/src/armnn/test/PredicateResult.hpp
deleted file mode 100644
index cc8ae24c42..0000000000
--- a/src/armnn/test/PredicateResult.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include <armnnTestUtils/PredicateResult.hpp>
-
-#pragma message("src/armnn/test/PredicateResult.hpp has been deprecated, it is due for removal in 22.11 release." \
-                " Please use public interface include/armnnTestUtils/PredicateResult.hpp")
\ No newline at end of file
diff --git a/src/armnn/test/TensorHelpers.hpp b/src/armnn/test/TensorHelpers.hpp
deleted file mode 100644
index c3571d0c5b..0000000000
--- a/src/armnn/test/TensorHelpers.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma message("./src/armnn/test/TensorHelpers.hpp has been deprecated, it" \
-                " is due for removal in 22.11 release. Please use public" \
-                " interface include/armnnTestUtils/TensorHelpers.hpp")
-
-#include "armnnTestUtils/TensorHelpers.hpp"
\ No newline at end of file
diff --git a/src/armnn/test/TestUtils.hpp b/src/armnn/test/TestUtils.hpp
deleted file mode 100644
index 5c570b2d71..0000000000
--- a/src/armnn/test/TestUtils.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "../../armnnTestUtils/TestUtils.hpp"
-
-#pragma message("src/armnn/test/TestUtils.hpp has been deprecated, it is due for removal in 22.11 release." \
-                " Please use from armnnTestUtils library, /src/armnnTestUtils/TestUtils.hpp)
\ No newline at end of file
diff --git a/src/armnn/test/UnitTests.hpp b/src/armnn/test/UnitTests.hpp
deleted file mode 100644
index 1ed44bb0e0..0000000000
--- a/src/armnn/test/UnitTests.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "../../armnnTestUtils/UnitTests.hpp"
-
-#pragma message("src/armnn/test/UnitTests.hpp has been deprecated, it is due for removal in 22.11 release." \
-                " Please use from armnnTestUtils library, /src/armnnTestUtils/UnitTests.hpp")
diff --git a/src/backends/aclCommon/test/CMakeLists.txt b/src/backends/aclCommon/test/CMakeLists.txt
index ee27def133..8be6621e28 100644
--- a/src/backends/aclCommon/test/CMakeLists.txt
+++ b/src/backends/aclCommon/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright © 2017 Arm Ltd. All rights reserved.
+# Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
 # SPDX-License-Identifier: MIT
 #
 
@@ -7,7 +7,6 @@ list(APPEND armnnAclCommonUnitTests_sources
     ArmComputeTensorUtilsTests.cpp
     CreateWorkloadClNeon.hpp
     MemCopyTests.cpp
-    MemCopyTestImpl.hpp
 )
 
 add_library(armnnAclCommonUnitTests OBJECT ${armnnAclCommonUnitTests_sources})
diff --git a/src/backends/aclCommon/test/MemCopyTestImpl.hpp b/src/backends/aclCommon/test/MemCopyTestImpl.hpp
deleted file mode 100644
index 0c38ed99fe..0000000000
--- a/src/backends/aclCommon/test/MemCopyTestImpl.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Copyright © 2022 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include <armnnTestUtils/MemCopyTestImpl.hpp>
-
-#pragma message("./src/backends/aclCommon/test/MemCopyTestImpl.hpp has been"\
-                " deprecated, it is due for removal in 22.11 release. Please"\
-                " use public interface include/armnnTestUtils/MemCopyTestImpl.hpp")
diff --git a/src/backends/backendsCommon/CMakeLists.txt b/src/backends/backendsCommon/CMakeLists.txt
index 436f28749a..b2ab932384 100644
--- a/src/backends/backendsCommon/CMakeLists.txt
+++ b/src/backends/backendsCommon/CMakeLists.txt
@@ -26,7 +26,6 @@ list(APPEND armnnBackendsCommon_sources
     MapWorkload.cpp
     MapWorkload.hpp
     MemCopyWorkload.cpp
-    MemCopyWorkload.hpp
     MemImportWorkload.cpp
     MemImportWorkload.hpp
     MemoryManager.cpp
@@ -36,17 +35,13 @@ list(APPEND armnnBackendsCommon_sources
     OptimizationViews.cpp
     OptimizationViews.hpp
     TensorHandle.cpp
-    TensorHandle.hpp
     TensorHandleFactoryRegistry.cpp
     TensorHandleFactoryRegistry.hpp
     UnmapWorkload.cpp
     UnmapWorkload.hpp
     WorkloadDataCollector.hpp
-    Workload.hpp
     WorkloadData.cpp
-    WorkloadData.hpp
     WorkloadFactory.cpp
-    WorkloadFactory.hpp
     WorkloadFactoryBase.hpp
     WorkloadInfo.hpp
     WorkloadUtils.cpp
diff --git a/src/backends/backendsCommon/MemCopyWorkload.hpp b/src/backends/backendsCommon/MemCopyWorkload.hpp
deleted file mode 100644
index 30949df44b..0000000000
--- a/src/backends/backendsCommon/MemCopyWorkload.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include <armnn/backends/MemCopyWorkload.hpp>
-#pragma message("src/backends/backendsCommon/MemCopyWorkload.hpp has been deprecated, it is due for removal in"\
-                " 22.11 release. Please use public interface include/armnn/backends/MemCopyWorkload.hpp")
diff --git a/src/backends/backendsCommon/TensorHandle.hpp b/src/backends/backendsCommon/TensorHandle.hpp
deleted file mode 100644
index 3124f855c1..0000000000
--- a/src/backends/backendsCommon/TensorHandle.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include <armnn/backends/TensorHandle.hpp>
-#pragma message("src/backends/backendsCommon/TensorHandle.hpp has been deprecated, it is due for removal in"\
-                " 22.11 release. Please use public interface include/armnn/backends/TensorHandle.hpp")
diff --git a/src/backends/backendsCommon/Workload.hpp b/src/backends/backendsCommon/Workload.hpp
deleted file mode 100644
index 30b237767a..0000000000
--- a/src/backends/backendsCommon/Workload.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include <armnn/backends/Workload.hpp>
-#pragma message("src/backends/backendsCommon/Workload.hpp has been deprecated, it is due for removal in"\
-                " 22.11 release. Please use public interface include/armnn/backends/Workload.hpp")
diff --git a/src/backends/backendsCommon/WorkloadData.hpp b/src/backends/backendsCommon/WorkloadData.hpp
deleted file mode 100644
index acaf615d0e..0000000000
--- a/src/backends/backendsCommon/WorkloadData.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include <armnn/backends/WorkloadData.hpp>
-#pragma message("src/backends/backendsCommon/WorkloadData.hpp has been deprecated, it is due for removal in"\
-                " 22.11 release. Please use public interface include/armnn/backends/WorkloadData.hpp")
diff --git a/src/backends/backendsCommon/WorkloadFactory.hpp b/src/backends/backendsCommon/WorkloadFactory.hpp
deleted file mode 100644
index 771d8d38c3..0000000000
--- a/src/backends/backendsCommon/WorkloadFactory.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include <armnn/backends/WorkloadFactory.hpp>
-#pragma message("src/backends/backendsCommon/WorkloadFactory.hpp has been deprecated, it is due for removal in"\
-                " 22.11 release. Please use public interface include/armnn/backends/WorkloadFactory.hpp")
diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt
index c5b97ebf4c..5e283990f7 100644
--- a/src/backends/backendsCommon/test/CMakeLists.txt
+++ b/src/backends/backendsCommon/test/CMakeLists.txt
@@ -10,15 +10,12 @@ list(APPEND armnnBackendsCommonUnitTests_sources
     BackendIdTests.cpp
     BackendProfilingTests.cpp
     BackendRegistryTests.cpp
-    CommonTestUtils.hpp
     ChannelShuffleEndToEndTestImpl.hpp
     ComparisonEndToEndTestImpl.hpp
     CompatibilityTests.cpp
     ConcatEndToEndTestImpl.hpp
     Convolution3dEndToEndTestImpl.hpp
     CustomMemoryOptimizerStrategyTests.cpp
-    DataLayoutUtils.hpp
-    DataTypeUtils.hpp
     DefaultAsyncExecuteTest.cpp
     DepthToSpaceEndToEndTestImpl.hpp
     DepthwiseConvolution2dEndToEndTests.hpp
@@ -59,7 +56,6 @@ list(APPEND armnnBackendsCommonUnitTests_sources
     StridedSliceAsyncEndToEndTest.hpp
     TensorCopyUtils.hpp
     WorkloadFactoryHelper.hpp
-    WorkloadTestUtils.hpp
     layerTests/AbsTestImpl.cpp
     layerTests/AbsTestImpl.hpp
     layerTests/ActivationTestImpl.cpp
@@ -125,7 +121,6 @@ list(APPEND armnnBackendsCommonUnitTests_sources
     layerTests/InstanceNormalizationTestImpl.hpp
     layerTests/L2NormalizationTestImpl.cpp
     layerTests/L2NormalizationTestImpl.hpp
-    layerTests/LayerTestResult.hpp
     layerTests/LogTestImpl.cpp
     layerTests/LogTestImpl.hpp
     layerTests/LogicalTestImpl.cpp
diff --git a/src/backends/backendsCommon/test/CommonTestUtils.hpp b/src/backends/backendsCommon/test/CommonTestUtils.hpp
deleted file mode 100644
index b1c9cdff0f..0000000000
--- a/src/backends/backendsCommon/test/CommonTestUtils.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "../../armnnTestUtils/CommonTestUtils.hpp"
-#pragma message("backendsCommon/test/CommonTestUtils.hpp has been deprecated, it is due for removal in 22.11 release." \
-                " Please use from armnnTestUtils library, /src/armnnTestUtils/CommonTestUtils.hpp)
diff --git a/src/backends/backendsCommon/test/DataLayoutUtils.hpp b/src/backends/backendsCommon/test/DataLayoutUtils.hpp
deleted file mode 100644
index 86b86dfdc6..0000000000
--- a/src/backends/backendsCommon/test/DataLayoutUtils.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Copyright © 2019 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include <armnnTestUtils/DataLayoutUtils.hpp>
-
-#pragma message("backendsCommon/test/DataLayoutUtils.hpp  has been deprecated, it is due for removal " \
-                "in 22.11 release. Please use public interface include/armnnTestUtils/DataLayoutUtils.hpp")
diff --git a/src/backends/backendsCommon/test/DataTypeUtils.hpp b/src/backends/backendsCommon/test/DataTypeUtils.hpp
deleted file mode 100644
index 101f286fc2..0000000000
--- a/src/backends/backendsCommon/test/DataTypeUtils.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "../../armnnTestUtils/DataTypeUtils.hpp"
-
-#pragma message("backendsCommon/test/DataTypeUtils.hpp has been deprecated, it is due for removal in 22.11 release." \
-                " Please use from armnnTestUtils library, /src/armnnTestUtils/DataTypeUtils.hpp)
diff --git a/src/backends/backendsCommon/test/WorkloadTestUtils.hpp b/src/backends/backendsCommon/test/WorkloadTestUtils.hpp
deleted file mode 100644
index 0377d5edd1..0000000000
--- a/src/backends/backendsCommon/test/WorkloadTestUtils.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "../../../armnnTestUtils/WorkloadTestUtils.hpp"
-#pragma message("src/backends/backendsCommon/test/WorkloadTestUtils.hpp has been deprecated, it is due for removal in"\
-                " 22.11 release. Please use src/armnnTestUtils/WorkloadTestUtils.hpp instead.")
diff --git a/src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp b/src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp
deleted file mode 100644
index c24359fb1f..0000000000
--- a/src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-// This file is deprecated and will be removed soon.
-// Please use the new header in armnnTestUtils instead.
-// This will use the new armnnTestUtils header.
-#include <armnnTestUtils/LayerTestResult.hpp>
-
-#pragma message("backendsCommon/test/layerTests/LayerTestResult.hpp has been deprecated, it is due for " \
-                "removal in 22.11 release. Please use public interface include/armnnTestUtils/LayerTestResult.hpp")
-
-
-
-