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 --- src/core/CPP/kernels/CPPNonMaximumSuppressionKernel.cpp | 3 +-- src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp | 1 - src/core/NEON/kernels/NEFuseBatchNormalizationKernel.cpp | 3 +-- src/core/NEON/kernels/NEStackLayerKernel.cpp | 4 +--- src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp | 4 ++-- src/core/SubTensorInfo.cpp | 5 ++--- src/core/TensorInfo.cpp | 4 ++-- src/core/Utils.cpp | 1 - src/core/utils/io/FileHandler.cpp | 1 - src/core/utils/logging/Logger.cpp | 6 +++--- src/core/utils/logging/LoggerRegistry.cpp | 3 +-- 11 files changed, 13 insertions(+), 22 deletions(-) (limited to 'src/core') diff --git a/src/core/CPP/kernels/CPPNonMaximumSuppressionKernel.cpp b/src/core/CPP/kernels/CPPNonMaximumSuppressionKernel.cpp index 750f44d972..7ea59ba65b 100644 --- a/src/core/CPP/kernels/CPPNonMaximumSuppressionKernel.cpp +++ b/src/core/CPP/kernels/CPPNonMaximumSuppressionKernel.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/core/Error.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Validate.h" -#include "support/ToolchainSupport.h" #include diff --git a/src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp b/src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp index 03b962291d..0be9d8f92b 100644 --- a/src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp +++ b/src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp @@ -38,7 +38,6 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/core/Window.h" #include "arm_compute/core/utils/misc/ShapeCalculator.h" -#include "support/ToolchainSupport.h" namespace arm_compute { diff --git a/src/core/NEON/kernels/NEFuseBatchNormalizationKernel.cpp b/src/core/NEON/kernels/NEFuseBatchNormalizationKernel.cpp index 836e429aba..6e7e5ab23f 100644 --- a/src/core/NEON/kernels/NEFuseBatchNormalizationKernel.cpp +++ b/src/core/NEON/kernels/NEFuseBatchNormalizationKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -31,7 +31,6 @@ #include "arm_compute/core/Utils.h" #include "arm_compute/core/Validate.h" #include "arm_compute/core/Window.h" -#include "support/ToolchainSupport.h" #include "utils/TypePrinter.h" #include diff --git a/src/core/NEON/kernels/NEStackLayerKernel.cpp b/src/core/NEON/kernels/NEStackLayerKernel.cpp index 5deca9e595..7ed6bb5c18 100644 --- a/src/core/NEON/kernels/NEStackLayerKernel.cpp +++ b/src/core/NEON/kernels/NEStackLayerKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -34,8 +34,6 @@ #include "arm_compute/core/Window.h" #include "arm_compute/core/utils/misc/ShapeCalculator.h" -#include "support/ToolchainSupport.h" - using namespace arm_compute; using namespace arm_compute::misc::shape_calculator; diff --git a/src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp b/src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp index b0e8167653..68064ee7c7 100644 --- a/src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp +++ b/src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -33,7 +33,7 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/core/Window.h" #include "arm_compute/core/utils/misc/ShapeCalculator.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" namespace arm_compute { diff --git a/src/core/SubTensorInfo.cpp b/src/core/SubTensorInfo.cpp index 2db76b475a..be8560fd61 100644 --- a/src/core/SubTensorInfo.cpp +++ b/src/core/SubTensorInfo.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,6 @@ #include "arm_compute/core/Error.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Validate.h" -#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -127,7 +126,7 @@ int32_t SubTensorInfo::offset_element_in_bytes(const Coordinates &pos) const { ARM_COMPUTE_ERROR_ON_COORDINATES_DIMENSIONS_GTE(pos, _tensor_shape.num_dimensions()); - int32_t offset = offset_first_element_in_bytes(); + int32_t offset = offset_first_element_in_bytes(); const Strides &strides = strides_in_bytes(); for(size_t i = 0; i < _tensor_shape.num_dimensions(); ++i) diff --git a/src/core/TensorInfo.cpp b/src/core/TensorInfo.cpp index cc13b39a24..b86a4cf924 100644 --- a/src/core/TensorInfo.cpp +++ b/src/core/TensorInfo.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019 ARM Limited. + * Copyright (c) 2016-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -28,7 +28,7 @@ #include "arm_compute/core/Helpers.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Validate.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" using namespace arm_compute; diff --git a/src/core/Utils.cpp b/src/core/Utils.cpp index f5db6e1502..892cbcd41c 100644 --- a/src/core/Utils.cpp +++ b/src/core/Utils.cpp @@ -25,7 +25,6 @@ #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Utils.h" -#include "support/ToolchainSupport.h" #include #include diff --git a/src/core/utils/io/FileHandler.cpp b/src/core/utils/io/FileHandler.cpp index a6c16fff4b..2c678069be 100644 --- a/src/core/utils/io/FileHandler.cpp +++ b/src/core/utils/io/FileHandler.cpp @@ -26,7 +26,6 @@ #include "arm_compute/core/utils/io/FileHandler.h" #include "arm_compute/core/Error.h" -#include "support/ToolchainSupport.h" using namespace arm_compute::io; diff --git a/src/core/utils/logging/Logger.cpp b/src/core/utils/logging/Logger.cpp index b025ca8097..7f954ac414 100644 --- a/src/core/utils/logging/Logger.cpp +++ b/src/core/utils/logging/Logger.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -24,7 +24,7 @@ #include "arm_compute/core/utils/logging/Logger.h" #include "arm_compute/core/Error.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" using namespace arm_compute::logging; @@ -151,4 +151,4 @@ void Logger::print_all(const std::string &msg) { p->print(msg); } -} \ No newline at end of file +} diff --git a/src/core/utils/logging/LoggerRegistry.cpp b/src/core/utils/logging/LoggerRegistry.cpp index fe71902ec0..4880e9eb19 100644 --- a/src/core/utils/logging/LoggerRegistry.cpp +++ b/src/core/utils/logging/LoggerRegistry.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -25,7 +25,6 @@ #include "arm_compute/core/Error.h" #include "support/Mutex.h" -#include "support/ToolchainSupport.h" using namespace arm_compute::logging; -- cgit v1.2.1