From f4af76e796a57e453f3717cfdf40c8bcf132b62e Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Wed, 6 Sep 2017 07:42:43 +0100 Subject: COMPMID-417: Fix clang tidy after renaming Change-Id: I3e327bcbb4719c493c45397243354289c3223945 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/86677 Reviewed-by: Anthony Barbier Tested-by: Kaizen --- scripts/check_clang-tidy.py | 5 +---- scripts/clang-tidy.sh | 8 ++++---- src/runtime/CL/ICLSimpleFunction.cpp | 5 +++-- src/runtime/CL/functions/CLCannyEdge.cpp | 17 +++++++++++++++-- src/runtime/CL/functions/CLDepthConcatenate.cpp | 9 ++++++--- src/runtime/CL/functions/CLGaussianPyramid.cpp | 11 +++++++---- src/runtime/CL/functions/CLHOGMultiDetection.cpp | 20 ++++++++++++++++---- src/runtime/CL/functions/CLLaplacianPyramid.cpp | 10 ++++++++-- src/runtime/CL/functions/CLLaplacianReconstruct.cpp | 7 +++++-- src/runtime/CL/functions/CLOpticalFlow.cpp | 19 ++++++++++++++++--- src/runtime/NEON/INESimpleFunction.cpp | 5 +++-- src/runtime/NEON/functions/NECannyEdge.cpp | 15 +++++++++++++-- src/runtime/NEON/functions/NEDepthConcatenate.cpp | 9 ++++++--- src/runtime/NEON/functions/NEGaussianPyramid.cpp | 12 ++++++++---- src/runtime/NEON/functions/NEHOGGradient.cpp | 7 +++++-- src/runtime/NEON/functions/NEHOGMultiDetection.cpp | 18 +++++++++++++++--- src/runtime/NEON/functions/NEHarrisCorners.cpp | 16 ++++++++++++++-- src/runtime/NEON/functions/NELaplacianPyramid.cpp | 10 ++++++++-- .../NEON/functions/NELaplacianReconstruct.cpp | 7 +++++-- src/runtime/NEON/functions/NEOpticalFlow.cpp | 12 ++++++++++-- src/runtime/NEON/functions/NEScale.cpp | 6 ++++-- src/runtime/OMP/OMPScheduler.cpp | 2 +- tests/validation_old/AssetsLibrary.cpp | 5 ++--- tests/validation_old/FixedPoint.h | 2 +- tests/validation_old/ProgramOptions.cpp | 5 ++--- tests/validation_old/Reference.h | 4 ++-- 26 files changed, 180 insertions(+), 66 deletions(-) diff --git a/scripts/check_clang-tidy.py b/scripts/check_clang-tidy.py index 30bfca133d..e95204610b 100755 --- a/scripts/check_clang-tidy.py +++ b/scripts/check_clang-tidy.py @@ -20,6 +20,7 @@ if __name__ == "__main__": if (("Utils.cpp" in line and "'arm_compute_version.embed' file not found" in line) or ("cl2.hpp" in line and "cast from pointer to smaller type 'cl_context_properties' (aka 'int') loses information" in line) or ("arm_fp16.h" in line) or + ("omp.h" in line) or ("memory" in line and "cast from pointer to smaller type 'uintptr_t' (aka 'unsigned int') loses information" in line) or ("NEMath.inl" in line and "statement expression not allowed at file scope" in line) or "3rdparty" in line): @@ -67,10 +68,6 @@ if __name__ == "__main__": "syscall" in lines[i + 1])): continue - if "use '= default' to define a trivial default constructor" in line: - if i + 1 < len(lines) and "BENCHMARK" in lines[i + 1]: - continue - failed = True print(line) diff --git a/scripts/clang-tidy.sh b/scripts/clang-tidy.sh index 6ba3bcad64..b9ae0cfe60 100755 --- a/scripts/clang-tidy.sh +++ b/scripts/clang-tidy.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DIRECTORIES="./arm_compute ./src ./examples ./tests ./utils ./framework ./support" +DIRECTORIES="./arm_compute ./src ./examples ./tests ./utils ./support" if [ $# -eq 0 ] then @@ -45,13 +45,13 @@ fi ARMV7_GCC_PATH=$(dirname $ARMV7_GCC)/.. AARCH64_GCC_PATH=$(dirname $AARCH64_GCC)/.. -INCLUDE_PATHS="-Iinclude -I. -I3rdparty/include -Ikernels -Itests -Icomputer_vision -Iframework" +INCLUDE_PATHS="-Iinclude -I. -I3rdparty/include -Ikernels -Icomputer_vision" function armv7 { USE_BOOST="" - if [[ "$1" == *tests/validation* ]] + if [[ "$1" == *tests/validation_old* ]] then USE_BOOST="-DBOOST" fi @@ -71,7 +71,7 @@ function aarch64 { USE_BOOST="" - if [[ "$1" == *tests/validation* ]] + if [[ "$1" == *tests/validation_old* ]] then USE_BOOST="-DBOOST" fi diff --git a/src/runtime/CL/ICLSimpleFunction.cpp b/src/runtime/CL/ICLSimpleFunction.cpp index aa45743d37..a1a56fd06c 100644 --- a/src/runtime/CL/ICLSimpleFunction.cpp +++ b/src/runtime/CL/ICLSimpleFunction.cpp @@ -28,8 +28,9 @@ using namespace arm_compute; -ICLSimpleFunction::ICLSimpleFunction() - : _kernel(), _border_handler() +ICLSimpleFunction::ICLSimpleFunction() // NOLINT + : _kernel(), + _border_handler() { } diff --git a/src/runtime/CL/functions/CLCannyEdge.cpp b/src/runtime/CL/functions/CLCannyEdge.cpp index 6c321ad69a..448ca9289d 100644 --- a/src/runtime/CL/functions/CLCannyEdge.cpp +++ b/src/runtime/CL/functions/CLCannyEdge.cpp @@ -35,8 +35,21 @@ using namespace arm_compute; -CLCannyEdge::CLCannyEdge() - : _sobel(nullptr), _gradient(), _border_mag_gradient(), _non_max_suppr(), _edge_trace(), _gx(), _gy(), _mag(), _phase(), _nonmax(), _visited(), _recorded(), _l1_list_counter(), _l1_stack() +CLCannyEdge::CLCannyEdge() // NOLINT + : _sobel(), + _gradient(), + _border_mag_gradient(), + _non_max_suppr(), + _edge_trace(), + _gx(), + _gy(), + _mag(), + _phase(), + _nonmax(), + _visited(), + _recorded(), + _l1_list_counter(), + _l1_stack() { } diff --git a/src/runtime/CL/functions/CLDepthConcatenate.cpp b/src/runtime/CL/functions/CLDepthConcatenate.cpp index d82f96c431..f42627f34c 100644 --- a/src/runtime/CL/functions/CLDepthConcatenate.cpp +++ b/src/runtime/CL/functions/CLDepthConcatenate.cpp @@ -32,12 +32,15 @@ using namespace arm_compute; -CLDepthConcatenate::CLDepthConcatenate() - : _inputs_vector(), _concat_kernels_vector(), _border_handlers_vector(), _num_inputs(0) +CLDepthConcatenate::CLDepthConcatenate() // NOLINT + : _inputs_vector(), + _concat_kernels_vector(), + _border_handlers_vector(), + _num_inputs(0) { } -void CLDepthConcatenate::configure(std::vector inputs_vector, ICLTensor *output) +void CLDepthConcatenate::configure(std::vector inputs_vector, ICLTensor *output) // NOLINT { ARM_COMPUTE_ERROR_ON(inputs_vector.size() < 2); diff --git a/src/runtime/CL/functions/CLGaussianPyramid.cpp b/src/runtime/CL/functions/CLGaussianPyramid.cpp index 8450d5ee69..8436dce87b 100644 --- a/src/runtime/CL/functions/CLGaussianPyramid.cpp +++ b/src/runtime/CL/functions/CLGaussianPyramid.cpp @@ -48,8 +48,10 @@ CLGaussianPyramid::CLGaussianPyramid() { } -CLGaussianPyramidHalf::CLGaussianPyramidHalf() - : _border_handler(), _horizontal_reduction(), _vertical_reduction() +CLGaussianPyramidHalf::CLGaussianPyramidHalf() // NOLINT + : _border_handler(), + _horizontal_reduction(), + _vertical_reduction() { } @@ -119,8 +121,9 @@ void CLGaussianPyramidHalf::run() } } -CLGaussianPyramidOrb::CLGaussianPyramidOrb() - : _gauss5x5(), _scale_nearest() +CLGaussianPyramidOrb::CLGaussianPyramidOrb() // NOLINT + : _gauss5x5(), + _scale_nearest() { } diff --git a/src/runtime/CL/functions/CLHOGMultiDetection.cpp b/src/runtime/CL/functions/CLHOGMultiDetection.cpp index 6e864464a4..6def2dedc9 100644 --- a/src/runtime/CL/functions/CLHOGMultiDetection.cpp +++ b/src/runtime/CL/functions/CLHOGMultiDetection.cpp @@ -33,9 +33,21 @@ using namespace arm_compute; -CLHOGMultiDetection::CLHOGMultiDetection() - : _gradient_kernel(), _orient_bin_kernel(), _block_norm_kernel(), _hog_detect_kernel(), _non_maxima_kernel(), _hog_space(), _hog_norm_space(), _detection_windows(), _mag(), _phase(), - _non_maxima_suppression(false), _num_orient_bin_kernel(0), _num_block_norm_kernel(0), _num_hog_detect_kernel(0) +CLHOGMultiDetection::CLHOGMultiDetection() // NOLINT + : _gradient_kernel(), + _orient_bin_kernel(), + _block_norm_kernel(), + _hog_detect_kernel(), + _non_maxima_kernel(), + _hog_space(), + _hog_norm_space(), + _detection_windows(), + _mag(), + _phase(), + _non_maxima_suppression(false), + _num_orient_bin_kernel(0), + _num_block_norm_kernel(0), + _num_hog_detect_kernel(0) { } @@ -237,4 +249,4 @@ void CLHOGMultiDetection::run() _non_maxima_kernel->run(_non_maxima_kernel->window()); _detection_windows->unmap(CLScheduler::get().queue()); } -} \ No newline at end of file +} diff --git a/src/runtime/CL/functions/CLLaplacianPyramid.cpp b/src/runtime/CL/functions/CLLaplacianPyramid.cpp index 3fc93426ee..a395487103 100644 --- a/src/runtime/CL/functions/CLLaplacianPyramid.cpp +++ b/src/runtime/CL/functions/CLLaplacianPyramid.cpp @@ -36,8 +36,14 @@ using namespace arm_compute; -CLLaplacianPyramid::CLLaplacianPyramid() - : _num_levels(0), _gaussian_pyr_function(), _convf(), _subf(), _depth_function(), _gauss_pyr(), _conv_pyr() +CLLaplacianPyramid::CLLaplacianPyramid() // NOLINT + : _num_levels(0), + _gaussian_pyr_function(), + _convf(), + _subf(), + _depth_function(), + _gauss_pyr(), + _conv_pyr() { } diff --git a/src/runtime/CL/functions/CLLaplacianReconstruct.cpp b/src/runtime/CL/functions/CLLaplacianReconstruct.cpp index 7fd2273230..678848b82e 100644 --- a/src/runtime/CL/functions/CLLaplacianReconstruct.cpp +++ b/src/runtime/CL/functions/CLLaplacianReconstruct.cpp @@ -34,8 +34,11 @@ using namespace arm_compute; -CLLaplacianReconstruct::CLLaplacianReconstruct() - : _tmp_pyr(), _addf(), _scalef(), _depthf() +CLLaplacianReconstruct::CLLaplacianReconstruct() // NOLINT + : _tmp_pyr(), + _addf(), + _scalef(), + _depthf() { } diff --git a/src/runtime/CL/functions/CLOpticalFlow.cpp b/src/runtime/CL/functions/CLOpticalFlow.cpp index 542f5961fa..07ca2f91b4 100644 --- a/src/runtime/CL/functions/CLOpticalFlow.cpp +++ b/src/runtime/CL/functions/CLOpticalFlow.cpp @@ -37,9 +37,22 @@ using namespace arm_compute; -CLOpticalFlow::CLOpticalFlow() - : _tracker_init_kernel(), _tracker_stage0_kernel(), _tracker_stage1_kernel(), _tracker_finalize_kernel(), _func_scharr(), _scharr_gx(), _scharr_gy(), _old_points(nullptr), - _new_points_estimates(nullptr), _new_points(nullptr), _old_points_internal(), _new_points_internal(), _coefficient_table(), _old_values(), _num_levels(0) +CLOpticalFlow::CLOpticalFlow() // NOLINT + : _tracker_init_kernel(), + _tracker_stage0_kernel(), + _tracker_stage1_kernel(), + _tracker_finalize_kernel(), + _func_scharr(), + _scharr_gx(), + _scharr_gy(), + _old_points(nullptr), + _new_points_estimates(nullptr), + _new_points(nullptr), + _old_points_internal(), + _new_points_internal(), + _coefficient_table(), + _old_values(), + _num_levels(0) { } diff --git a/src/runtime/NEON/INESimpleFunction.cpp b/src/runtime/NEON/INESimpleFunction.cpp index 6f0da85fc8..a748a1e4ad 100644 --- a/src/runtime/NEON/INESimpleFunction.cpp +++ b/src/runtime/NEON/INESimpleFunction.cpp @@ -27,8 +27,9 @@ using namespace arm_compute; -INESimpleFunction::INESimpleFunction() - : _kernel(), _border_handler() +INESimpleFunction::INESimpleFunction() // NOLINT + : _kernel(), + _border_handler() { } diff --git a/src/runtime/NEON/functions/NECannyEdge.cpp b/src/runtime/NEON/functions/NECannyEdge.cpp index 029d30c5d6..ca8877e2fc 100644 --- a/src/runtime/NEON/functions/NECannyEdge.cpp +++ b/src/runtime/NEON/functions/NECannyEdge.cpp @@ -41,8 +41,19 @@ using namespace arm_compute; -NECannyEdge::NECannyEdge() - : _sobel(), _gradient(), _non_max_suppr(), _edge_trace(), _border_mag_gradient(), _border_edge_trace(), _gx(), _gy(), _magnitude(), _phase(), _nonmax(), _output(nullptr) +NECannyEdge::NECannyEdge() // NOLINT + : _sobel(), + _gradient(), + _non_max_suppr(), + _edge_trace(), + _border_mag_gradient(), + _border_edge_trace(), + _gx(), + _gy(), + _magnitude(), + _phase(), + _nonmax(), + _output(nullptr) { } diff --git a/src/runtime/NEON/functions/NEDepthConcatenate.cpp b/src/runtime/NEON/functions/NEDepthConcatenate.cpp index c1025d203e..ddf7e90faa 100644 --- a/src/runtime/NEON/functions/NEDepthConcatenate.cpp +++ b/src/runtime/NEON/functions/NEDepthConcatenate.cpp @@ -32,12 +32,15 @@ using namespace arm_compute; -NEDepthConcatenate::NEDepthConcatenate() - : _inputs_vector(), _concat_kernels_vector(), _border_handlers_vector(), _num_inputs(0) +NEDepthConcatenate::NEDepthConcatenate() // NOLINT + : _inputs_vector(), + _concat_kernels_vector(), + _border_handlers_vector(), + _num_inputs(0) { } -void NEDepthConcatenate::configure(std::vector inputs_vector, ITensor *output) +void NEDepthConcatenate::configure(std::vector inputs_vector, ITensor *output) // NOLINT { ARM_COMPUTE_ERROR_ON(inputs_vector.size() < 2); diff --git a/src/runtime/NEON/functions/NEGaussianPyramid.cpp b/src/runtime/NEON/functions/NEGaussianPyramid.cpp index 75c439511e..e857aabd3b 100644 --- a/src/runtime/NEON/functions/NEGaussianPyramid.cpp +++ b/src/runtime/NEON/functions/NEGaussianPyramid.cpp @@ -46,8 +46,10 @@ NEGaussianPyramid::NEGaussianPyramid() { } -NEGaussianPyramidHalf::NEGaussianPyramidHalf() - : _border_handler(), _horizontal_reduction(), _vertical_reduction() +NEGaussianPyramidHalf::NEGaussianPyramidHalf() // NOLINT + : _border_handler(), + _horizontal_reduction(), + _vertical_reduction() { } @@ -113,8 +115,10 @@ void NEGaussianPyramidHalf::run() } } -NEGaussianPyramidOrb::NEGaussianPyramidOrb() - : _offsets(), _gaus5x5(), _scale_nearest() +NEGaussianPyramidOrb::NEGaussianPyramidOrb() // NOLINT + : _offsets(), + _gaus5x5(), + _scale_nearest() { } diff --git a/src/runtime/NEON/functions/NEHOGGradient.cpp b/src/runtime/NEON/functions/NEHOGGradient.cpp index 563d4c2640..3e2640d631 100644 --- a/src/runtime/NEON/functions/NEHOGGradient.cpp +++ b/src/runtime/NEON/functions/NEHOGGradient.cpp @@ -30,8 +30,11 @@ using namespace arm_compute; -NEHOGGradient::NEHOGGradient() - : _derivative(), _mag_phase(nullptr), _gx(), _gy() +NEHOGGradient::NEHOGGradient() // NOLINT + : _derivative(), + _mag_phase(nullptr), + _gx(), + _gy() { } diff --git a/src/runtime/NEON/functions/NEHOGMultiDetection.cpp b/src/runtime/NEON/functions/NEHOGMultiDetection.cpp index 635b793d0c..8b3d01423c 100644 --- a/src/runtime/NEON/functions/NEHOGMultiDetection.cpp +++ b/src/runtime/NEON/functions/NEHOGMultiDetection.cpp @@ -32,9 +32,21 @@ using namespace arm_compute; -NEHOGMultiDetection::NEHOGMultiDetection() - : _gradient_kernel(), _orient_bin_kernel(), _block_norm_kernel(), _hog_detect_kernel(), _non_maxima_kernel(), _hog_space(), _hog_norm_space(), _detection_windows(), _mag(), _phase(), - _non_maxima_suppression(false), _num_orient_bin_kernel(0), _num_block_norm_kernel(0), _num_hog_detect_kernel(0) +NEHOGMultiDetection::NEHOGMultiDetection() // NOLINT + : _gradient_kernel(), + _orient_bin_kernel(), + _block_norm_kernel(), + _hog_detect_kernel(), + _non_maxima_kernel(), + _hog_space(), + _hog_norm_space(), + _detection_windows(), + _mag(), + _phase(), + _non_maxima_suppression(false), + _num_orient_bin_kernel(0), + _num_block_norm_kernel(0), + _num_hog_detect_kernel(0) { } diff --git a/src/runtime/NEON/functions/NEHarrisCorners.cpp b/src/runtime/NEON/functions/NEHarrisCorners.cpp index 53b1968db2..24b2bcb5b3 100644 --- a/src/runtime/NEON/functions/NEHarrisCorners.cpp +++ b/src/runtime/NEON/functions/NEHarrisCorners.cpp @@ -41,8 +41,20 @@ using namespace arm_compute; -NEHarrisCorners::NEHarrisCorners() - : _sobel(), _harris_score(), _non_max_suppr(), _candidates(), _sort_euclidean(), _border_gx(), _border_gy(), _gx(), _gy(), _score(), _nonmax(), _corners_list(), _num_corner_candidates(0) +NEHarrisCorners::NEHarrisCorners() // NOLINT + : _sobel(), + _harris_score(), + _non_max_suppr(), + _candidates(), + _sort_euclidean(), + _border_gx(), + _border_gy(), + _gx(), + _gy(), + _score(), + _nonmax(), + _corners_list(), + _num_corner_candidates(0) { } diff --git a/src/runtime/NEON/functions/NELaplacianPyramid.cpp b/src/runtime/NEON/functions/NELaplacianPyramid.cpp index ec93759869..a680f1f11d 100644 --- a/src/runtime/NEON/functions/NELaplacianPyramid.cpp +++ b/src/runtime/NEON/functions/NELaplacianPyramid.cpp @@ -36,8 +36,14 @@ using namespace arm_compute; -NELaplacianPyramid::NELaplacianPyramid() - : _num_levels(0), _gaussian_pyr_function(), _convf(), _subf(), _gauss_pyr(), _conv_pyr(), _depth_function() +NELaplacianPyramid::NELaplacianPyramid() // NOLINT + : _num_levels(0), + _gaussian_pyr_function(), + _convf(), + _subf(), + _gauss_pyr(), + _conv_pyr(), + _depth_function() { } diff --git a/src/runtime/NEON/functions/NELaplacianReconstruct.cpp b/src/runtime/NEON/functions/NELaplacianReconstruct.cpp index 8366e2bfec..0893701cd5 100644 --- a/src/runtime/NEON/functions/NELaplacianReconstruct.cpp +++ b/src/runtime/NEON/functions/NELaplacianReconstruct.cpp @@ -34,8 +34,11 @@ using namespace arm_compute; -NELaplacianReconstruct::NELaplacianReconstruct() - : _tmp_pyr(), _addf(), _scalef(), _depthf() +NELaplacianReconstruct::NELaplacianReconstruct() // NOLINT + : _tmp_pyr(), + _addf(), + _scalef(), + _depthf() { } diff --git a/src/runtime/NEON/functions/NEOpticalFlow.cpp b/src/runtime/NEON/functions/NEOpticalFlow.cpp index d851e9a62b..3e69a33897 100644 --- a/src/runtime/NEON/functions/NEOpticalFlow.cpp +++ b/src/runtime/NEON/functions/NEOpticalFlow.cpp @@ -37,8 +37,16 @@ using namespace arm_compute; -NEOpticalFlow::NEOpticalFlow() - : _func_scharr(), _kernel_tracker(), _scharr_gx(), _scharr_gy(), _new_points(nullptr), _new_points_estimates(nullptr), _old_points(nullptr), _new_points_internal(), _old_points_internal(), +NEOpticalFlow::NEOpticalFlow() // NOLINT + : _func_scharr(), + _kernel_tracker(), + _scharr_gx(), + _scharr_gy(), + _new_points(nullptr), + _new_points_estimates(nullptr), + _old_points(nullptr), + _new_points_internal(), + _old_points_internal(), _num_levels(0) { } diff --git a/src/runtime/NEON/functions/NEScale.cpp b/src/runtime/NEON/functions/NEScale.cpp index 0a551e937d..7fc352ab1f 100644 --- a/src/runtime/NEON/functions/NEScale.cpp +++ b/src/runtime/NEON/functions/NEScale.cpp @@ -86,8 +86,10 @@ void precompute_dx_dy_offsets(ITensor *dx, ITensor *dy, ITensor *offsets, float } } // namespace -NEScale::NEScale() - : _offsets(), _dx(), _dy() +NEScale::NEScale() // NOLINT + : _offsets(), + _dx(), + _dy() { } diff --git a/src/runtime/OMP/OMPScheduler.cpp b/src/runtime/OMP/OMPScheduler.cpp index 0cced73276..be8164121e 100644 --- a/src/runtime/OMP/OMPScheduler.cpp +++ b/src/runtime/OMP/OMPScheduler.cpp @@ -38,7 +38,7 @@ OMPScheduler &OMPScheduler::get() return scheduler; } -OMPScheduler::OMPScheduler() +OMPScheduler::OMPScheduler() // NOLINT : _num_threads(omp_get_max_threads()) { } diff --git a/tests/validation_old/AssetsLibrary.cpp b/tests/validation_old/AssetsLibrary.cpp index d7c881d9a8..fa8569e458 100644 --- a/tests/validation_old/AssetsLibrary.cpp +++ b/tests/validation_old/AssetsLibrary.cpp @@ -23,10 +23,9 @@ */ #include "tests/AssetsLibrary.h" -#include "TypePrinter.h" -#include "Utils.h" - #include "arm_compute/core/ITensor.h" +#include "tests/TypePrinter.h" +#include "tests/Utils.h" #include #include diff --git a/tests/validation_old/FixedPoint.h b/tests/validation_old/FixedPoint.h index 12ffcdfc3d..8e1f5a405e 100644 --- a/tests/validation_old/FixedPoint.h +++ b/tests/validation_old/FixedPoint.h @@ -24,8 +24,8 @@ #ifndef __ARM_COMPUTE_TEST_VALIDATION_FIXEDPOINT_H__ #define __ARM_COMPUTE_TEST_VALIDATION_FIXEDPOINT_H__ -#include "Utils.h" #include "support/ToolchainSupport.h" +#include "tests/Utils.h" #include #include diff --git a/tests/validation_old/ProgramOptions.cpp b/tests/validation_old/ProgramOptions.cpp index b5a7bb14ad..08375b344c 100644 --- a/tests/validation_old/ProgramOptions.cpp +++ b/tests/validation_old/ProgramOptions.cpp @@ -23,10 +23,9 @@ */ #include "ProgramOptions.h" -#include "TypePrinter.h" -#include "TypeReader.h" - #include "arm_compute/core/Types.h" +#include "tests/TypePrinter.h" +#include "tests/TypeReader.h" #include #include diff --git a/tests/validation_old/Reference.h b/tests/validation_old/Reference.h index 41e6362bb9..bc481f887d 100644 --- a/tests/validation_old/Reference.h +++ b/tests/validation_old/Reference.h @@ -24,9 +24,9 @@ #ifndef __ARM_COMPUTE_TEST_REFERENCE_REFERENCE_H__ #define __ARM_COMPUTE_TEST_REFERENCE_REFERENCE_H__ -#include "RawTensor.h" -#include "Types.h" #include "arm_compute/runtime/Array.h" +#include "tests/RawTensor.h" +#include "tests/Types.h" #include #include -- cgit v1.2.1