diff options
| author | Anthony Barbier <anthony.barbier@arm.com> | 2017-08-04 18:20:27 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
| commit | 2a07e184f7b359d13aa6cacfdc6431f9b191ef0c (patch) | |
| tree | 9faddf43b82aa6abd7a65920ca60f21cc7b9032c /tests | |
| parent | cdf51455df8835e9e3bfd3e31ed389146af9a573 (diff) | |
| download | ComputeLibrary-2a07e184f7b359d13aa6cacfdc6431f9b191ef0c.tar.gz | |
COMPMID-363 Add Graph library support
Change-Id: Ie841419bf65d0e06bdfe0bdd2d8d4e0bb3631e54
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/87931
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Diffstat (limited to 'tests')
134 files changed, 145 insertions, 740 deletions
diff --git a/tests/AssetsLibrary.cpp b/tests/AssetsLibrary.cpp index d7c881d9a8..529a2a2d95 100644 --- a/tests/AssetsLibrary.cpp +++ b/tests/AssetsLibrary.cpp @@ -23,8 +23,8 @@ */ #include "tests/AssetsLibrary.h" -#include "TypePrinter.h" #include "Utils.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/ITensor.h" diff --git a/tests/TypePrinter.h b/tests/TypePrinter.h deleted file mode 100644 index d3d9f8f5ac..0000000000 --- a/tests/TypePrinter.h +++ /dev/null @@ -1,609 +0,0 @@ -/* - * Copyright (c) 2017 ARM Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#ifndef __ARM_COMPUTE_TEST_TYPE_PRINTER_H__ -#define __ARM_COMPUTE_TEST_TYPE_PRINTER_H__ - -#include "arm_compute/core/Dimensions.h" -#include "arm_compute/core/Error.h" -#include "arm_compute/core/Types.h" - -#include <ostream> -#include <sstream> -#include <string> - -namespace arm_compute -{ -/** Formatted output of the Dimensions type. */ -template <typename T> -inline ::std::ostream &operator<<(::std::ostream &os, const Dimensions<T> &dimensions) -{ - if(dimensions.num_dimensions() > 0) - { - os << dimensions[0]; - - for(unsigned int d = 1; d < dimensions.num_dimensions(); ++d) - { - os << "x" << dimensions[d]; - } - } - - return os; -} - -//FIXME: Check why this doesn't work and the TensorShape overload is needed -template <typename T> -inline std::string to_string(const Dimensions<T> &dimensions) -{ - std::stringstream str; - str << dimensions; - return str.str(); -} - -inline std::string to_string(const TensorShape &shape) -{ - std::stringstream str; - str << shape; - return str.str(); -} - -/** Formatted output of the Rectangle type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const Rectangle &rect) -{ - os << rect.width << "x" << rect.height; - os << "+" << rect.x << "+" << rect.y; - - return os; -} - -/** Formatted output of the PadStridInfo type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const PadStrideInfo &pad_stride_info) -{ - os << pad_stride_info.stride().first << "," << pad_stride_info.stride().second; - os << ";"; - os << pad_stride_info.pad().first << "," << pad_stride_info.pad().second; - - return os; -} - -inline std::string to_string(const PadStrideInfo &pad_stride_info) -{ - std::stringstream str; - str << pad_stride_info; - return str.str(); -} - -/** Formatted output of the ROIPoolingInfo type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const ROIPoolingLayerInfo &pool_info) -{ - os << pool_info.pooled_width() << "x" << pool_info.pooled_height() << "~" << pool_info.spatial_scale(); - return os; -} - -/** Formatted output of the BorderMode type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const BorderMode &mode) -{ - switch(mode) - { - case BorderMode::UNDEFINED: - os << "UNDEFINED"; - break; - case BorderMode::CONSTANT: - os << "CONSTANT"; - break; - case BorderMode::REPLICATE: - os << "REPLICATE"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const BorderMode &mode) -{ - std::stringstream str; - str << mode; - return str.str(); -} - -/** Formatted output of the NonLinearFilterFunction type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const NonLinearFilterFunction &function) -{ - switch(function) - { - case NonLinearFilterFunction::MAX: - os << "MAX"; - break; - case NonLinearFilterFunction::MEDIAN: - os << "MEDIAN"; - break; - case NonLinearFilterFunction::MIN: - os << "MIN"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const NonLinearFilterFunction &function) -{ - std::stringstream str; - str << function; - return str.str(); -} - -/** Formatted output of the MatrixPattern type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const MatrixPattern &pattern) -{ - switch(pattern) - { - case MatrixPattern::BOX: - os << "BOX"; - break; - case MatrixPattern::CROSS: - os << "CROSS"; - break; - case MatrixPattern::DISK: - os << "DISK"; - break; - case MatrixPattern::OTHER: - os << "OTHER"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const MatrixPattern &pattern) -{ - std::stringstream str; - str << pattern; - return str.str(); -} - -/** Formatted output of the InterpolationPolicy type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const InterpolationPolicy &policy) -{ - switch(policy) - { - case InterpolationPolicy::NEAREST_NEIGHBOR: - os << "NEAREST_NEIGHBOR"; - break; - case InterpolationPolicy::BILINEAR: - os << "BILINEAR"; - break; - case InterpolationPolicy::AREA: - os << "AREA"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const InterpolationPolicy &policy) -{ - std::stringstream str; - str << policy; - return str.str(); -} - -/** Formatted output of the ConversionPolicy type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const ConvertPolicy &policy) -{ - switch(policy) - { - case ConvertPolicy::WRAP: - os << "WRAP"; - break; - case ConvertPolicy::SATURATE: - os << "SATURATE"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const ConvertPolicy &policy) -{ - std::stringstream str; - str << policy; - return str.str(); -} - -/** Formatted output of the Reduction Operations. */ -inline ::std::ostream &operator<<(::std::ostream &os, const ReductionOperation &op) -{ - switch(op) - { - case ReductionOperation::SUM_SQUARE: - os << "SUM_SQUARE"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const ReductionOperation &op) -{ - std::stringstream str; - str << op; - return str.str(); -} - -/** Formatted output of the activation function type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const ActivationLayerInfo::ActivationFunction &act_function) -{ - switch(act_function) - { - case ActivationLayerInfo::ActivationFunction::ABS: - os << "ABS"; - break; - case ActivationLayerInfo::ActivationFunction::LINEAR: - os << "LINEAR"; - break; - case ActivationLayerInfo::ActivationFunction::LOGISTIC: - os << "LOGISTIC"; - break; - case ActivationLayerInfo::ActivationFunction::RELU: - os << "RELU"; - break; - case ActivationLayerInfo::ActivationFunction::BOUNDED_RELU: - os << "BOUNDED_RELU"; - break; - case ActivationLayerInfo::ActivationFunction::LU_BOUNDED_RELU: - os << "LU_BOUNDED_RELU"; - break; - case ActivationLayerInfo::ActivationFunction::LEAKY_RELU: - os << "LEAKY_RELU"; - break; - case ActivationLayerInfo::ActivationFunction::SOFT_RELU: - os << "SOFT_RELU"; - break; - case ActivationLayerInfo::ActivationFunction::SQRT: - os << "SQRT"; - break; - case ActivationLayerInfo::ActivationFunction::SQUARE: - os << "SQUARE"; - break; - case ActivationLayerInfo::ActivationFunction::TANH: - os << "TANH"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const ActivationLayerInfo::ActivationFunction &function) -{ - std::stringstream str; - str << function; - return str.str(); -} - -inline std::string to_string(const ActivationLayerInfo &info) -{ - std::stringstream str; - str << info.activation(); - return str.str(); -} - -/** Formatted output of the NormType type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const NormType &norm_type) -{ - switch(norm_type) - { - case NormType::CROSS_MAP: - os << "CROSS_MAP"; - break; - case NormType::IN_MAP_1D: - os << "IN_MAP_1D"; - break; - case NormType::IN_MAP_2D: - os << "IN_MAP_2D"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const NormType &type) -{ - std::stringstream str; - str << type; - return str.str(); -} - -inline std::string to_string(const NormalizationLayerInfo &info) -{ - std::stringstream str; - str << info.type(); - return str.str(); -} - -/** Formatted output of the PoolingType type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const PoolingType &pool_type) -{ - switch(pool_type) - { - case PoolingType::AVG: - os << "AVG"; - break; - case PoolingType::MAX: - os << "MAX"; - break; - case PoolingType::L2: - os << "L2"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const PoolingType &type) -{ - std::stringstream str; - str << type; - return str.str(); -} - -/** Formatted output of @ref PoolingLayerInfo. */ -inline ::std::ostream &operator<<(::std::ostream &os, const PoolingLayerInfo &info) -{ - os << info.pool_type() << ";" << info.pool_size() << ";" << info.pad_stride_info(); - - return os; -} - -inline std::string to_string(const PoolingLayerInfo &info) -{ - std::stringstream str; - str << info.pool_type(); - return str.str(); -} - -/** Formatted output of the RoundingPolicy type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const RoundingPolicy &rounding_policy) -{ - switch(rounding_policy) - { - case RoundingPolicy::TO_ZERO: - os << "TO_ZERO"; - break; - case RoundingPolicy::TO_NEAREST_UP: - os << "TO_NEAREST_UP"; - break; - case RoundingPolicy::TO_NEAREST_EVEN: - os << "TO_NEAREST_EVEN"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -/** Formatted output of the DataType type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const DataType &data_type) -{ - switch(data_type) - { - case DataType::UNKNOWN: - os << "UNKNOWN"; - break; - case DataType::U8: - os << "U8"; - break; - case DataType::QS8: - os << "QS8"; - break; - case DataType::S8: - os << "S8"; - break; - case DataType::U16: - os << "U16"; - break; - case DataType::S16: - os << "S16"; - break; - case DataType::QS16: - os << "QS16"; - break; - case DataType::U32: - os << "U32"; - break; - case DataType::S32: - os << "S32"; - break; - case DataType::U64: - os << "U64"; - break; - case DataType::S64: - os << "S64"; - break; - case DataType::F16: - os << "F16"; - break; - case DataType::F32: - os << "F32"; - break; - case DataType::F64: - os << "F64"; - break; - case DataType::SIZET: - os << "SIZET"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const DataType &data_type) -{ - std::stringstream str; - str << data_type; - return str.str(); -} - -/** Formatted output of the Format type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const Format &format) -{ - switch(format) - { - case Format::UNKNOWN: - os << "UNKNOWN"; - break; - case Format::U8: - os << "U8"; - break; - case Format::S16: - os << "S16"; - break; - case Format::U16: - os << "U16"; - break; - case Format::S32: - os << "S32"; - break; - case Format::U32: - os << "U32"; - break; - case Format::F16: - os << "F16"; - break; - case Format::F32: - os << "F32"; - break; - case Format::UV88: - os << "UV88"; - break; - case Format::RGB888: - os << "RGB888"; - break; - case Format::RGBA8888: - os << "RGBA8888"; - break; - case Format::YUV444: - os << "YUV444"; - break; - case Format::YUYV422: - os << "YUYV422"; - break; - case Format::NV12: - os << "NV12"; - break; - case Format::NV21: - os << "NV21"; - break; - case Format::IYUV: - os << "IYUV"; - break; - case Format::UYVY422: - os << "UYVY422"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -/** Formatted output of the Channel type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const Channel &channel) -{ - switch(channel) - { - case Channel::UNKNOWN: - os << "UNKNOWN"; - break; - case Channel::C0: - os << "C0"; - break; - case Channel::C1: - os << "C1"; - break; - case Channel::C2: - os << "C2"; - break; - case Channel::C3: - os << "C3"; - break; - case Channel::R: - os << "R"; - break; - case Channel::G: - os << "G"; - break; - case Channel::B: - os << "B"; - break; - case Channel::A: - os << "A"; - break; - case Channel::Y: - os << "Y"; - break; - case Channel::U: - os << "U"; - break; - case Channel::V: - os << "V"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -/** Formatted output of the BorderSize type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const BorderSize &border) -{ - os << border.top << "," - << border.right << "," - << border.bottom << "," - << border.left; - - return os; -} -} // namespace arm_compute -#endif /* __ARM_COMPUTE_TEST_TYPE_PRINTER_H__ */ diff --git a/tests/benchmark/CL/ActivationLayer.cpp b/tests/benchmark/CL/ActivationLayer.cpp index 50a2004b07..e919c7820b 100644 --- a/tests/benchmark/CL/ActivationLayer.cpp +++ b/tests/benchmark/CL/ActivationLayer.cpp @@ -27,7 +27,6 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLActivationLayer.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/ActivationLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h" @@ -38,6 +37,7 @@ #include "tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/BatchNormalizationLayer.cpp b/tests/benchmark/CL/BatchNormalizationLayer.cpp index b0e36d31af..af88278fef 100644 --- a/tests/benchmark/CL/BatchNormalizationLayer.cpp +++ b/tests/benchmark/CL/BatchNormalizationLayer.cpp @@ -27,12 +27,12 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLBatchNormalizationLayer.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/BatchNormalizationLayerFixture.h" #include "tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h" #include "tests/datasets/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/ConvolutionLayer.cpp b/tests/benchmark/CL/ConvolutionLayer.cpp index 620feafa83..4467765878 100644 --- a/tests/benchmark/CL/ConvolutionLayer.cpp +++ b/tests/benchmark/CL/ConvolutionLayer.cpp @@ -27,7 +27,6 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLConvolutionLayer.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/ConvolutionLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h" @@ -38,6 +37,7 @@ #include "tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/DepthwiseConvolution.cpp b/tests/benchmark/CL/DepthwiseConvolution.cpp index a8c229fad8..40412da6f9 100644 --- a/tests/benchmark/CL/DepthwiseConvolution.cpp +++ b/tests/benchmark/CL/DepthwiseConvolution.cpp @@ -27,11 +27,11 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLDepthwiseConvolution.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/DepthwiseConvolutionFixture.h" #include "tests/datasets/MobileNetDepthwiseConvolutionDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp b/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp index 0c4fbb18bd..7f5bb00583 100644 --- a/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp +++ b/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp @@ -27,11 +27,11 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/DepthwiseSeparableConvolutionLayerFixture.h" #include "tests/datasets/MobileNetDepthwiseSeparableConvolutionLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/DirectConvolutionLayer.cpp b/tests/benchmark/CL/DirectConvolutionLayer.cpp index 15bf8084ea..2430a4ee94 100644 --- a/tests/benchmark/CL/DirectConvolutionLayer.cpp +++ b/tests/benchmark/CL/DirectConvolutionLayer.cpp @@ -27,7 +27,6 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/ConvolutionLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h" @@ -37,6 +36,7 @@ #include "tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/Floor.cpp b/tests/benchmark/CL/Floor.cpp index ce8fa487c1..b2ada0ebc5 100644 --- a/tests/benchmark/CL/Floor.cpp +++ b/tests/benchmark/CL/Floor.cpp @@ -27,11 +27,11 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLFloor.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/FloorFixture.h" #include "tests/datasets/ShapeDatasets.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/FullyConnectedLayer.cpp b/tests/benchmark/CL/FullyConnectedLayer.cpp index d41424acce..e5f3217368 100644 --- a/tests/benchmark/CL/FullyConnectedLayer.cpp +++ b/tests/benchmark/CL/FullyConnectedLayer.cpp @@ -27,7 +27,6 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/FullyConnectedLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h" @@ -36,6 +35,7 @@ #include "tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/GEMM.cpp b/tests/benchmark/CL/GEMM.cpp index 3febef5613..ece20433b9 100644 --- a/tests/benchmark/CL/GEMM.cpp +++ b/tests/benchmark/CL/GEMM.cpp @@ -26,12 +26,12 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLGEMM.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/GEMMFixture.h" #include "tests/datasets/MatrixMultiplyGEMMDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/NormalizationLayer.cpp b/tests/benchmark/CL/NormalizationLayer.cpp index 2035ae301a..8dd5f62dd3 100644 --- a/tests/benchmark/CL/NormalizationLayer.cpp +++ b/tests/benchmark/CL/NormalizationLayer.cpp @@ -27,12 +27,12 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLNormalizationLayer.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/NormalizationLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/PoolingLayer.cpp b/tests/benchmark/CL/PoolingLayer.cpp index fcc37e9571..116639a1d0 100644 --- a/tests/benchmark/CL/PoolingLayer.cpp +++ b/tests/benchmark/CL/PoolingLayer.cpp @@ -27,7 +27,6 @@ #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLPoolingLayer.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/PoolingLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h" @@ -38,6 +37,7 @@ #include "tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/ROIPoolingLayer.cpp b/tests/benchmark/CL/ROIPoolingLayer.cpp index a10134fb04..4e78673287 100644 --- a/tests/benchmark/CL/ROIPoolingLayer.cpp +++ b/tests/benchmark/CL/ROIPoolingLayer.cpp @@ -29,11 +29,11 @@ #include "arm_compute/runtime/CL/functions/CLROIPoolingLayer.h" #include "tests/CL/CLAccessor.h" #include "tests/CL/CLArrayAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/ROIPoolingLayerFixture.h" #include "tests/datasets/ROIPoolingLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/SYSTEM/AlexNet.cpp b/tests/benchmark/CL/SYSTEM/AlexNet.cpp index fcf8a52f9e..5f258412de 100644 --- a/tests/benchmark/CL/SYSTEM/AlexNet.cpp +++ b/tests/benchmark/CL/SYSTEM/AlexNet.cpp @@ -34,10 +34,10 @@ #include "arm_compute/runtime/CL/functions/CLPoolingLayer.h" #include "arm_compute/runtime/CL/functions/CLSoftmaxLayer.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/AlexNetFixture.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/CL/SYSTEM/LeNet5.cpp b/tests/benchmark/CL/SYSTEM/LeNet5.cpp index 35ebc7d8fb..21e5432947 100644 --- a/tests/benchmark/CL/SYSTEM/LeNet5.cpp +++ b/tests/benchmark/CL/SYSTEM/LeNet5.cpp @@ -31,10 +31,10 @@ #include "arm_compute/runtime/CL/functions/CLPoolingLayer.h" #include "arm_compute/runtime/CL/functions/CLSoftmaxLayer.h" #include "tests/CL/CLAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/LeNet5Fixture.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/NEON/ActivationLayer.cpp b/tests/benchmark/NEON/ActivationLayer.cpp index 0b699f2501..a00e7ec2e6 100644 --- a/tests/benchmark/NEON/ActivationLayer.cpp +++ b/tests/benchmark/NEON/ActivationLayer.cpp @@ -27,7 +27,6 @@ #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/ActivationLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h" @@ -38,6 +37,7 @@ #include "tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/NEON/BatchNormalizationLayer.cpp b/tests/benchmark/NEON/BatchNormalizationLayer.cpp index 1b0d484404..5bfd234704 100644 --- a/tests/benchmark/NEON/BatchNormalizationLayer.cpp +++ b/tests/benchmark/NEON/BatchNormalizationLayer.cpp @@ -27,9 +27,9 @@ #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" -#include "tests/TypePrinter.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" #include "tests/benchmark/fixtures/BatchNormalizationLayerFixture.h" #include "tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h" diff --git a/tests/benchmark/NEON/ConvolutionLayer.cpp b/tests/benchmark/NEON/ConvolutionLayer.cpp index 6d2857d621..effcf63b8b 100644 --- a/tests/benchmark/NEON/ConvolutionLayer.cpp +++ b/tests/benchmark/NEON/ConvolutionLayer.cpp @@ -27,7 +27,6 @@ #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/ConvolutionLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h" @@ -38,6 +37,7 @@ #include "tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/NEON/DirectConvolutionLayer.cpp b/tests/benchmark/NEON/DirectConvolutionLayer.cpp index a9dd4b94ea..e25a072599 100644 --- a/tests/benchmark/NEON/DirectConvolutionLayer.cpp +++ b/tests/benchmark/NEON/DirectConvolutionLayer.cpp @@ -27,7 +27,6 @@ #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/ConvolutionLayerFixture.h" #include "tests/datasets/DirectConvolutionLayerDataset.h" #include "tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h" @@ -38,6 +37,7 @@ #include "tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/NEON/Floor.cpp b/tests/benchmark/NEON/Floor.cpp index 4bc0c05fdc..824aee95ec 100644 --- a/tests/benchmark/NEON/Floor.cpp +++ b/tests/benchmark/NEON/Floor.cpp @@ -27,11 +27,11 @@ #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/FloorFixture.h" #include "tests/datasets/ShapeDatasets.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/NEON/FullyConnectedLayer.cpp b/tests/benchmark/NEON/FullyConnectedLayer.cpp index 88499b1b6f..c12d7cedb9 100644 --- a/tests/benchmark/NEON/FullyConnectedLayer.cpp +++ b/tests/benchmark/NEON/FullyConnectedLayer.cpp @@ -27,7 +27,6 @@ #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/FullyConnectedLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h" @@ -36,6 +35,7 @@ #include "tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/NEON/GEMM.cpp b/tests/benchmark/NEON/GEMM.cpp index 2c5a726784..ddc54e633e 100644 --- a/tests/benchmark/NEON/GEMM.cpp +++ b/tests/benchmark/NEON/GEMM.cpp @@ -27,12 +27,12 @@ #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/GEMMFixture.h" #include "tests/datasets/MatrixMultiplyGEMMDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/NEON/NormalizationLayer.cpp b/tests/benchmark/NEON/NormalizationLayer.cpp index 04887951bd..383cec98d0 100644 --- a/tests/benchmark/NEON/NormalizationLayer.cpp +++ b/tests/benchmark/NEON/NormalizationLayer.cpp @@ -27,12 +27,12 @@ #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/NormalizationLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/NEON/PoolingLayer.cpp b/tests/benchmark/NEON/PoolingLayer.cpp index 05a173b283..8d4e0a086d 100644 --- a/tests/benchmark/NEON/PoolingLayer.cpp +++ b/tests/benchmark/NEON/PoolingLayer.cpp @@ -27,7 +27,6 @@ #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/PoolingLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h" @@ -38,6 +37,7 @@ #include "tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/NEON/ROIPoolingLayer.cpp b/tests/benchmark/NEON/ROIPoolingLayer.cpp index d3a7e4b3af..64b3570715 100644 --- a/tests/benchmark/NEON/ROIPoolingLayer.cpp +++ b/tests/benchmark/NEON/ROIPoolingLayer.cpp @@ -29,11 +29,11 @@ #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" #include "tests/NEON/ArrayAccessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/ROIPoolingLayerFixture.h" #include "tests/datasets/ROIPoolingLayerDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp index cd48e5db25..19598e3ca5 100644 --- a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp +++ b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp @@ -34,10 +34,10 @@ #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/AlexNetFixture.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/benchmark/NEON/SYSTEM/LeNet5.cpp b/tests/benchmark/NEON/SYSTEM/LeNet5.cpp index 46ccfc01d5..5075da50cf 100644 --- a/tests/benchmark/NEON/SYSTEM/LeNet5.cpp +++ b/tests/benchmark/NEON/SYSTEM/LeNet5.cpp @@ -31,10 +31,10 @@ #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" -#include "tests/TypePrinter.h" #include "tests/benchmark/fixtures/LeNet5Fixture.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/datasets/BatchNormalizationLayerDataset.h b/tests/datasets/BatchNormalizationLayerDataset.h index 25e65d931c..fceff1edc7 100644 --- a/tests/datasets/BatchNormalizationLayerDataset.h +++ b/tests/datasets/BatchNormalizationLayerDataset.h @@ -24,7 +24,7 @@ #ifndef ARM_COMPUTE_TEST_BATCHNORMALIZATION_LAYER_DATASET #define ARM_COMPUTE_TEST_BATCHNORMALIZATION_LAYER_DATASET -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/BorderModeDataset.h b/tests/datasets/BorderModeDataset.h index df024a7dbf..3b8a08ce61 100644 --- a/tests/datasets/BorderModeDataset.h +++ b/tests/datasets/BorderModeDataset.h @@ -27,6 +27,13 @@ #include "arm_compute/core/Types.h" #include "tests/framework/datasets/ContainerDataset.h" +#include "utils/TypePrinter.h" + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" #include <vector> namespace arm_compute diff --git a/tests/datasets/ConvolutionLayerDataset.h b/tests/datasets/ConvolutionLayerDataset.h index ba11bd5d6d..6e2d2a142e 100644 --- a/tests/datasets/ConvolutionLayerDataset.h +++ b/tests/datasets/ConvolutionLayerDataset.h @@ -24,7 +24,7 @@ #ifndef ARM_COMPUTE_TEST_CONVOLUTION_LAYER_DATASET #define ARM_COMPUTE_TEST_CONVOLUTION_LAYER_DATASET -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/DepthwiseConvolutionDataset.h b/tests/datasets/DepthwiseConvolutionDataset.h index bdc949501e..6a7af63d05 100644 --- a/tests/datasets/DepthwiseConvolutionDataset.h +++ b/tests/datasets/DepthwiseConvolutionDataset.h @@ -24,7 +24,7 @@ #ifndef ARM_COMPUTE_TEST_DEPTHWISE_CONVOLUTION_DATASET #define ARM_COMPUTE_TEST_DEPTHWISE_CONVOLUTION_DATASET -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/DepthwiseSeparableConvolutionLayerDataset.h b/tests/datasets/DepthwiseSeparableConvolutionLayerDataset.h index 4391379833..6b39d3a5c8 100644 --- a/tests/datasets/DepthwiseSeparableConvolutionLayerDataset.h +++ b/tests/datasets/DepthwiseSeparableConvolutionLayerDataset.h @@ -24,7 +24,7 @@ #ifndef ARM_COMPUTE_TEST_DEPTHWISE_SEPARABLE_CONVOLUTION_LAYER_DATASET #define ARM_COMPUTE_TEST_DEPTHWISE_SEPARABLE_CONVOLUTION_LAYER_DATASET -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/DirectConvolutionLayerDataset.h b/tests/datasets/DirectConvolutionLayerDataset.h index dca38b5858..294f44fa42 100644 --- a/tests/datasets/DirectConvolutionLayerDataset.h +++ b/tests/datasets/DirectConvolutionLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/ConvolutionLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/FullyConnectedLayerDataset.h b/tests/datasets/FullyConnectedLayerDataset.h index 8401e39ece..5789954e85 100644 --- a/tests/datasets/FullyConnectedLayerDataset.h +++ b/tests/datasets/FullyConnectedLayerDataset.h @@ -24,7 +24,7 @@ #ifndef ARM_COMPUTE_TEST_FULLYCONNECTED_LAYER_DATASET #define ARM_COMPUTE_TEST_FULLYCONNECTED_LAYER_DATASET -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/GEMMDataset.h b/tests/datasets/GEMMDataset.h index bb8a328b0c..9491582641 100644 --- a/tests/datasets/GEMMDataset.h +++ b/tests/datasets/GEMMDataset.h @@ -24,7 +24,7 @@ #ifndef ARM_COMPUTE_TEST_GEMM_DATASET #define ARM_COMPUTE_TEST_GEMM_DATASET -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" diff --git a/tests/datasets/LargeConvolutionLayerDataset.h b/tests/datasets/LargeConvolutionLayerDataset.h index 721530ae19..086b2e3def 100644 --- a/tests/datasets/LargeConvolutionLayerDataset.h +++ b/tests/datasets/LargeConvolutionLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/ConvolutionLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/LargeGEMMDataset.h b/tests/datasets/LargeGEMMDataset.h index 37cdfaa99f..638eb904ad 100644 --- a/tests/datasets/LargeGEMMDataset.h +++ b/tests/datasets/LargeGEMMDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/GEMMDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/MatrixMultiplyGEMMDataset.h b/tests/datasets/MatrixMultiplyGEMMDataset.h index 771403ba96..718c32b466 100644 --- a/tests/datasets/MatrixMultiplyGEMMDataset.h +++ b/tests/datasets/MatrixMultiplyGEMMDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/GEMMDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" diff --git a/tests/datasets/MatrixPatternDataset.h b/tests/datasets/MatrixPatternDataset.h index 4c1414996d..423aeb8627 100644 --- a/tests/datasets/MatrixPatternDataset.h +++ b/tests/datasets/MatrixPatternDataset.h @@ -27,6 +27,13 @@ #include "arm_compute/core/Types.h" #include "tests/framework/datasets/ContainerDataset.h" +#include "utils/TypePrinter.h" + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" #include <vector> namespace arm_compute diff --git a/tests/datasets/MobileNetDepthwiseConvolutionDataset.h b/tests/datasets/MobileNetDepthwiseConvolutionDataset.h index c417f18a51..c9d98d4185 100644 --- a/tests/datasets/MobileNetDepthwiseConvolutionDataset.h +++ b/tests/datasets/MobileNetDepthwiseConvolutionDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/DepthwiseConvolutionDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/MobileNetDepthwiseSeparableConvolutionLayerDataset.h b/tests/datasets/MobileNetDepthwiseSeparableConvolutionLayerDataset.h index c7784c399c..f6137ee74c 100644 --- a/tests/datasets/MobileNetDepthwiseSeparableConvolutionLayerDataset.h +++ b/tests/datasets/MobileNetDepthwiseSeparableConvolutionLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/DepthwiseSeparableConvolutionLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/PoolingLayerDataset.h b/tests/datasets/PoolingLayerDataset.h index e5e9cd70f0..56ec3b87d8 100644 --- a/tests/datasets/PoolingLayerDataset.h +++ b/tests/datasets/PoolingLayerDataset.h @@ -26,7 +26,7 @@ #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" namespace arm_compute { diff --git a/tests/datasets/ROIPoolingLayerDataset.h b/tests/datasets/ROIPoolingLayerDataset.h index 65d589eb97..a1879d3b54 100644 --- a/tests/datasets/ROIPoolingLayerDataset.h +++ b/tests/datasets/ROIPoolingLayerDataset.h @@ -24,7 +24,7 @@ #ifndef ARM_COMPUTE_TEST_ROI_POOLING_LAYER_DATASET #define ARM_COMPUTE_TEST_ROI_POOLING_LAYER_DATASET -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/RandomBatchNormalizationLayerDataset.h b/tests/datasets/RandomBatchNormalizationLayerDataset.h index f4c61e06d5..10908871b6 100644 --- a/tests/datasets/RandomBatchNormalizationLayerDataset.h +++ b/tests/datasets/RandomBatchNormalizationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/BatchNormalizationLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/ReductionOperationDataset.h b/tests/datasets/ReductionOperationDataset.h index ce1bcb8501..e710588921 100644 --- a/tests/datasets/ReductionOperationDataset.h +++ b/tests/datasets/ReductionOperationDataset.h @@ -25,8 +25,8 @@ #define __ARM_COMPUTE_TEST_REDUCTION_OPERATION_DATASET_H__ #include "arm_compute/core/Types.h" -#include "tests/TypePrinter.h" #include "tests/framework/datasets/ContainerDataset.h" +#include "utils/TypePrinter.h" #include <vector> diff --git a/tests/datasets/ReshapeLayerDataset.h b/tests/datasets/ReshapeLayerDataset.h index db7b0b3e57..fa938a63ed 100644 --- a/tests/datasets/ReshapeLayerDataset.h +++ b/tests/datasets/ReshapeLayerDataset.h @@ -24,7 +24,7 @@ #ifndef ARM_COMPUTE_TEST_RESHAPE_LAYER_DATASET #define ARM_COMPUTE_TEST_RESHAPE_LAYER_DATASET -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" diff --git a/tests/datasets/SmallConvolutionLayerDataset.h b/tests/datasets/SmallConvolutionLayerDataset.h index 1a26fa5917..8eda2e87fe 100644 --- a/tests/datasets/SmallConvolutionLayerDataset.h +++ b/tests/datasets/SmallConvolutionLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/ConvolutionLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/SmallGEMMDataset.h b/tests/datasets/SmallGEMMDataset.h index 0cc3c3aa8c..5d59c1d3b3 100644 --- a/tests/datasets/SmallGEMMDataset.h +++ b/tests/datasets/SmallGEMMDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/GEMMDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h b/tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h index 4030e97436..74c5fda235 100644 --- a/tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h +++ b/tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/framework/datasets/Datasets.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h b/tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h index d0b901a9a1..dcf96c7991 100644 --- a/tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h +++ b/tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/ConvolutionLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h b/tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h index 50b0f7d75d..3d43e6f7db 100644 --- a/tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h +++ b/tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/FullyConnectedLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h b/tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h index 33b7423442..6f68fd7722 100644 --- a/tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h +++ b/tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/framework/datasets/Datasets.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h b/tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h index ab2749b36e..739d24ca18 100644 --- a/tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h +++ b/tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/PoolingLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h index dc4ffe4e4e..76087fa3d5 100644 --- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h +++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/framework/datasets/Datasets.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h index a4002d124d..1415ff1daa 100644 --- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h +++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/ConvolutionLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h index 80a3473bc7..cde9ae6179 100644 --- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h +++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/FullyConnectedLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h index 806ca9378a..3b5c9acc8a 100644 --- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h +++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/GEMMDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h index d8fd061b66..eb6903faef 100644 --- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h +++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/framework/datasets/Datasets.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h index 6164bbacea..b775667ac8 100644 --- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h +++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/PoolingLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ActivationLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ActivationLayerDataset.h index 2d586390ec..395b1f9866 100644 --- a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ActivationLayerDataset.h +++ b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ActivationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/framework/datasets/Datasets.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h index d96410f9eb..3a22c7807f 100644 --- a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h +++ b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/BatchNormalizationLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ConvolutionLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ConvolutionLayerDataset.h index a050d3da74..3dd8a7c348 100644 --- a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ConvolutionLayerDataset.h +++ b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ConvolutionLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/ConvolutionLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4FullyConnectedLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4FullyConnectedLayerDataset.h index 8cf59e8207..5a0af2b6c5 100644 --- a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4FullyConnectedLayerDataset.h +++ b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4FullyConnectedLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/FullyConnectedLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4PoolingLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4PoolingLayerDataset.h index 3b1ee8dcb4..a58fd797ec 100644 --- a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4PoolingLayerDataset.h +++ b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4PoolingLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/PoolingLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/lenet5/LeNet5ActivationLayerDataset.h b/tests/datasets/system_tests/lenet5/LeNet5ActivationLayerDataset.h index 4c88cde58d..021bfee18b 100644 --- a/tests/datasets/system_tests/lenet5/LeNet5ActivationLayerDataset.h +++ b/tests/datasets/system_tests/lenet5/LeNet5ActivationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/framework/datasets/Datasets.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/lenet5/LeNet5ConvolutionLayerDataset.h b/tests/datasets/system_tests/lenet5/LeNet5ConvolutionLayerDataset.h index e1d3ead65b..3f28627b08 100644 --- a/tests/datasets/system_tests/lenet5/LeNet5ConvolutionLayerDataset.h +++ b/tests/datasets/system_tests/lenet5/LeNet5ConvolutionLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/ConvolutionLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/lenet5/LeNet5FullyConnectedLayerDataset.h b/tests/datasets/system_tests/lenet5/LeNet5FullyConnectedLayerDataset.h index 343ecc0190..74e8d2ce7b 100644 --- a/tests/datasets/system_tests/lenet5/LeNet5FullyConnectedLayerDataset.h +++ b/tests/datasets/system_tests/lenet5/LeNet5FullyConnectedLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/FullyConnectedLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/lenet5/LeNet5PoolingLayerDataset.h b/tests/datasets/system_tests/lenet5/LeNet5PoolingLayerDataset.h index bc2de7b235..bcd11dc5b9 100644 --- a/tests/datasets/system_tests/lenet5/LeNet5PoolingLayerDataset.h +++ b/tests/datasets/system_tests/lenet5/LeNet5PoolingLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/PoolingLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/squeezenet/SqueezeNetActivationLayerDataset.h b/tests/datasets/system_tests/squeezenet/SqueezeNetActivationLayerDataset.h index 7644387384..7f4bf4d549 100644 --- a/tests/datasets/system_tests/squeezenet/SqueezeNetActivationLayerDataset.h +++ b/tests/datasets/system_tests/squeezenet/SqueezeNetActivationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/framework/datasets/Datasets.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/squeezenet/SqueezeNetConvolutionLayerDataset.h b/tests/datasets/system_tests/squeezenet/SqueezeNetConvolutionLayerDataset.h index 2d447b0156..2bb9db7240 100644 --- a/tests/datasets/system_tests/squeezenet/SqueezeNetConvolutionLayerDataset.h +++ b/tests/datasets/system_tests/squeezenet/SqueezeNetConvolutionLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/ConvolutionLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/squeezenet/SqueezeNetPoolingLayerDataset.h b/tests/datasets/system_tests/squeezenet/SqueezeNetPoolingLayerDataset.h index 69d04db7e1..cb2edbc5ec 100644 --- a/tests/datasets/system_tests/squeezenet/SqueezeNetPoolingLayerDataset.h +++ b/tests/datasets/system_tests/squeezenet/SqueezeNetPoolingLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/PoolingLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h b/tests/datasets/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h index 66301ddf08..93de996b6c 100644 --- a/tests/datasets/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h +++ b/tests/datasets/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/framework/datasets/Datasets.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/vgg/vgg16/VGG16ConvolutionLayerDataset.h b/tests/datasets/system_tests/vgg/vgg16/VGG16ConvolutionLayerDataset.h index 36cb5d93aa..fe31da287c 100644 --- a/tests/datasets/system_tests/vgg/vgg16/VGG16ConvolutionLayerDataset.h +++ b/tests/datasets/system_tests/vgg/vgg16/VGG16ConvolutionLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/ConvolutionLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h b/tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h index d34dc3f87e..3b40b34653 100644 --- a/tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h +++ b/tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/FullyConnectedLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/vgg/vgg16/VGG16PoolingLayerDataset.h b/tests/datasets/system_tests/vgg/vgg16/VGG16PoolingLayerDataset.h index 4db20870f2..affbcc5022 100644 --- a/tests/datasets/system_tests/vgg/vgg16/VGG16PoolingLayerDataset.h +++ b/tests/datasets/system_tests/vgg/vgg16/VGG16PoolingLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/PoolingLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h b/tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h index 8a2cd1665e..f30069e55d 100644 --- a/tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h +++ b/tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/framework/datasets/Datasets.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h b/tests/datasets/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h index cc6a6dcccc..4d2cba8b4b 100644 --- a/tests/datasets/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h +++ b/tests/datasets/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/BatchNormalizationLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h b/tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h index 41f48b0958..b4cb3577e8 100644 --- a/tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h +++ b/tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/ConvolutionLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h b/tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h index 3763d63588..62222f3a88 100644 --- a/tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h +++ b/tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h @@ -26,7 +26,7 @@ #include "tests/datasets/PoolingLayerDataset.h" -#include "tests/TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation/Validation.h b/tests/validation/Validation.h index 7d4ce57250..38cbadaa9b 100644 --- a/tests/validation/Validation.h +++ b/tests/validation/Validation.h @@ -28,10 +28,10 @@ #include "arm_compute/core/Types.h" #include "tests/IAccessor.h" #include "tests/SimpleTensor.h" -#include "tests/TypePrinter.h" #include "tests/Utils.h" #include "tests/framework/Asserts.h" #include "tests/framework/Exceptions.h" +#include "utils/TypePrinter.h" #include <iomanip> #include <ios> diff --git a/tests/validation_old/AssetsLibrary.cpp b/tests/validation_old/AssetsLibrary.cpp index fa8569e458..997af27a9f 100644 --- a/tests/validation_old/AssetsLibrary.cpp +++ b/tests/validation_old/AssetsLibrary.cpp @@ -24,8 +24,8 @@ #include "tests/AssetsLibrary.h" #include "arm_compute/core/ITensor.h" -#include "tests/TypePrinter.h" #include "tests/Utils.h" +#include "utils/TypePrinter.h" #include <cctype> #include <fstream> diff --git a/tests/validation_old/CL/FillBorder.cpp b/tests/validation_old/CL/FillBorder.cpp index ed47a1eeb3..deb40a1a5a 100644 --- a/tests/validation_old/CL/FillBorder.cpp +++ b/tests/validation_old/CL/FillBorder.cpp @@ -22,12 +22,12 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/CL/kernels/CLFillBorderKernel.h" #include "arm_compute/core/Helpers.h" diff --git a/tests/validation_old/CL/FixedPoint/FixedPoint_QS8.cpp b/tests/validation_old/CL/FixedPoint/FixedPoint_QS8.cpp index 3721fb51d7..4f7764c49b 100644 --- a/tests/validation_old/CL/FixedPoint/FixedPoint_QS8.cpp +++ b/tests/validation_old/CL/FixedPoint/FixedPoint_QS8.cpp @@ -22,13 +22,13 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/CL/CLKernelLibrary.h" #include "arm_compute/core/CL/ICLKernel.h" diff --git a/tests/validation_old/CL/Gaussian3x3.cpp b/tests/validation_old/CL/Gaussian3x3.cpp index 27f4833289..6aa2d0349e 100644 --- a/tests/validation_old/CL/Gaussian3x3.cpp +++ b/tests/validation_old/CL/Gaussian3x3.cpp @@ -23,7 +23,6 @@ */ #include "CL/CLAccessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -31,6 +30,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/CL/Gaussian5x5.cpp b/tests/validation_old/CL/Gaussian5x5.cpp index c187426f4c..32a33d2661 100644 --- a/tests/validation_old/CL/Gaussian5x5.cpp +++ b/tests/validation_old/CL/Gaussian5x5.cpp @@ -23,7 +23,6 @@ */ #include "CL/CLAccessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -31,6 +30,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/CL/HarrisCorners.cpp b/tests/validation_old/CL/HarrisCorners.cpp index 2c73679058..ff39918a43 100644 --- a/tests/validation_old/CL/HarrisCorners.cpp +++ b/tests/validation_old/CL/HarrisCorners.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -30,6 +29,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/CL/IntegralImage.cpp b/tests/validation_old/CL/IntegralImage.cpp index ea15b90b2a..7db2b688d6 100644 --- a/tests/validation_old/CL/IntegralImage.cpp +++ b/tests/validation_old/CL/IntegralImage.cpp @@ -24,13 +24,13 @@ #include "CL/CLAccessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/CL/MinMaxLocation.cpp b/tests/validation_old/CL/MinMaxLocation.cpp index 8824215223..06e9388abc 100644 --- a/tests/validation_old/CL/MinMaxLocation.cpp +++ b/tests/validation_old/CL/MinMaxLocation.cpp @@ -23,13 +23,13 @@ */ #include "CL/CLAccessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/CL/PixelWiseMultiplication.cpp b/tests/validation_old/CL/PixelWiseMultiplication.cpp index f003298a23..5bc71820d0 100644 --- a/tests/validation_old/CL/PixelWiseMultiplication.cpp +++ b/tests/validation_old/CL/PixelWiseMultiplication.cpp @@ -22,12 +22,12 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "TypePrinter.h" #include "tests/Globals.h" #include "tests/Utils.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/runtime/CL/functions/CLPixelWiseMultiplication.h" diff --git a/tests/validation_old/CL/ROIPoolingLayer.cpp b/tests/validation_old/CL/ROIPoolingLayer.cpp index edd1cccf2a..ec804ccb84 100644 --- a/tests/validation_old/CL/ROIPoolingLayer.cpp +++ b/tests/validation_old/CL/ROIPoolingLayer.cpp @@ -23,7 +23,6 @@ */ #include "CL/CLAccessor.h" #include "CL/CLArrayAccessor.h" -#include "TypePrinter.h" #include "arm_compute/runtime/CL/CLArray.h" #include "arm_compute/runtime/CL/functions/CLROIPoolingLayer.h" #include "tests/Globals.h" @@ -32,6 +31,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include <random> #include <vector> diff --git a/tests/validation_old/CL/Sobel3x3.cpp b/tests/validation_old/CL/Sobel3x3.cpp index a4c779cd5c..cb4e318736 100644 --- a/tests/validation_old/CL/Sobel3x3.cpp +++ b/tests/validation_old/CL/Sobel3x3.cpp @@ -24,7 +24,6 @@ #include "CL/CLAccessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -32,6 +31,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/CL/Sobel5x5.cpp b/tests/validation_old/CL/Sobel5x5.cpp index 7e5dec1209..d035027218 100644 --- a/tests/validation_old/CL/Sobel5x5.cpp +++ b/tests/validation_old/CL/Sobel5x5.cpp @@ -24,7 +24,6 @@ #include "CL/CLAccessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -32,6 +31,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/CL/Threshold.cpp b/tests/validation_old/CL/Threshold.cpp index 74ddd6873e..185790782d 100644 --- a/tests/validation_old/CL/Threshold.cpp +++ b/tests/validation_old/CL/Threshold.cpp @@ -23,7 +23,6 @@ */ #include "CL/CLAccessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -31,6 +30,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/dataset/ThresholdDataset.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/CL/WarpPerspective.cpp b/tests/validation_old/CL/WarpPerspective.cpp index 6252361003..3d3da7a23e 100644 --- a/tests/validation_old/CL/WarpPerspective.cpp +++ b/tests/validation_old/CL/WarpPerspective.cpp @@ -23,7 +23,6 @@ */ #include "CL/CLAccessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -32,6 +31,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/AbsoluteDifference.cpp b/tests/validation_old/NEON/AbsoluteDifference.cpp index aa866fff49..cde0b46268 100644 --- a/tests/validation_old/NEON/AbsoluteDifference.cpp +++ b/tests/validation_old/NEON/AbsoluteDifference.cpp @@ -23,13 +23,13 @@ */ #include "NEON/Accessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/Accumulate.cpp b/tests/validation_old/NEON/Accumulate.cpp index eb680a383d..a173338542 100644 --- a/tests/validation_old/NEON/Accumulate.cpp +++ b/tests/validation_old/NEON/Accumulate.cpp @@ -23,13 +23,13 @@ */ #include "NEON/Accessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/AccumulateSquared.cpp b/tests/validation_old/NEON/AccumulateSquared.cpp index 29b5edf41b..f4eea7d764 100644 --- a/tests/validation_old/NEON/AccumulateSquared.cpp +++ b/tests/validation_old/NEON/AccumulateSquared.cpp @@ -23,13 +23,13 @@ */ #include "NEON/Accessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/AccumulateWeighted.cpp b/tests/validation_old/NEON/AccumulateWeighted.cpp index c59c1edbc8..758e437338 100644 --- a/tests/validation_old/NEON/AccumulateWeighted.cpp +++ b/tests/validation_old/NEON/AccumulateWeighted.cpp @@ -23,13 +23,13 @@ */ #include "NEON/Accessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/FillBorder.cpp b/tests/validation_old/NEON/FillBorder.cpp index 277bbf2c0a..cbf637e7f8 100644 --- a/tests/validation_old/NEON/FillBorder.cpp +++ b/tests/validation_old/NEON/FillBorder.cpp @@ -22,12 +22,12 @@ * SOFTWARE. */ #include "NEON/Accessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h" diff --git a/tests/validation_old/NEON/Fixedpoint/Exp_QS16.cpp b/tests/validation_old/NEON/Fixedpoint/Exp_QS16.cpp index 66115879aa..a0e785e112 100644 --- a/tests/validation_old/NEON/Fixedpoint/Exp_QS16.cpp +++ b/tests/validation_old/NEON/Fixedpoint/Exp_QS16.cpp @@ -22,13 +22,13 @@ * SOFTWARE. */ #include "NEON/Accessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/ReferenceCPP.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/NEFixedPoint.h" diff --git a/tests/validation_old/NEON/Fixedpoint/Exp_QS8.cpp b/tests/validation_old/NEON/Fixedpoint/Exp_QS8.cpp index 9e8096fa75..dbae11640a 100644 --- a/tests/validation_old/NEON/Fixedpoint/Exp_QS8.cpp +++ b/tests/validation_old/NEON/Fixedpoint/Exp_QS8.cpp @@ -22,13 +22,13 @@ * SOFTWARE. */ #include "NEON/Accessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/ReferenceCPP.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/NEFixedPoint.h" diff --git a/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS16.cpp b/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS16.cpp index f56707a93d..1d06e0799d 100644 --- a/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS16.cpp +++ b/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS16.cpp @@ -22,13 +22,13 @@ * SOFTWARE. */ #include "NEON/Accessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/ReferenceCPP.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/NEFixedPoint.h" diff --git a/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS8.cpp b/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS8.cpp index fb33fd4632..ea21b8f4d6 100644 --- a/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS8.cpp +++ b/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS8.cpp @@ -22,13 +22,13 @@ * SOFTWARE. */ #include "NEON/Accessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/ReferenceCPP.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/NEFixedPoint.h" diff --git a/tests/validation_old/NEON/Fixedpoint/Log_QS16.cpp b/tests/validation_old/NEON/Fixedpoint/Log_QS16.cpp index 6485b2031c..d85112abcc 100644 --- a/tests/validation_old/NEON/Fixedpoint/Log_QS16.cpp +++ b/tests/validation_old/NEON/Fixedpoint/Log_QS16.cpp @@ -22,13 +22,13 @@ * SOFTWARE. */ #include "NEON/Accessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/ReferenceCPP.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/NEFixedPoint.h" diff --git a/tests/validation_old/NEON/Fixedpoint/Log_QS8.cpp b/tests/validation_old/NEON/Fixedpoint/Log_QS8.cpp index 21012c52b0..41b285650a 100644 --- a/tests/validation_old/NEON/Fixedpoint/Log_QS8.cpp +++ b/tests/validation_old/NEON/Fixedpoint/Log_QS8.cpp @@ -22,13 +22,13 @@ * SOFTWARE. */ #include "NEON/Accessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/ReferenceCPP.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/NEFixedPoint.h" diff --git a/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS16.cpp b/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS16.cpp index 5630a3391a..9605595d80 100644 --- a/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS16.cpp +++ b/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS16.cpp @@ -22,13 +22,13 @@ * SOFTWARE. */ #include "NEON/Accessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/ReferenceCPP.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/NEFixedPoint.h" diff --git a/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS8.cpp b/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS8.cpp index 23f98acc40..7a1c5b72a7 100644 --- a/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS8.cpp +++ b/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS8.cpp @@ -22,13 +22,13 @@ * SOFTWARE. */ #include "NEON/Accessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/ReferenceCPP.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/NEFixedPoint.h" diff --git a/tests/validation_old/NEON/Gaussian3x3.cpp b/tests/validation_old/NEON/Gaussian3x3.cpp index becd9196ea..b1fdc5e069 100644 --- a/tests/validation_old/NEON/Gaussian3x3.cpp +++ b/tests/validation_old/NEON/Gaussian3x3.cpp @@ -23,7 +23,6 @@ */ #include "NEON/Accessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -31,6 +30,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/Gaussian5x5.cpp b/tests/validation_old/NEON/Gaussian5x5.cpp index 240285afb6..c98d21b35c 100644 --- a/tests/validation_old/NEON/Gaussian5x5.cpp +++ b/tests/validation_old/NEON/Gaussian5x5.cpp @@ -23,7 +23,6 @@ */ #include "NEON/Accessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -31,6 +30,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/HarrisCorners.cpp b/tests/validation_old/NEON/HarrisCorners.cpp index 809e61c053..172be87dc2 100644 --- a/tests/validation_old/NEON/HarrisCorners.cpp +++ b/tests/validation_old/NEON/HarrisCorners.cpp @@ -23,7 +23,6 @@ */ #include "NEON/Accessor.h" #include "NEON/Helper.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -31,6 +30,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/IntegralImage.cpp b/tests/validation_old/NEON/IntegralImage.cpp index 69654b2585..f42393a745 100644 --- a/tests/validation_old/NEON/IntegralImage.cpp +++ b/tests/validation_old/NEON/IntegralImage.cpp @@ -24,13 +24,13 @@ #include "NEON/Accessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/MinMaxLocation.cpp b/tests/validation_old/NEON/MinMaxLocation.cpp index c41745a636..1b258d19d6 100644 --- a/tests/validation_old/NEON/MinMaxLocation.cpp +++ b/tests/validation_old/NEON/MinMaxLocation.cpp @@ -25,13 +25,13 @@ #include "NEON/Accessor.h" #include "NEON/Helper.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/PixelWiseMultiplication.cpp b/tests/validation_old/NEON/PixelWiseMultiplication.cpp index 60eb82ef84..f352fc4390 100644 --- a/tests/validation_old/NEON/PixelWiseMultiplication.cpp +++ b/tests/validation_old/NEON/PixelWiseMultiplication.cpp @@ -23,13 +23,13 @@ */ #include "NEON/Accessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" #include "tests/validation_old/Datasets.h" #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/ROIPoolingLayer.cpp b/tests/validation_old/NEON/ROIPoolingLayer.cpp index 2046beb196..a8d5637412 100644 --- a/tests/validation_old/NEON/ROIPoolingLayer.cpp +++ b/tests/validation_old/NEON/ROIPoolingLayer.cpp @@ -23,7 +23,6 @@ */ #include "NEON/Accessor.h" #include "NEON/ArrayAccessor.h" -#include "TypePrinter.h" #include "arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h" #include "tests/Globals.h" #include "tests/Utils.h" @@ -31,6 +30,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include <random> #include <vector> diff --git a/tests/validation_old/NEON/Sobel3x3.cpp b/tests/validation_old/NEON/Sobel3x3.cpp index cb249e1a58..302364048a 100644 --- a/tests/validation_old/NEON/Sobel3x3.cpp +++ b/tests/validation_old/NEON/Sobel3x3.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "NEON/Accessor.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -30,6 +29,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/Sobel5x5.cpp b/tests/validation_old/NEON/Sobel5x5.cpp index 2f26e62e83..e9835b6095 100644 --- a/tests/validation_old/NEON/Sobel5x5.cpp +++ b/tests/validation_old/NEON/Sobel5x5.cpp @@ -24,7 +24,6 @@ #include "NEON/Accessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -32,6 +31,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/Threshold.cpp b/tests/validation_old/NEON/Threshold.cpp index d56ec5eb42..6f42f19d84 100644 --- a/tests/validation_old/NEON/Threshold.cpp +++ b/tests/validation_old/NEON/Threshold.cpp @@ -23,7 +23,6 @@ */ #include "NEON/Accessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -31,6 +30,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/dataset/ThresholdDataset.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/NEON/WarpPerspective.cpp b/tests/validation_old/NEON/WarpPerspective.cpp index 5a15591261..97bda1eed8 100644 --- a/tests/validation_old/NEON/WarpPerspective.cpp +++ b/tests/validation_old/NEON/WarpPerspective.cpp @@ -23,7 +23,6 @@ */ #include "NEON/Accessor.h" #include "PaddingCalculator.h" -#include "TypePrinter.h" #include "Utils.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -32,6 +31,7 @@ #include "tests/validation_old/Reference.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/ProgramOptions.cpp b/tests/validation_old/ProgramOptions.cpp index 08375b344c..96320e80f9 100644 --- a/tests/validation_old/ProgramOptions.cpp +++ b/tests/validation_old/ProgramOptions.cpp @@ -24,8 +24,8 @@ #include "ProgramOptions.h" #include "arm_compute/core/Types.h" -#include "tests/TypePrinter.h" #include "tests/TypeReader.h" +#include "utils/TypePrinter.h" #include <random> #include <sstream> diff --git a/tests/validation_old/ReferenceCPP.cpp b/tests/validation_old/ReferenceCPP.cpp index eae892af26..cca8997485 100644 --- a/tests/validation_old/ReferenceCPP.cpp +++ b/tests/validation_old/ReferenceCPP.cpp @@ -26,13 +26,13 @@ #include "TensorFactory.h" #include "TensorOperations.h" #include "TensorVisitors.h" -#include "TypePrinter.h" #include "arm_compute/core/Coordinates.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/runtime/Tensor.h" +#include "utils/TypePrinter.h" #include "tests/validation_old/boost_wrapper.h" diff --git a/tests/validation_old/UNIT/FixedPoint.cpp b/tests/validation_old/UNIT/FixedPoint.cpp index 53fef97769..6a92cfb963 100644 --- a/tests/validation_old/UNIT/FixedPoint.cpp +++ b/tests/validation_old/UNIT/FixedPoint.cpp @@ -23,11 +23,11 @@ */ #include "tests/validation_old/FixedPoint.h" -#include "TypePrinter.h" #include "Utils.h" #include "support/ToolchainSupport.h" #include "tests/validation_old/Validation.h" #include "tests/validation_old/ValidationUserConfiguration.h" +#include "utils/TypePrinter.h" #include "tests/validation_old/boost_wrapper.h" diff --git a/tests/validation_old/UNIT/TensorInfo.cpp b/tests/validation_old/UNIT/TensorInfo.cpp index 488378ac1d..ec1db42e97 100644 --- a/tests/validation_old/UNIT/TensorInfo.cpp +++ b/tests/validation_old/UNIT/TensorInfo.cpp @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "TypePrinter.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/UNIT/TensorShape.cpp b/tests/validation_old/UNIT/TensorShape.cpp index dc75b93de4..3505b1ae05 100644 --- a/tests/validation_old/UNIT/TensorShape.cpp +++ b/tests/validation_old/UNIT/TensorShape.cpp @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "TypePrinter.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" diff --git a/tests/validation_old/UNIT/Utils.cpp b/tests/validation_old/UNIT/Utils.cpp index b302bf27c1..a32fe189ee 100644 --- a/tests/validation_old/UNIT/Utils.cpp +++ b/tests/validation_old/UNIT/Utils.cpp @@ -23,8 +23,8 @@ */ #include "Utils.h" -#include "TypePrinter.h" #include "tests/validation_old/Validation.h" +#include "utils/TypePrinter.h" #include "tests/validation_old/boost_wrapper.h" diff --git a/tests/validation_old/Validation.cpp b/tests/validation_old/Validation.cpp index 8f173ba962..da5e874b24 100644 --- a/tests/validation_old/Validation.cpp +++ b/tests/validation_old/Validation.cpp @@ -31,9 +31,9 @@ #include "arm_compute/runtime/Tensor.h" #include "tests/IAccessor.h" #include "tests/RawTensor.h" -#include "tests/TypePrinter.h" #include "tests/Utils.h" #include "tests/validation_old/half.h" +#include "utils/TypePrinter.h" #include <array> #include <cmath> diff --git a/tests/validation_old/dataset/ActivationLayerDataset.h b/tests/validation_old/dataset/ActivationLayerDataset.h index ead52a2961..881e19ff79 100644 --- a/tests/validation_old/dataset/ActivationLayerDataset.h +++ b/tests/validation_old/dataset/ActivationLayerDataset.h @@ -24,7 +24,7 @@ #ifndef __ARM_COMPUTE_TEST_DATASET_ACTIVATION_LAYER_DATASET_H__ #define __ARM_COMPUTE_TEST_DATASET_ACTIVATION_LAYER_DATASET_H__ -#include "TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/dataset/BatchNormalizationLayerDataset.h b/tests/validation_old/dataset/BatchNormalizationLayerDataset.h index ca1e3b694c..3ad1befe33 100644 --- a/tests/validation_old/dataset/BatchNormalizationLayerDataset.h +++ b/tests/validation_old/dataset/BatchNormalizationLayerDataset.h @@ -24,7 +24,7 @@ #ifndef __ARM_COMPUTE_TEST_DATASET_BATCH_NORMALIZATION_LAYER_DATASET_H__ #define __ARM_COMPUTE_TEST_DATASET_BATCH_NORMALIZATION_LAYER_DATASET_H__ -#include "TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/dataset/ConvolutionLayerDataset.h b/tests/validation_old/dataset/ConvolutionLayerDataset.h index 4fcba8d86d..e612c3ec93 100644 --- a/tests/validation_old/dataset/ConvolutionLayerDataset.h +++ b/tests/validation_old/dataset/ConvolutionLayerDataset.h @@ -24,7 +24,7 @@ #ifndef __ARM_COMPUTE_TEST_DATASET_CONVOLUTION_LAYER_DATASET_H__ #define __ARM_COMPUTE_TEST_DATASET_CONVOLUTION_LAYER_DATASET_H__ -#include "TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "tests/validation_old/dataset/GenericDataset.h" diff --git a/tests/validation_old/dataset/FullyConnectedLayerDataset.h b/tests/validation_old/dataset/FullyConnectedLayerDataset.h index 3564560788..8a8fed8f0f 100644 --- a/tests/validation_old/dataset/FullyConnectedLayerDataset.h +++ b/tests/validation_old/dataset/FullyConnectedLayerDataset.h @@ -24,7 +24,7 @@ #ifndef __ARM_COMPUTE_TEST_DATASET_FULLY_CONNECTED_LAYER_DATASET_H__ #define __ARM_COMPUTE_TEST_DATASET_FULLY_CONNECTED_LAYER_DATASET_H__ -#include "TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "tests/validation_old/dataset/GenericDataset.h" diff --git a/tests/validation_old/dataset/GEMMDataset.h b/tests/validation_old/dataset/GEMMDataset.h index 5250827340..ee2a387452 100644 --- a/tests/validation_old/dataset/GEMMDataset.h +++ b/tests/validation_old/dataset/GEMMDataset.h @@ -24,7 +24,7 @@ #ifndef __ARM_COMPUTE_TEST_DATASET_GEMM_DATASET_H__ #define __ARM_COMPUTE_TEST_DATASET_GEMM_DATASET_H__ -#include "TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/dataset/NormalizationLayerDataset.h b/tests/validation_old/dataset/NormalizationLayerDataset.h index cd3c14d948..489d1e0af2 100644 --- a/tests/validation_old/dataset/NormalizationLayerDataset.h +++ b/tests/validation_old/dataset/NormalizationLayerDataset.h @@ -24,7 +24,7 @@ #ifndef __ARM_COMPUTE_TEST_DATASET_NORMALIZATION_LAYER_DATASET_H__ #define __ARM_COMPUTE_TEST_DATASET_NORMALIZATION_LAYER_DATASET_H__ -#include "TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/dataset/PoolingLayerDataset.h b/tests/validation_old/dataset/PoolingLayerDataset.h index 6895ae4fae..a4e570c35e 100644 --- a/tests/validation_old/dataset/PoolingLayerDataset.h +++ b/tests/validation_old/dataset/PoolingLayerDataset.h @@ -24,7 +24,7 @@ #ifndef __ARM_COMPUTE_TEST_DATASET_POOLING_LAYER_DATASET_H__ #define __ARM_COMPUTE_TEST_DATASET_POOLING_LAYER_DATASET_H__ -#include "TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" diff --git a/tests/validation_old/dataset/ThresholdDataset.h b/tests/validation_old/dataset/ThresholdDataset.h index 74d0b9cfbe..789ffac14a 100644 --- a/tests/validation_old/dataset/ThresholdDataset.h +++ b/tests/validation_old/dataset/ThresholdDataset.h @@ -24,7 +24,7 @@ #ifndef __ARM_COMPUTE_TEST_DATASET_THRESHOLD_DATASET_H__ #define __ARM_COMPUTE_TEST_DATASET_THRESHOLD_DATASET_H__ -#include "TypePrinter.h" +#include "utils/TypePrinter.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" |