From 9204646e091ffc25eda61768537357916a4f7df4 Mon Sep 17 00:00:00 2001 From: Matthew Bentham Date: Sat, 7 Mar 2020 22:15:55 +0000 Subject: COMPMID-3069: Remove unnecessary uses of ToolchainSupport.h Change-Id: I9c09d1002043fd2f927493a85924298d54b1ad9c Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2854 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio --- tests/CL/Helper.h | 4 ++-- tests/NEON/Helper.h | 4 ++-- tests/SimpleTensor.h | 4 ++-- tests/framework/Framework.cpp | 2 +- tests/framework/TestFilter.cpp | 4 ++-- tests/framework/datasets/RangeDataset.h | 4 ++-- tests/framework/datasets/SingletonDataset.h | 4 ++-- tests/main.cpp | 3 ++- tests/validate_examples/graph_convolution.cpp | 4 +--- tests/validate_examples/graph_depthwiseconvolution.cpp | 4 +--- tests/validate_examples/graph_fully_connected.cpp | 4 +--- tests/validation/CL/UNIT/DynamicTensor.cpp | 3 +-- tests/validation/CL/UNIT/MemoryManager.cpp | 3 +-- tests/validation/CL/UNIT/Tuner.cpp | 3 +-- tests/validation/CL/UNIT/WeightsRetention.cpp | 3 +-- tests/validation/GLES_COMPUTE/UNIT/DynamicTensor.cpp | 3 +-- tests/validation/GLES_COMPUTE/UNIT/MemoryManager.cpp | 3 +-- tests/validation/NEON/UNIT/DynamicTensor.cpp | 3 +-- tests/validation/NEON/UNIT/MemoryManager.cpp | 3 +-- tests/validation/NEON/UNIT/RuntimeContext.cpp | 3 +-- tests/validation/NEON/UNIT/TensorAllocator.cpp | 4 ++-- tests/validation/UNIT/GPUTarget.cpp | 3 +-- tests/validation/UNIT/SafeIntegerOps.cpp | 3 +-- tests/validation/fixtures/SobelFixture.h | 3 +-- tests/validation/reference/Scale.cpp | 1 - 25 files changed, 32 insertions(+), 50 deletions(-) (limited to 'tests') diff --git a/tests/CL/Helper.h b/tests/CL/Helper.h index d7896c7835..50d6162acc 100644 --- a/tests/CL/Helper.h +++ b/tests/CL/Helper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -31,7 +31,7 @@ #include "arm_compute/runtime/CL/CLScheduler.h" #include "arm_compute/runtime/CL/ICLSimpleFunction.h" #include "arm_compute/runtime/IFunction.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" namespace arm_compute { diff --git a/tests/NEON/Helper.h b/tests/NEON/Helper.h index e84b3b6afe..a56b4adc34 100644 --- a/tests/NEON/Helper.h +++ b/tests/NEON/Helper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,7 @@ #include "arm_compute/runtime/Array.h" #include "arm_compute/runtime/NEON/INESimpleFunction.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" #include "tests/Globals.h" #include diff --git a/tests/SimpleTensor.h b/tests/SimpleTensor.h index 6dae346ead..07474ff779 100644 --- a/tests/SimpleTensor.h +++ b/tests/SimpleTensor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -27,7 +27,7 @@ #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" #include "arm_compute/core/Utils.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" #include "tests/IAccessor.h" #include "tests/Utils.h" diff --git a/tests/framework/Framework.cpp b/tests/framework/Framework.cpp index 4d66b14d67..c6aaad0586 100644 --- a/tests/framework/Framework.cpp +++ b/tests/framework/Framework.cpp @@ -24,7 +24,7 @@ #include "Framework.h" #include "arm_compute/runtime/Scheduler.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" #include "tests/framework/ParametersLibrary.h" #ifdef ARM_COMPUTE_CL diff --git a/tests/framework/TestFilter.cpp b/tests/framework/TestFilter.cpp index f392aa7070..279f0193ca 100644 --- a/tests/framework/TestFilter.cpp +++ b/tests/framework/TestFilter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -24,7 +24,7 @@ #include "TestFilter.h" #include "Framework.h" -#include "support/ToolchainSupport.h" +#include "support/StringSupport.h" #include #include diff --git a/tests/framework/datasets/RangeDataset.h b/tests/framework/datasets/RangeDataset.h index a08756694a..1adf1834ac 100644 --- a/tests/framework/datasets/RangeDataset.h +++ b/tests/framework/datasets/RangeDataset.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -25,7 +25,7 @@ #define ARM_COMPUTE_TEST_DATASET_RANGE #include "Dataset.h" -#include "support/ToolchainSupport.h" +#include "support/StringSupport.h" #include #include diff --git a/tests/framework/datasets/SingletonDataset.h b/tests/framework/datasets/SingletonDataset.h index 47a38ec6f2..e0653b74be 100644 --- a/tests/framework/datasets/SingletonDataset.h +++ b/tests/framework/datasets/SingletonDataset.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,7 @@ #include "ContainerDataset.h" #include "Dataset.h" -#include "support/ToolchainSupport.h" +#include "support/StringSupport.h" #include #include diff --git a/tests/main.cpp b/tests/main.cpp index 441e28b2a8..bbb43c9a39 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -21,7 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" +#include "support/StringSupport.h" #include "tests/AssetsLibrary.h" #include "tests/framework/DatasetModes.h" #include "tests/framework/Exceptions.h" diff --git a/tests/validate_examples/graph_convolution.cpp b/tests/validate_examples/graph_convolution.cpp index 1ab6691e57..1148b8a564 100644 --- a/tests/validate_examples/graph_convolution.cpp +++ b/tests/validate_examples/graph_convolution.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -23,8 +23,6 @@ */ #include "arm_compute/graph.h" -#include "support/ToolchainSupport.h" - #include "tests/NEON/Accessor.h" #include "tests/validation/Validation.h" #include "tests/validation/reference/ConvolutionLayer.h" diff --git a/tests/validate_examples/graph_depthwiseconvolution.cpp b/tests/validate_examples/graph_depthwiseconvolution.cpp index 3ea33e1deb..7660e47313 100644 --- a/tests/validate_examples/graph_depthwiseconvolution.cpp +++ b/tests/validate_examples/graph_depthwiseconvolution.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -23,8 +23,6 @@ */ #include "arm_compute/graph.h" -#include "support/ToolchainSupport.h" - #include "tests/NEON/Accessor.h" #include "tests/validation/Validation.h" #include "tests/validation/reference/DepthwiseConvolutionLayer.h" diff --git a/tests/validate_examples/graph_fully_connected.cpp b/tests/validate_examples/graph_fully_connected.cpp index 645fa8b124..fb85b651ee 100644 --- a/tests/validate_examples/graph_fully_connected.cpp +++ b/tests/validate_examples/graph_fully_connected.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -23,8 +23,6 @@ */ #include "arm_compute/graph.h" -#include "support/ToolchainSupport.h" - #include "tests/NEON/Accessor.h" #include "tests/validation/Validation.h" #include "tests/validation/reference/FullyConnectedLayer.h" diff --git a/tests/validation/CL/UNIT/DynamicTensor.cpp b/tests/validation/CL/UNIT/DynamicTensor.cpp index ceb505142a..f5cc1f7c9d 100644 --- a/tests/validation/CL/UNIT/DynamicTensor.cpp +++ b/tests/validation/CL/UNIT/DynamicTensor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -28,7 +28,6 @@ #include "arm_compute/runtime/MemoryGroup.h" #include "arm_compute/runtime/MemoryManagerOnDemand.h" #include "arm_compute/runtime/PoolManager.h" -#include "support/ToolchainSupport.h" #include "tests/AssetsLibrary.h" #include "tests/CL/CLAccessor.h" #include "tests/Globals.h" diff --git a/tests/validation/CL/UNIT/MemoryManager.cpp b/tests/validation/CL/UNIT/MemoryManager.cpp index 9f581b7f76..8167026ec3 100644 --- a/tests/validation/CL/UNIT/MemoryManager.cpp +++ b/tests/validation/CL/UNIT/MemoryManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -25,7 +25,6 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h" #include "arm_compute/runtime/MemoryGroup.h" -#include "support/ToolchainSupport.h" #include "tests/AssetsLibrary.h" #include "tests/CL/CLAccessor.h" #include "tests/Globals.h" diff --git a/tests/validation/CL/UNIT/Tuner.cpp b/tests/validation/CL/UNIT/Tuner.cpp index 9f760563b5..6345b7cd11 100644 --- a/tests/validation/CL/UNIT/Tuner.cpp +++ b/tests/validation/CL/UNIT/Tuner.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -25,7 +25,6 @@ #include "arm_compute/runtime/CL/CLScheduler.h" #include "arm_compute/runtime/CL/CLTensor.h" #include "arm_compute/runtime/CL/tuners/BifrostTuner.h" -#include "support/ToolchainSupport.h" #include "tests/Utils.h" #include "tests/framework/Asserts.h" #include "tests/framework/Macros.h" diff --git a/tests/validation/CL/UNIT/WeightsRetention.cpp b/tests/validation/CL/UNIT/WeightsRetention.cpp index 992fb8cf9f..9a6fddcc80 100644 --- a/tests/validation/CL/UNIT/WeightsRetention.cpp +++ b/tests/validation/CL/UNIT/WeightsRetention.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h" -#include "support/ToolchainSupport.h" #include "tests/AssetsLibrary.h" #include "tests/CL/CLAccessor.h" #include "tests/Globals.h" diff --git a/tests/validation/GLES_COMPUTE/UNIT/DynamicTensor.cpp b/tests/validation/GLES_COMPUTE/UNIT/DynamicTensor.cpp index f7264b281e..248b7fd2e4 100644 --- a/tests/validation/GLES_COMPUTE/UNIT/DynamicTensor.cpp +++ b/tests/validation/GLES_COMPUTE/UNIT/DynamicTensor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -27,7 +27,6 @@ #include "arm_compute/runtime/MemoryGroup.h" #include "arm_compute/runtime/MemoryManagerOnDemand.h" #include "arm_compute/runtime/PoolManager.h" -#include "support/ToolchainSupport.h" #include "tests/AssetsLibrary.h" #include "tests/GLES_COMPUTE/GCAccessor.h" #include "tests/Globals.h" diff --git a/tests/validation/GLES_COMPUTE/UNIT/MemoryManager.cpp b/tests/validation/GLES_COMPUTE/UNIT/MemoryManager.cpp index 50bd9f565d..99ed84a04d 100644 --- a/tests/validation/GLES_COMPUTE/UNIT/MemoryManager.cpp +++ b/tests/validation/GLES_COMPUTE/UNIT/MemoryManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,6 @@ #include "arm_compute/runtime/GLES_COMPUTE/functions/GCFullyConnectedLayer.h" #include "arm_compute/runtime/GLES_COMPUTE/functions/GCSoftmaxLayer.h" #include "arm_compute/runtime/MemoryGroup.h" -#include "support/ToolchainSupport.h" #include "tests/AssetsLibrary.h" #include "tests/GLES_COMPUTE/GCAccessor.h" #include "tests/Globals.h" diff --git a/tests/validation/NEON/UNIT/DynamicTensor.cpp b/tests/validation/NEON/UNIT/DynamicTensor.cpp index 76f30d00e5..55ade8c9a7 100644 --- a/tests/validation/NEON/UNIT/DynamicTensor.cpp +++ b/tests/validation/NEON/UNIT/DynamicTensor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -27,7 +27,6 @@ #include "arm_compute/runtime/NEON/functions/NENormalizationLayer.h" #include "arm_compute/runtime/OffsetLifetimeManager.h" #include "arm_compute/runtime/PoolManager.h" -#include "support/ToolchainSupport.h" #include "tests/AssetsLibrary.h" #include "tests/NEON/Accessor.h" #include "tests/framework/Asserts.h" diff --git a/tests/validation/NEON/UNIT/MemoryManager.cpp b/tests/validation/NEON/UNIT/MemoryManager.cpp index 431254cf94..8defc7a654 100644 --- a/tests/validation/NEON/UNIT/MemoryManager.cpp +++ b/tests/validation/NEON/UNIT/MemoryManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -28,7 +28,6 @@ #include "arm_compute/runtime/NEON/functions/NENormalizationLayer.h" #include "arm_compute/runtime/PoolManager.h" #include "arm_compute/runtime/TensorAllocator.h" -#include "support/ToolchainSupport.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/NEON/Accessor.h" diff --git a/tests/validation/NEON/UNIT/RuntimeContext.cpp b/tests/validation/NEON/UNIT/RuntimeContext.cpp index 68fb0da986..0823085883 100644 --- a/tests/validation/NEON/UNIT/RuntimeContext.cpp +++ b/tests/validation/NEON/UNIT/RuntimeContext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,6 @@ #include "arm_compute/runtime/NEON/functions/NEActivationLayer.h" #include "arm_compute/runtime/SchedulerFactory.h" #include "arm_compute/runtime/Tensor.h" -#include "support/ToolchainSupport.h" #include "tests/Globals.h" #include "tests/NEON/Accessor.h" #include "tests/Utils.h" diff --git a/tests/validation/NEON/UNIT/TensorAllocator.cpp b/tests/validation/NEON/UNIT/TensorAllocator.cpp index 4764bf63ca..21e4e71fad 100644 --- a/tests/validation/NEON/UNIT/TensorAllocator.cpp +++ b/tests/validation/NEON/UNIT/TensorAllocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -29,7 +29,7 @@ #include "arm_compute/runtime/MemoryRegion.h" #include "arm_compute/runtime/NEON/functions/NEActivationLayer.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" #include "tests/Globals.h" #include "tests/Utils.h" diff --git a/tests/validation/UNIT/GPUTarget.cpp b/tests/validation/UNIT/GPUTarget.cpp index d9366069f2..c9d78661de 100644 --- a/tests/validation/UNIT/GPUTarget.cpp +++ b/tests/validation/UNIT/GPUTarget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "arm_compute/core/GPUTarget.h" -#include "support/ToolchainSupport.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/Utils.h" diff --git a/tests/validation/UNIT/SafeIntegerOps.cpp b/tests/validation/UNIT/SafeIntegerOps.cpp index 3b58e0db3c..e721c48aad 100644 --- a/tests/validation/UNIT/SafeIntegerOps.cpp +++ b/tests/validation/UNIT/SafeIntegerOps.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -23,7 +23,6 @@ */ #include "arm_compute/core/GPUTarget.h" #include "arm_compute/core/utils/math/SafeOps.h" -#include "support/ToolchainSupport.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/Utils.h" diff --git a/tests/validation/fixtures/SobelFixture.h b/tests/validation/fixtures/SobelFixture.h index f075a69c40..2e065e6c8e 100644 --- a/tests/validation/fixtures/SobelFixture.h +++ b/tests/validation/fixtures/SobelFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,6 @@ #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" -#include "support/ToolchainSupport.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/IAccessor.h" diff --git a/tests/validation/reference/Scale.cpp b/tests/validation/reference/Scale.cpp index 47ad53a377..73fe21cbf1 100644 --- a/tests/validation/reference/Scale.cpp +++ b/tests/validation/reference/Scale.cpp @@ -26,7 +26,6 @@ #include "Utils.h" #include "arm_compute/core/utils/misc/Utility.h" -#include "support/ToolchainSupport.h" namespace arm_compute { -- cgit v1.2.1