diff options
Diffstat (limited to 'tests/benchmark/CL')
-rw-r--r-- | tests/benchmark/CL/ActivationLayer.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/CL/BatchNormalizationLayer.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/CL/ConvolutionLayer.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/CL/DepthwiseConvolutionLayer.cpp | 5 | ||||
-rw-r--r-- | tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp | 5 | ||||
-rw-r--r-- | tests/benchmark/CL/DirectConvolutionLayer.cpp | 5 | ||||
-rw-r--r-- | tests/benchmark/CL/Floor.cpp | 5 | ||||
-rw-r--r-- | tests/benchmark/CL/FullyConnectedLayer.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/CL/GEMM.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/CL/GEMMLowp.cpp | 5 | ||||
-rw-r--r-- | tests/benchmark/CL/NormalizationLayer.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/CL/PoolingLayer.cpp | 5 | ||||
-rw-r--r-- | tests/benchmark/CL/ROIPoolingLayer.cpp | 5 | ||||
-rw-r--r-- | tests/benchmark/CL/SYSTEM/AlexNet.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/CL/SYSTEM/LeNet5.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/CL/SYSTEM/MobileNet.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/CL/SYSTEM/MobileNetV1.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/CL/SoftmaxLayer.cpp | 3 |
18 files changed, 61 insertions, 7 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 |