From ce8204a528b3973b2dbf258095ab048a061263ea Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Fri, 2 Sep 2022 14:36:54 +0100 Subject: IVGCVSW-7209 Remove deprecated code due to be removed in 22.11 * Files deleted when Stabilizing the API Signed-off-by: Teresa Charlin Change-Id: I0ae73ee36968fa880761c10358bfa827be5fe054 --- src/backends/backendsCommon/CMakeLists.txt | 5 ----- src/backends/backendsCommon/MemCopyWorkload.hpp | 8 -------- src/backends/backendsCommon/TensorHandle.hpp | 8 -------- src/backends/backendsCommon/Workload.hpp | 8 -------- src/backends/backendsCommon/WorkloadData.hpp | 8 -------- src/backends/backendsCommon/WorkloadFactory.hpp | 8 -------- src/backends/backendsCommon/test/CMakeLists.txt | 5 ----- src/backends/backendsCommon/test/CommonTestUtils.hpp | 8 -------- src/backends/backendsCommon/test/DataLayoutUtils.hpp | 9 --------- src/backends/backendsCommon/test/DataTypeUtils.hpp | 9 --------- src/backends/backendsCommon/test/WorkloadTestUtils.hpp | 8 -------- .../backendsCommon/test/layerTests/LayerTestResult.hpp | 16 ---------------- 12 files changed, 100 deletions(-) delete mode 100644 src/backends/backendsCommon/MemCopyWorkload.hpp delete mode 100644 src/backends/backendsCommon/TensorHandle.hpp delete mode 100644 src/backends/backendsCommon/Workload.hpp delete mode 100644 src/backends/backendsCommon/WorkloadData.hpp delete mode 100644 src/backends/backendsCommon/WorkloadFactory.hpp delete mode 100644 src/backends/backendsCommon/test/CommonTestUtils.hpp delete mode 100644 src/backends/backendsCommon/test/DataLayoutUtils.hpp delete mode 100644 src/backends/backendsCommon/test/DataTypeUtils.hpp delete mode 100644 src/backends/backendsCommon/test/WorkloadTestUtils.hpp delete mode 100644 src/backends/backendsCommon/test/layerTests/LayerTestResult.hpp (limited to 'src/backends/backendsCommon') 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 -#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 -#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 -#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 -#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 -#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 - -#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 - -#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") - - - - -- cgit v1.2.1