diff options
59 files changed, 194 insertions, 17 deletions
diff --git a/tests/benchmark/CL/ActivationLayer.cpp b/tests/benchmark/CL/ActivationLayer.cpp index 2e4641bfa5..ff612e3a3f 100644 --- a/tests/benchmark/CL/ActivationLayer.cpp +++ b/tests/benchmark/CL/ActivationLayer.cpp @@ -44,6 +44,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QS8, DataType::QS16 }); @@ -136,5 +138,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2ActivationLayer, CLActivationLayerFixture, framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/BatchNormalizationLayer.cpp b/tests/benchmark/CL/BatchNormalizationLayer.cpp index a61e7cc745..82c780008b 100644 --- a/tests/benchmark/CL/BatchNormalizationLayer.cpp +++ b/tests/benchmark/CL/BatchNormalizationLayer.cpp @@ -39,6 +39,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F32 }); @@ -87,5 +89,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4BatchNormalizationLayer, CLB framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/ConvolutionLayer.cpp b/tests/benchmark/CL/ConvolutionLayer.cpp index e9cc23c284..bad644f8b8 100644 --- a/tests/benchmark/CL/ConvolutionLayer.cpp +++ b/tests/benchmark/CL/ConvolutionLayer.cpp @@ -44,6 +44,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); @@ -121,5 +123,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2ConvolutionLayer, CLGEMMConvolutionLayerFi framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/DepthwiseConvolutionLayer.cpp b/tests/benchmark/CL/DepthwiseConvolutionLayer.cpp index 1073cff802..b56b8cb67a 100644 --- a/tests/benchmark/CL/DepthwiseConvolutionLayer.cpp +++ b/tests/benchmark/CL/DepthwiseConvolutionLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -37,6 +37,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ const auto data_types = framework::dataset::make("DataType", { DataType::F32, DataType::QASYMM8 }); using CLDepthwiseConvolutionLayerFixture = DepthwiseConvolutionLayerFixture<CLTensor, CLDepthwiseConvolutionLayer3x3, CLAccessor>; @@ -47,5 +49,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetDepthwiseConvLayer, CLDepthwiseConvolut framework::dataset::make("Batches", { 1 }))); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp b/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp index 82c506f506..17ac41decc 100644 --- a/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp +++ b/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -37,6 +37,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ const auto data_types = framework::dataset::make("DataType", { DataType::F32 }); using CLDepthwiseSeparableConvolutionLayerFixture = DepthwiseSeparableConvolutionLayerFixture<CLTensor, CLDepthwiseSeparableConvolutionLayer, CLAccessor>; @@ -47,5 +49,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetDepthwiseSeparableConvolutionLayer, CLD framework::dataset::make("Batches", { 1 }))); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/DirectConvolutionLayer.cpp b/tests/benchmark/CL/DirectConvolutionLayer.cpp index 2430a4ee94..27994b4458 100644 --- a/tests/benchmark/CL/DirectConvolutionLayer.cpp +++ b/tests/benchmark/CL/DirectConvolutionLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -42,6 +42,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); @@ -103,5 +105,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2DirectConvolutionLayer, CLConvolutionLayer framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/Floor.cpp b/tests/benchmark/CL/Floor.cpp index b2ada0ebc5..3acf50c9f8 100644 --- a/tests/benchmark/CL/Floor.cpp +++ b/tests/benchmark/CL/Floor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -37,6 +37,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F32 }); @@ -50,5 +52,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(Floor, CLFloorFixture, framework::DatasetMode::A framework::dataset::combine(datasets::SmallShapes(), data_types)); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/FullyConnectedLayer.cpp b/tests/benchmark/CL/FullyConnectedLayer.cpp index 482188560a..aaab6bb025 100644 --- a/tests/benchmark/CL/FullyConnectedLayer.cpp +++ b/tests/benchmark/CL/FullyConnectedLayer.cpp @@ -41,6 +41,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); @@ -102,5 +104,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4FullyConnectedLayer, CLFully framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/GEMM.cpp b/tests/benchmark/CL/GEMM.cpp index 60362b43e1..179f261d08 100644 --- a/tests/benchmark/CL/GEMM.cpp +++ b/tests/benchmark/CL/GEMM.cpp @@ -39,6 +39,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); @@ -63,5 +65,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetGEMM, CLGEMMFixture, framework::DatasetMo reshape_b_only_once)); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/GEMMLowp.cpp b/tests/benchmark/CL/GEMMLowp.cpp index 1138339116..f5ec043616 100644 --- a/tests/benchmark/CL/GEMMLowp.cpp +++ b/tests/benchmark/CL/GEMMLowp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -40,6 +40,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ using CLGEMMLowpFixture = GEMMLowpMatrixMultiplyCoreFixture<CLTensor, CLGEMMLowpMatrixMultiplyCore, CLAccessor>; TEST_SUITE(CL) @@ -50,5 +52,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogleNetGEMMLowp, CLGEMMLowpFixture, framework: REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetGEMMLowp, CLGEMMLowpFixture, framework::DatasetMode::NIGHTLY, datasets::AlexNetGEMMDataset()); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/NormalizationLayer.cpp b/tests/benchmark/CL/NormalizationLayer.cpp index 75a98b6f0b..9ee5041121 100644 --- a/tests/benchmark/CL/NormalizationLayer.cpp +++ b/tests/benchmark/CL/NormalizationLayer.cpp @@ -38,6 +38,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); @@ -69,5 +71,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV1NormalizationLayer, CLNormal framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/PoolingLayer.cpp b/tests/benchmark/CL/PoolingLayer.cpp index 116639a1d0..9c567202de 100644 --- a/tests/benchmark/CL/PoolingLayer.cpp +++ b/tests/benchmark/CL/PoolingLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -43,6 +43,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); @@ -124,5 +126,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2PoolingLayer, CLPoolingLayerFixture, frame framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/ROIPoolingLayer.cpp b/tests/benchmark/CL/ROIPoolingLayer.cpp index 4e78673287..2ef91d45fd 100644 --- a/tests/benchmark/CL/ROIPoolingLayer.cpp +++ b/tests/benchmark/CL/ROIPoolingLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -39,6 +39,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ using CLROIPoolingLayerFixture = ROIPoolingLayerFixture<CLTensor, CLROIPoolingLayer, CLAccessor, CLArray<ROI>, CLArrayAccessor<ROI>>; TEST_SUITE(CL) @@ -49,5 +51,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(SmallROIPoolingLayer, CLROIPoolingLayerFixture, framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/SYSTEM/AlexNet.cpp b/tests/benchmark/CL/SYSTEM/AlexNet.cpp index 5401cbdd04..f24803d71b 100644 --- a/tests/benchmark/CL/SYSTEM/AlexNet.cpp +++ b/tests/benchmark/CL/SYSTEM/AlexNet.cpp @@ -43,6 +43,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ using CLAlexNetFixture = AlexNetFixture<ICLTensor, CLTensor, CLSubTensor, @@ -64,5 +66,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, CLAlexNetFixture, framework::DatasetMod TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/SYSTEM/LeNet5.cpp b/tests/benchmark/CL/SYSTEM/LeNet5.cpp index 09c6f65fc2..0fa6791437 100644 --- a/tests/benchmark/CL/SYSTEM/LeNet5.cpp +++ b/tests/benchmark/CL/SYSTEM/LeNet5.cpp @@ -40,6 +40,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ using CLLeNet5Fixture = LeNet5Fixture<CLTensor, CLAccessor, CLActivationLayer, @@ -56,5 +58,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5, CLLeNet5Fixture, framework::DatasetMode: TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/SYSTEM/MobileNet.cpp b/tests/benchmark/CL/SYSTEM/MobileNet.cpp index bc728d9c00..304e966eed 100644 --- a/tests/benchmark/CL/SYSTEM/MobileNet.cpp +++ b/tests/benchmark/CL/SYSTEM/MobileNet.cpp @@ -41,6 +41,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ using CLMobileNetFixture = MobileNetFixture<CLTensor, CLAccessor, CLActivationLayer, @@ -58,5 +60,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(MobileNet, CLMobileNetFixture, framework::Datase TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp b/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp index 53ab1a7fc3..de38d371f1 100644 --- a/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp +++ b/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp @@ -43,6 +43,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ using CLMobileNetV1_224_Fixture = MobileNetV1Fixture<CLTensor, CLAccessor, CLActivationLayer, @@ -78,5 +80,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetV1_128, CLMobileNetV1_128_Fixture, fram TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/CL/SoftmaxLayer.cpp b/tests/benchmark/CL/SoftmaxLayer.cpp index 0bdc47b839..f1bc888c8d 100644 --- a/tests/benchmark/CL/SoftmaxLayer.cpp +++ b/tests/benchmark/CL/SoftmaxLayer.cpp @@ -37,6 +37,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F16, DataType::F32 }); @@ -53,5 +55,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(SoftmaxLayerLarge, CLSoftmaxLayerFixture, framew framework::dataset::combine(datasets::SoftmaxLayerLargeShapes(), data_types)); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/GLES_COMPUTE/BatchNormalizationLayer.cpp b/tests/benchmark/GLES_COMPUTE/BatchNormalizationLayer.cpp index e615860ec8..6e5836ef9e 100644 --- a/tests/benchmark/GLES_COMPUTE/BatchNormalizationLayer.cpp +++ b/tests/benchmark/GLES_COMPUTE/BatchNormalizationLayer.cpp @@ -39,6 +39,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); @@ -87,5 +89,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4BatchNormalizationLayer, GCB framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/GLES_COMPUTE/ConvolutionLayer.cpp b/tests/benchmark/GLES_COMPUTE/ConvolutionLayer.cpp index 0d8edb757d..4cb020caf4 100644 --- a/tests/benchmark/GLES_COMPUTE/ConvolutionLayer.cpp +++ b/tests/benchmark/GLES_COMPUTE/ConvolutionLayer.cpp @@ -43,6 +43,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16 }); @@ -115,5 +117,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2ConvolutionLayer, GCConvolutionLayerFixtur framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/GLES_COMPUTE/DepthwiseConvolutionLayer.cpp b/tests/benchmark/GLES_COMPUTE/DepthwiseConvolutionLayer.cpp index 9a0cbe3dd1..0633acb27a 100644 --- a/tests/benchmark/GLES_COMPUTE/DepthwiseConvolutionLayer.cpp +++ b/tests/benchmark/GLES_COMPUTE/DepthwiseConvolutionLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -37,6 +37,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ const auto data_types = framework::dataset::make("DataType", { DataType::F16 }); using GCDepthwiseConvolutionLayerFixture = DepthwiseConvolutionLayerFixture<GCTensor, GCDepthwiseConvolutionLayer3x3, GCAccessor>; @@ -47,5 +49,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetDepthwiseConvLayer, GCDepthwiseConvolut framework::dataset::make("Batches", { 1 }))); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/GLES_COMPUTE/DirectConvolutionLayer.cpp b/tests/benchmark/GLES_COMPUTE/DirectConvolutionLayer.cpp index 89ca192f83..784f8e85ef 100644 --- a/tests/benchmark/GLES_COMPUTE/DirectConvolutionLayer.cpp +++ b/tests/benchmark/GLES_COMPUTE/DirectConvolutionLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -42,6 +42,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F32, DataType::F16 }); @@ -103,5 +105,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2DirectConvolutionLayer, GCConvolutionLayer framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/GLES_COMPUTE/FullyConnectedLayer.cpp b/tests/benchmark/GLES_COMPUTE/FullyConnectedLayer.cpp index 36578edbfb..8d2cc7236f 100644 --- a/tests/benchmark/GLES_COMPUTE/FullyConnectedLayer.cpp +++ b/tests/benchmark/GLES_COMPUTE/FullyConnectedLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -41,6 +41,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F32, DataType::F16 }); @@ -102,5 +104,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4FullyConnectedLayer, GCFully framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/GLES_COMPUTE/GEMM.cpp b/tests/benchmark/GLES_COMPUTE/GEMM.cpp index 97c92c679b..3e561138ef 100644 --- a/tests/benchmark/GLES_COMPUTE/GEMM.cpp +++ b/tests/benchmark/GLES_COMPUTE/GEMM.cpp @@ -38,6 +38,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F32 }); @@ -60,5 +62,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogleNetGEMM, GCGEMMFixture, framework::Dataset reshape_b_only_once)); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/GLES_COMPUTE/NormalizePlanarYUVLayer.cpp b/tests/benchmark/GLES_COMPUTE/NormalizePlanarYUVLayer.cpp index 332418015d..3ba65d427c 100644 --- a/tests/benchmark/GLES_COMPUTE/NormalizePlanarYUVLayer.cpp +++ b/tests/benchmark/GLES_COMPUTE/NormalizePlanarYUVLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -37,6 +37,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16 }); @@ -52,5 +54,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4NormalizePlanarYUVLayer, GCN framework::dataset::make("Batches", 1))); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/GLES_COMPUTE/PoolingLayer.cpp b/tests/benchmark/GLES_COMPUTE/PoolingLayer.cpp index 87c5382073..2a8e5dacb3 100644 --- a/tests/benchmark/GLES_COMPUTE/PoolingLayer.cpp +++ b/tests/benchmark/GLES_COMPUTE/PoolingLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -43,6 +43,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F32 }); @@ -124,5 +126,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2PoolingLayer, GCPoolingLayerFixture, frame framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/GLES_COMPUTE/Scale.cpp b/tests/benchmark/GLES_COMPUTE/Scale.cpp index 12f3151fd9..dc7ebe13fe 100644 --- a/tests/benchmark/GLES_COMPUTE/Scale.cpp +++ b/tests/benchmark/GLES_COMPUTE/Scale.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -37,6 +37,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16 }); @@ -57,5 +59,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(LargeScaleLayer, GCScaleLayerFixture<half>, fram TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/GLES_COMPUTE/SoftmaxLayer.cpp b/tests/benchmark/GLES_COMPUTE/SoftmaxLayer.cpp index 66123aa57f..63ddd8a5a5 100644 --- a/tests/benchmark/GLES_COMPUTE/SoftmaxLayer.cpp +++ b/tests/benchmark/GLES_COMPUTE/SoftmaxLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -37,6 +37,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); @@ -56,5 +58,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(SoftmaxLayer, GCSoftmaxLayerFixture, framework:: TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/ActivationLayer.cpp b/tests/benchmark/NEON/ActivationLayer.cpp index 58aa42a8a4..e1664d3e59 100644 --- a/tests/benchmark/NEON/ActivationLayer.cpp +++ b/tests/benchmark/NEON/ActivationLayer.cpp @@ -44,6 +44,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC @@ -125,5 +127,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2ActivationLayer, NEActivationLayerFixture, framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/BatchNormalizationLayer.cpp b/tests/benchmark/NEON/BatchNormalizationLayer.cpp index 25200374f3..6d28318b2e 100644 --- a/tests/benchmark/NEON/BatchNormalizationLayer.cpp +++ b/tests/benchmark/NEON/BatchNormalizationLayer.cpp @@ -40,6 +40,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC @@ -89,5 +91,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4BatchNormalizationLayer, NEB framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/ConvolutionLayer.cpp b/tests/benchmark/NEON/ConvolutionLayer.cpp index af0db6dfc5..9914d08c72 100644 --- a/tests/benchmark/NEON/ConvolutionLayer.cpp +++ b/tests/benchmark/NEON/ConvolutionLayer.cpp @@ -45,6 +45,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC @@ -152,5 +154,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(SqueezeNetWinogradLayer, NEWinogradLayerFixture, TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/DirectConvolutionLayer.cpp b/tests/benchmark/NEON/DirectConvolutionLayer.cpp index 7854f618b9..67b948568f 100644 --- a/tests/benchmark/NEON/DirectConvolutionLayer.cpp +++ b/tests/benchmark/NEON/DirectConvolutionLayer.cpp @@ -43,6 +43,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { // Special data types for networks that need 5x5 direct convolution, which does not support Fixed Point @@ -100,5 +102,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2DirectConvolutionLayer, NEConvolutionLayer TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/Floor.cpp b/tests/benchmark/NEON/Floor.cpp index 824aee95ec..f87e70c356 100644 --- a/tests/benchmark/NEON/Floor.cpp +++ b/tests/benchmark/NEON/Floor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -37,6 +37,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F32 }); @@ -50,5 +52,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(Floor, NEFloorFixture, framework::DatasetMode::A framework::dataset::combine(datasets::SmallShapes(), data_types)); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/FullyConnectedLayer.cpp b/tests/benchmark/NEON/FullyConnectedLayer.cpp index edd4406485..d0fb04f000 100644 --- a/tests/benchmark/NEON/FullyConnectedLayer.cpp +++ b/tests/benchmark/NEON/FullyConnectedLayer.cpp @@ -41,6 +41,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC @@ -106,5 +108,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4FullyConnectedLayer, NEFully framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/GEMM.cpp b/tests/benchmark/NEON/GEMM.cpp index 473d6429fb..2a57ace269 100644 --- a/tests/benchmark/NEON/GEMM.cpp +++ b/tests/benchmark/NEON/GEMM.cpp @@ -39,6 +39,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", @@ -67,5 +69,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogleNetGEMM, NEGEMMFixture, framework::Dataset reshape_b_only_once)); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/GEMMLowp.cpp b/tests/benchmark/NEON/GEMMLowp.cpp index e3ad1d43d2..4b13f31147 100644 --- a/tests/benchmark/NEON/GEMMLowp.cpp +++ b/tests/benchmark/NEON/GEMMLowp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -39,6 +39,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ using NEGEMMLowpFixture = GEMMLowpMatrixMultiplyCoreFixture<Tensor, NEGEMMLowpMatrixMultiplyCore, Accessor>; TEST_SUITE(NEON) @@ -48,5 +50,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(MatrixMultiplyGEMMLowp, NEGEMMLowpFixture, frame REGISTER_FIXTURE_DATA_TEST_CASE(GoogleNetGEMMLowp, NEGEMMLowpFixture, framework::DatasetMode::NIGHTLY, datasets::GoogleNetGEMMDataset()); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/NormalizationLayer.cpp b/tests/benchmark/NEON/NormalizationLayer.cpp index 1f2b2a3405..0c9a864eec 100644 --- a/tests/benchmark/NEON/NormalizationLayer.cpp +++ b/tests/benchmark/NEON/NormalizationLayer.cpp @@ -38,6 +38,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC @@ -72,5 +74,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV1NormalizationLayer, NENormal framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/PoolingLayer.cpp b/tests/benchmark/NEON/PoolingLayer.cpp index c1e1a01563..bdb5032898 100644 --- a/tests/benchmark/NEON/PoolingLayer.cpp +++ b/tests/benchmark/NEON/PoolingLayer.cpp @@ -43,6 +43,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC @@ -100,5 +102,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2PoolingLayer, NEPoolingLayerFixture, frame framework::dataset::combine(framework::dataset::combine(datasets::YOLOV2PoolingLayerDataset(), data_types), framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/ROIPoolingLayer.cpp b/tests/benchmark/NEON/ROIPoolingLayer.cpp index 64b3570715..02cf47b189 100644 --- a/tests/benchmark/NEON/ROIPoolingLayer.cpp +++ b/tests/benchmark/NEON/ROIPoolingLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -39,6 +39,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ using NEROIPoolingLayerFixture = ROIPoolingLayerFixture<Tensor, NEROIPoolingLayer, Accessor, Array<ROI>, ArrayAccessor<ROI>>; TEST_SUITE(NEON) @@ -49,5 +51,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(SmallROIPoolingLayer, NEROIPoolingLayerFixture, framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp index e28f967773..e3491757f4 100644 --- a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp +++ b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp @@ -43,6 +43,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC @@ -73,5 +75,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, NEAlexNetFixture, framework::DatasetMod TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/SYSTEM/LeNet5.cpp b/tests/benchmark/NEON/SYSTEM/LeNet5.cpp index d8ec5754e7..d9d08f48bf 100644 --- a/tests/benchmark/NEON/SYSTEM/LeNet5.cpp +++ b/tests/benchmark/NEON/SYSTEM/LeNet5.cpp @@ -40,6 +40,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ using NELeNet5Fixture = LeNet5Fixture<Tensor, Accessor, NEActivationLayer, @@ -56,5 +58,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5, NELeNet5Fixture, framework::DatasetMode: TEST_SUITE_END() TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/NEON/SoftmaxLayer.cpp b/tests/benchmark/NEON/SoftmaxLayer.cpp index 9a6f6a457d..06c990b561 100644 --- a/tests/benchmark/NEON/SoftmaxLayer.cpp +++ b/tests/benchmark/NEON/SoftmaxLayer.cpp @@ -37,6 +37,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ namespace { const auto data_types = framework::dataset::make("DataType", { DataType::F32 }); @@ -53,5 +55,6 @@ REGISTER_FIXTURE_DATA_TEST_CASE(SoftmaxLayerLarge, NESoftmaxLayerFixture, framew framework::dataset::combine(datasets::SoftmaxLayerLargeShapes(), data_types)); TEST_SUITE_END() +} // namespace benchmark } // namespace test } // namespace arm_compute diff --git a/tests/benchmark/fixtures/ActivationLayerFixture.h b/tests/benchmark/fixtures/ActivationLayerFixture.h index cb8fa7f086..d46ef2827b 100644 --- a/tests/benchmark/fixtures/ActivationLayerFixture.h +++ b/tests/benchmark/fixtures/ActivationLayerFixture.h @@ -34,6 +34,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor> class ActivationLayerFixture : public framework::Fixture @@ -81,6 +83,7 @@ private: TensorType dst{}; Function act_layer{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_ACTIVATIONLAYERFIXTURE */ diff --git a/tests/benchmark/fixtures/AlexNetFixture.h b/tests/benchmark/fixtures/AlexNetFixture.h index e15aa621d7..46ac61b49a 100644 --- a/tests/benchmark/fixtures/AlexNetFixture.h +++ b/tests/benchmark/fixtures/AlexNetFixture.h @@ -33,6 +33,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ template <typename ITensorType, typename TensorType, typename SubTensorType, @@ -88,6 +90,7 @@ private: SoftmaxLayerFunction> network{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_ALEXNETFIXTURE */ diff --git a/tests/benchmark/fixtures/BatchNormalizationLayerFixture.h b/tests/benchmark/fixtures/BatchNormalizationLayerFixture.h index a031ec6d96..fbb7700710 100644 --- a/tests/benchmark/fixtures/BatchNormalizationLayerFixture.h +++ b/tests/benchmark/fixtures/BatchNormalizationLayerFixture.h @@ -34,6 +34,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor> class BatchNormalizationLayerFixture : public framework::Fixture @@ -96,6 +98,7 @@ private: TensorType gamma{}; Function batch_norm_layer{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_BATCHNORMALIZATIONLAYERFIXTURE */ diff --git a/tests/benchmark/fixtures/ConvolutionLayerFixture.h b/tests/benchmark/fixtures/ConvolutionLayerFixture.h index 7dc7de0dc1..9815040d42 100644 --- a/tests/benchmark/fixtures/ConvolutionLayerFixture.h +++ b/tests/benchmark/fixtures/ConvolutionLayerFixture.h @@ -34,6 +34,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor> class ConvolutionLayerFixture : public framework::Fixture @@ -90,6 +92,7 @@ private: TensorType dst{}; Function conv_layer{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_CONVOLUTIONLAYERFIXTURE */ diff --git a/tests/benchmark/fixtures/DepthwiseConvolutionLayerFixture.h b/tests/benchmark/fixtures/DepthwiseConvolutionLayerFixture.h index a156f4bc6f..9d29aee76a 100644 --- a/tests/benchmark/fixtures/DepthwiseConvolutionLayerFixture.h +++ b/tests/benchmark/fixtures/DepthwiseConvolutionLayerFixture.h @@ -34,6 +34,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor> class DepthwiseConvolutionLayerFixture : public framework::Fixture @@ -89,6 +91,7 @@ private: TensorType dst{}; Function depth_conv{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_DEPTHWISECONVOLUTIONFIXTURE */ diff --git a/tests/benchmark/fixtures/DepthwiseSeparableConvolutionLayerFixture.h b/tests/benchmark/fixtures/DepthwiseSeparableConvolutionLayerFixture.h index f78c3e4e4d..ef1a40704f 100644 --- a/tests/benchmark/fixtures/DepthwiseSeparableConvolutionLayerFixture.h +++ b/tests/benchmark/fixtures/DepthwiseSeparableConvolutionLayerFixture.h @@ -34,6 +34,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor> class DepthwiseSeparableConvolutionLayerFixture : public framework::Fixture @@ -103,6 +105,7 @@ private: TensorType dst{}; Function depth_sep_conv_layer{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_DEPTHWISESEPARABLECONVOLUTIONLAYERFIXTURE */ diff --git a/tests/benchmark/fixtures/FloorFixture.h b/tests/benchmark/fixtures/FloorFixture.h index df3a7da29d..8c80fa386f 100644 --- a/tests/benchmark/fixtures/FloorFixture.h +++ b/tests/benchmark/fixtures/FloorFixture.h @@ -34,6 +34,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor> class FloorFixture : public framework::Fixture @@ -76,6 +78,7 @@ private: TensorType dst{}; Function floor_func{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_FLOORFIXTURE */ diff --git a/tests/benchmark/fixtures/FullyConnectedLayerFixture.h b/tests/benchmark/fixtures/FullyConnectedLayerFixture.h index b84fecea66..e7a5260f44 100644 --- a/tests/benchmark/fixtures/FullyConnectedLayerFixture.h +++ b/tests/benchmark/fixtures/FullyConnectedLayerFixture.h @@ -34,6 +34,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor> class FullyConnectedLayerFixture : public framework::Fixture @@ -89,6 +91,7 @@ private: TensorType dst{}; Function fc_layer{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_FULLYCONNECTEDLAYERFIXTURE */ diff --git a/tests/benchmark/fixtures/GEMMFixture.h b/tests/benchmark/fixtures/GEMMFixture.h index 3a308d9ada..f706f3eda6 100644 --- a/tests/benchmark/fixtures/GEMMFixture.h +++ b/tests/benchmark/fixtures/GEMMFixture.h @@ -34,6 +34,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor> class GEMMFixture : public framework::Fixture @@ -86,6 +88,7 @@ private: TensorType dst{}; Function gemm{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_GEMMFIXTURE */ diff --git a/tests/benchmark/fixtures/GEMMLowpFixture.h b/tests/benchmark/fixtures/GEMMLowpFixture.h index f9338082d2..b5381b0934 100644 --- a/tests/benchmark/fixtures/GEMMLowpFixture.h +++ b/tests/benchmark/fixtures/GEMMLowpFixture.h @@ -34,6 +34,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor> class GEMMLowpMatrixMultiplyCoreFixture : public framework::Fixture @@ -88,6 +90,7 @@ private: Function gemmlowp{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_GEMMLOWPFIXTURE */ diff --git a/tests/benchmark/fixtures/LeNet5Fixture.h b/tests/benchmark/fixtures/LeNet5Fixture.h index 5108042820..03e426d4eb 100644 --- a/tests/benchmark/fixtures/LeNet5Fixture.h +++ b/tests/benchmark/fixtures/LeNet5Fixture.h @@ -33,6 +33,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ template <typename TensorType, typename Accessor, typename ActivationLayerFunction, @@ -76,6 +78,7 @@ private: SoftmaxLayerFunction> network{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_LENET5FIXTURE */ diff --git a/tests/benchmark/fixtures/MobileNetFixture.h b/tests/benchmark/fixtures/MobileNetFixture.h index d073bb43e5..3236e82537 100644 --- a/tests/benchmark/fixtures/MobileNetFixture.h +++ b/tests/benchmark/fixtures/MobileNetFixture.h @@ -33,6 +33,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ template <typename TensorType, typename Accessor, typename ActivationLayerFunction, @@ -78,6 +80,7 @@ private: PoolingLayerFunction> network{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_MOBILENETFIXTURE */ diff --git a/tests/benchmark/fixtures/MobileNetV1Fixture.h b/tests/benchmark/fixtures/MobileNetV1Fixture.h index 9b5020af0f..590aecf207 100644 --- a/tests/benchmark/fixtures/MobileNetV1Fixture.h +++ b/tests/benchmark/fixtures/MobileNetV1Fixture.h @@ -33,6 +33,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ template <typename TensorType, typename Accessor, typename ActivationLayerFunction, @@ -83,6 +85,7 @@ private: SoftmaxLayerFunction> network{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_MOBILENETV1_FIXTURE */ diff --git a/tests/benchmark/fixtures/NormalizationLayerFixture.h b/tests/benchmark/fixtures/NormalizationLayerFixture.h index 00ab23ff5a..7742dcacfd 100644 --- a/tests/benchmark/fixtures/NormalizationLayerFixture.h +++ b/tests/benchmark/fixtures/NormalizationLayerFixture.h @@ -34,6 +34,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor> class NormalizationLayerFixture : public framework::Fixture @@ -80,6 +82,7 @@ private: TensorType dst{}; Function norm_layer{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_NORMALIZATIONLAYERFIXTURE */ diff --git a/tests/benchmark/fixtures/PoolingLayerFixture.h b/tests/benchmark/fixtures/PoolingLayerFixture.h index 88edea30fa..a7deb75370 100644 --- a/tests/benchmark/fixtures/PoolingLayerFixture.h +++ b/tests/benchmark/fixtures/PoolingLayerFixture.h @@ -34,6 +34,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor> class PoolingLayerFixture : public framework::Fixture @@ -81,6 +83,7 @@ private: TensorType dst{}; Function pool_layer{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_POOLINGLAYERFIXTURE */ diff --git a/tests/benchmark/fixtures/ROIPoolingLayerFixture.h b/tests/benchmark/fixtures/ROIPoolingLayerFixture.h index bdd416e049..4adfa446d6 100644 --- a/tests/benchmark/fixtures/ROIPoolingLayerFixture.h +++ b/tests/benchmark/fixtures/ROIPoolingLayerFixture.h @@ -36,6 +36,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON and CL */ template <typename TensorType, typename Function, typename Accessor, typename Array_T, typename ArrayAccessor> class ROIPoolingLayerFixture : public framework::Fixture @@ -93,6 +95,7 @@ private: std::unique_ptr<Array_T> rois_array{}; Function roi_pool{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_ROIPOOLINGLAYERFIXTURE */ diff --git a/tests/benchmark/fixtures/SoftmaxLayerFixture.h b/tests/benchmark/fixtures/SoftmaxLayerFixture.h index 95790ff452..4f6dde8706 100644 --- a/tests/benchmark/fixtures/SoftmaxLayerFixture.h +++ b/tests/benchmark/fixtures/SoftmaxLayerFixture.h @@ -35,6 +35,8 @@ namespace arm_compute { namespace test { +namespace benchmark +{ /** Fixture that can be used for NEON, CL and OpenGL ES */ template <typename TensorType, typename Function, typename Accessor> class SoftmaxLayerFixture : public framework::Fixture @@ -82,6 +84,7 @@ private: TensorType dst{}; Function smx_layer{}; }; +} // namespace benchmark } // namespace test } // namespace arm_compute #endif /* ARM_COMPUTE_TEST_SOFTMAXLAYERFIXTURE */ |