From d58cec032556abb103cdf7564ab29762d5c4c051 Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Tue, 18 Jul 2017 15:44:21 +0100 Subject: COMPMID-415: Cleanup accessors Change-Id: Id19c8c1ea76f6e6679a4ac770e804f8012a2b5a6 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80937 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- tests/benchmark_new/NEON/ActivationLayer.cpp | 4 ++-- tests/benchmark_new/NEON/ConvolutionLayer.cpp | 4 ++-- tests/benchmark_new/NEON/DirectConvolutionLayer.cpp | 4 ++-- tests/benchmark_new/NEON/FullyConnectedLayer.cpp | 4 ++-- tests/benchmark_new/NEON/NormalizationLayer.cpp | 4 ++-- tests/benchmark_new/NEON/PoolingLayer.cpp | 4 ++-- tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp | 4 ++-- tests/benchmark_new/NEON/SYSTEM/LeNet5.cpp | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'tests/benchmark_new/NEON') diff --git a/tests/benchmark_new/NEON/ActivationLayer.cpp b/tests/benchmark_new/NEON/ActivationLayer.cpp index 21e4369aa2..53b401a1ce 100644 --- a/tests/benchmark_new/NEON/ActivationLayer.cpp +++ b/tests/benchmark_new/NEON/ActivationLayer.cpp @@ -28,7 +28,7 @@ #include "arm_compute/runtime/TensorAllocator.h" #include "framework/Macros.h" #include "framework/datasets/Datasets.h" -#include "tests/NEON/NEAccessor.h" +#include "tests/NEON/Accessor.h" #include "tests/TypePrinter.h" #include "tests/datasets_new/ActivationLayerDataset.h" #include "tests/fixtures_new/ActivationLayerFixture.h" @@ -48,7 +48,7 @@ const auto lenet_data_types = framework::dataset::make("DataType", { DataType: #endif /* ARM_COMPUTE_ENABLE_FP16 */ } // namespace -using NEActivationLayerFixture = ActivationLayerFixture; +using NEActivationLayerFixture = ActivationLayerFixture; TEST_SUITE(NEON) diff --git a/tests/benchmark_new/NEON/ConvolutionLayer.cpp b/tests/benchmark_new/NEON/ConvolutionLayer.cpp index 0825b4b6bb..6dd4df89a4 100644 --- a/tests/benchmark_new/NEON/ConvolutionLayer.cpp +++ b/tests/benchmark_new/NEON/ConvolutionLayer.cpp @@ -28,7 +28,7 @@ #include "arm_compute/runtime/TensorAllocator.h" #include "framework/Macros.h" #include "framework/datasets/Datasets.h" -#include "tests/NEON/NEAccessor.h" +#include "tests/NEON/Accessor.h" #include "tests/TypePrinter.h" #include "tests/datasets_new/AlexNetConvolutionLayerDataset.h" #include "tests/datasets_new/GoogLeNetConvolutionLayerDataset.h" @@ -50,7 +50,7 @@ const auto lenet_data_types = framework::dataset::make("DataType", { DataType: #endif /* ARM_COMPUTE_ENABLE_FP16 */ } // namespace -using NEConvolutionLayerFixture = ConvolutionLayerFixture; +using NEConvolutionLayerFixture = ConvolutionLayerFixture; TEST_SUITE(NEON) diff --git a/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp b/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp index b4e040d88c..5588321cc6 100644 --- a/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp +++ b/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp @@ -28,7 +28,7 @@ #include "arm_compute/runtime/TensorAllocator.h" #include "framework/Macros.h" #include "framework/datasets/Datasets.h" -#include "tests/NEON/NEAccessor.h" +#include "tests/NEON/Accessor.h" #include "tests/TypePrinter.h" #include "tests/datasets_new/DirectConvolutionLayerDataset.h" #include "tests/fixtures_new/ConvolutionLayerFixture.h" @@ -37,7 +37,7 @@ namespace arm_compute { namespace test { -using NEDirectConvolutionLayerFixture = ConvolutionLayerFixture; +using NEDirectConvolutionLayerFixture = ConvolutionLayerFixture; TEST_SUITE(NEON) diff --git a/tests/benchmark_new/NEON/FullyConnectedLayer.cpp b/tests/benchmark_new/NEON/FullyConnectedLayer.cpp index 5fa139ec7f..eb5612348a 100644 --- a/tests/benchmark_new/NEON/FullyConnectedLayer.cpp +++ b/tests/benchmark_new/NEON/FullyConnectedLayer.cpp @@ -28,7 +28,7 @@ #include "arm_compute/runtime/TensorAllocator.h" #include "framework/Macros.h" #include "framework/datasets/Datasets.h" -#include "tests/NEON/NEAccessor.h" +#include "tests/NEON/Accessor.h" #include "tests/TypePrinter.h" #include "tests/datasets_new/AlexNetFullyConnectedLayerDataset.h" #include "tests/datasets_new/GoogLeNetFullyConnectedLayerDataset.h" @@ -39,7 +39,7 @@ namespace arm_compute { namespace test { -using NEFullyConnectedLayerFixture = FullyConnectedLayerFixture; +using NEFullyConnectedLayerFixture = FullyConnectedLayerFixture; TEST_SUITE(NEON) diff --git a/tests/benchmark_new/NEON/NormalizationLayer.cpp b/tests/benchmark_new/NEON/NormalizationLayer.cpp index 01b960ebd2..c3d4969a10 100644 --- a/tests/benchmark_new/NEON/NormalizationLayer.cpp +++ b/tests/benchmark_new/NEON/NormalizationLayer.cpp @@ -28,7 +28,7 @@ #include "arm_compute/runtime/TensorAllocator.h" #include "framework/Macros.h" #include "framework/datasets/Datasets.h" -#include "tests/NEON/NEAccessor.h" +#include "tests/NEON/Accessor.h" #include "tests/TypePrinter.h" #include "tests/datasets_new/NormalizationLayerDataset.h" #include "tests/fixtures_new/NormalizationLayerFixture.h" @@ -37,7 +37,7 @@ namespace arm_compute { namespace test { -using NENormalizationLayerFixture = NormalizationLayerFixture; +using NENormalizationLayerFixture = NormalizationLayerFixture; TEST_SUITE(NEON) diff --git a/tests/benchmark_new/NEON/PoolingLayer.cpp b/tests/benchmark_new/NEON/PoolingLayer.cpp index 05a3600abe..baa6e31483 100644 --- a/tests/benchmark_new/NEON/PoolingLayer.cpp +++ b/tests/benchmark_new/NEON/PoolingLayer.cpp @@ -28,7 +28,7 @@ #include "arm_compute/runtime/TensorAllocator.h" #include "framework/Macros.h" #include "framework/datasets/Datasets.h" -#include "tests/NEON/NEAccessor.h" +#include "tests/NEON/Accessor.h" #include "tests/TypePrinter.h" #include "tests/datasets_new/AlexNetPoolingLayerDataset.h" #include "tests/datasets_new/GoogLeNetPoolingLayerDataset.h" @@ -39,7 +39,7 @@ namespace arm_compute { namespace test { -using NEPoolingLayerFixture = PoolingLayerFixture; +using NEPoolingLayerFixture = PoolingLayerFixture; TEST_SUITE(NEON) diff --git a/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp b/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp index 07d87fd548..e97919a21f 100644 --- a/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp +++ b/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp @@ -34,7 +34,7 @@ #include "arm_compute/runtime/TensorAllocator.h" #include "framework/Macros.h" #include "framework/datasets/Datasets.h" -#include "tests/NEON/NEAccessor.h" +#include "tests/NEON/Accessor.h" #include "tests/TypePrinter.h" #include "tests/datasets_new/ActivationLayerDataset.h" #include "tests/fixtures_new/AlexNetFixture.h" @@ -46,7 +46,7 @@ namespace test using NEAlexNetFixture = AlexNetFixture