diff options
Diffstat (limited to 'tests/benchmark_new')
-rw-r--r-- | tests/benchmark_new/CL/ActivationLayer.cpp | 2 | ||||
-rw-r--r-- | tests/benchmark_new/CL/ConvolutionLayer.cpp | 2 | ||||
-rw-r--r-- | tests/benchmark_new/CL/FullyConnectedLayer.cpp | 2 | ||||
-rw-r--r-- | tests/benchmark_new/CL/NormalizationLayer.cpp | 2 | ||||
-rw-r--r-- | tests/benchmark_new/CL/PoolingLayer.cpp | 2 | ||||
-rw-r--r-- | tests/benchmark_new/CL/SYSTEM/AlexNet.cpp | 2 | ||||
-rw-r--r-- | tests/benchmark_new/CL/SYSTEM/LeNet5.cpp | 2 | ||||
-rw-r--r-- | tests/benchmark_new/NEON/ActivationLayer.cpp | 4 | ||||
-rw-r--r-- | tests/benchmark_new/NEON/ConvolutionLayer.cpp | 4 | ||||
-rw-r--r-- | tests/benchmark_new/NEON/DirectConvolutionLayer.cpp | 4 | ||||
-rw-r--r-- | tests/benchmark_new/NEON/FullyConnectedLayer.cpp | 4 | ||||
-rw-r--r-- | tests/benchmark_new/NEON/NormalizationLayer.cpp | 4 | ||||
-rw-r--r-- | tests/benchmark_new/NEON/PoolingLayer.cpp | 4 | ||||
-rw-r--r-- | tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp | 4 | ||||
-rw-r--r-- | tests/benchmark_new/NEON/SYSTEM/LeNet5.cpp | 4 |
15 files changed, 23 insertions, 23 deletions
diff --git a/tests/benchmark_new/CL/ActivationLayer.cpp b/tests/benchmark_new/CL/ActivationLayer.cpp index c3151e6729..6f8a00727e 100644 --- a/tests/benchmark_new/CL/ActivationLayer.cpp +++ b/tests/benchmark_new/CL/ActivationLayer.cpp @@ -37,7 +37,7 @@ namespace arm_compute { namespace test { -using CLActivationLayerFixture = ActivationLayerFixture<CLTensor, CLActivationLayer, cl::CLAccessor>; +using CLActivationLayerFixture = ActivationLayerFixture<CLTensor, CLActivationLayer, CLAccessor>; TEST_SUITE(CL) diff --git a/tests/benchmark_new/CL/ConvolutionLayer.cpp b/tests/benchmark_new/CL/ConvolutionLayer.cpp index 3a74fbbaba..6e0d6ffc2a 100644 --- a/tests/benchmark_new/CL/ConvolutionLayer.cpp +++ b/tests/benchmark_new/CL/ConvolutionLayer.cpp @@ -39,7 +39,7 @@ namespace arm_compute { namespace test { -using CLConvolutionLayerFixture = ConvolutionLayerFixture<CLTensor, CLConvolutionLayer, cl::CLAccessor>; +using CLConvolutionLayerFixture = ConvolutionLayerFixture<CLTensor, CLConvolutionLayer, CLAccessor>; TEST_SUITE(CL) diff --git a/tests/benchmark_new/CL/FullyConnectedLayer.cpp b/tests/benchmark_new/CL/FullyConnectedLayer.cpp index 6b177fd8fa..a71c876ad6 100644 --- a/tests/benchmark_new/CL/FullyConnectedLayer.cpp +++ b/tests/benchmark_new/CL/FullyConnectedLayer.cpp @@ -39,7 +39,7 @@ namespace arm_compute { namespace test { -using CLFullyConnectedLayerFixture = FullyConnectedLayerFixture<CLTensor, CLFullyConnectedLayer, cl::CLAccessor>; +using CLFullyConnectedLayerFixture = FullyConnectedLayerFixture<CLTensor, CLFullyConnectedLayer, CLAccessor>; TEST_SUITE(CL) diff --git a/tests/benchmark_new/CL/NormalizationLayer.cpp b/tests/benchmark_new/CL/NormalizationLayer.cpp index 8e8c18054e..6d5142c7d7 100644 --- a/tests/benchmark_new/CL/NormalizationLayer.cpp +++ b/tests/benchmark_new/CL/NormalizationLayer.cpp @@ -37,7 +37,7 @@ namespace arm_compute { namespace test { -using CLNormalizationLayerFixture = NormalizationLayerFixture<CLTensor, CLNormalizationLayer, cl::CLAccessor>; +using CLNormalizationLayerFixture = NormalizationLayerFixture<CLTensor, CLNormalizationLayer, CLAccessor>; TEST_SUITE(CL) diff --git a/tests/benchmark_new/CL/PoolingLayer.cpp b/tests/benchmark_new/CL/PoolingLayer.cpp index 39da61b0fe..125907bff5 100644 --- a/tests/benchmark_new/CL/PoolingLayer.cpp +++ b/tests/benchmark_new/CL/PoolingLayer.cpp @@ -39,7 +39,7 @@ namespace arm_compute { namespace test { -using CLPoolingLayerFixture = PoolingLayerFixture<CLTensor, CLPoolingLayer, cl::CLAccessor>; +using CLPoolingLayerFixture = PoolingLayerFixture<CLTensor, CLPoolingLayer, CLAccessor>; TEST_SUITE(CL) diff --git a/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp b/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp index c34f35ebfb..85cd701648 100644 --- a/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp +++ b/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp @@ -46,7 +46,7 @@ namespace test using CLAlexNetFixture = AlexNetFixture<ICLTensor, CLTensor, CLSubTensor, - cl::CLAccessor, + CLAccessor, CLActivationLayer, CLConvolutionLayer, CLFullyConnectedLayer, diff --git a/tests/benchmark_new/CL/SYSTEM/LeNet5.cpp b/tests/benchmark_new/CL/SYSTEM/LeNet5.cpp index 8f45924d7e..1b500bfabb 100644 --- a/tests/benchmark_new/CL/SYSTEM/LeNet5.cpp +++ b/tests/benchmark_new/CL/SYSTEM/LeNet5.cpp @@ -41,7 +41,7 @@ namespace arm_compute namespace test { using CLLeNet5Fixture = LeNet5Fixture<CLTensor, - cl::CLAccessor, + CLAccessor, CLActivationLayer, CLConvolutionLayer, CLFullyConnectedLayer, 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<Tensor, NEActivationLayer, neon::NEAccessor>; +using NEActivationLayerFixture = ActivationLayerFixture<Tensor, NEActivationLayer, Accessor>; 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<Tensor, NEConvolutionLayer, neon::NEAccessor>; +using NEConvolutionLayerFixture = ConvolutionLayerFixture<Tensor, NEConvolutionLayer, Accessor>; 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<Tensor, NEDirectConvolutionLayer, neon::NEAccessor>; +using NEDirectConvolutionLayerFixture = ConvolutionLayerFixture<Tensor, NEDirectConvolutionLayer, Accessor>; 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<Tensor, NEFullyConnectedLayer, neon::NEAccessor>; +using NEFullyConnectedLayerFixture = FullyConnectedLayerFixture<Tensor, NEFullyConnectedLayer, Accessor>; 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<Tensor, NENormalizationLayer, neon::NEAccessor>; +using NENormalizationLayerFixture = NormalizationLayerFixture<Tensor, NENormalizationLayer, Accessor>; 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<Tensor, NEPoolingLayer, neon::NEAccessor>; +using NEPoolingLayerFixture = PoolingLayerFixture<Tensor, NEPoolingLayer, Accessor>; 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<ITensor, Tensor, SubTensor, - neon::NEAccessor, + Accessor, NEActivationLayer, NEConvolutionLayer, NEFullyConnectedLayer, diff --git a/tests/benchmark_new/NEON/SYSTEM/LeNet5.cpp b/tests/benchmark_new/NEON/SYSTEM/LeNet5.cpp index da1ce2c3e5..2375c52a1c 100644 --- a/tests/benchmark_new/NEON/SYSTEM/LeNet5.cpp +++ b/tests/benchmark_new/NEON/SYSTEM/LeNet5.cpp @@ -32,7 +32,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/fixtures_new/LeNet5Fixture.h" @@ -41,7 +41,7 @@ namespace arm_compute namespace test { using NELeNet5Fixture = LeNet5Fixture<Tensor, - neon::NEAccessor, + Accessor, NEActivationLayer, NEConvolutionLayer, NEFullyConnectedLayer, |