From c87fbf8106bea3e0dc7232afb91df6a9ddb25040 Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Tue, 18 Jul 2017 14:02:10 +0100 Subject: COMPMID-415: Simplify test names Change-Id: I247a0788e0492cd5e70294b96f5b34a55ff794e5 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80913 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- tests/benchmark_new/CL/ActivationLayer.cpp | 6 +++--- tests/benchmark_new/CL/ConvolutionLayer.cpp | 6 +++--- tests/benchmark_new/CL/FullyConnectedLayer.cpp | 6 +++--- tests/benchmark_new/CL/GEMM.cpp | 2 +- tests/benchmark_new/CL/NormalizationLayer.cpp | 4 ++-- tests/benchmark_new/CL/PoolingLayer.cpp | 6 +++--- tests/benchmark_new/CL/SYSTEM/AlexNet.cpp | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'tests/benchmark_new/CL') diff --git a/tests/benchmark_new/CL/ActivationLayer.cpp b/tests/benchmark_new/CL/ActivationLayer.cpp index 7ce222925c..c3151e6729 100644 --- a/tests/benchmark_new/CL/ActivationLayer.cpp +++ b/tests/benchmark_new/CL/ActivationLayer.cpp @@ -43,17 +43,17 @@ TEST_SUITE(CL) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetActivationLayer, CLActivationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetActivationLayerDataset(), - framework::dataset::make("Data type", DataType::F32)), + framework::dataset::make("DataType", DataType::F32)), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5ActivationLayer, CLActivationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::LeNet5ActivationLayerDataset(), - framework::dataset::make("Data type", DataType::F32)), + framework::dataset::make("DataType", DataType::F32)), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetActivationLayer, CLActivationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetActivationLayerDataset(), - framework::dataset::make("Data type", DataType::F32)), + framework::dataset::make("DataType", DataType::F32)), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() diff --git a/tests/benchmark_new/CL/ConvolutionLayer.cpp b/tests/benchmark_new/CL/ConvolutionLayer.cpp index 88eb2fe6ab..3a74fbbaba 100644 --- a/tests/benchmark_new/CL/ConvolutionLayer.cpp +++ b/tests/benchmark_new/CL/ConvolutionLayer.cpp @@ -45,17 +45,17 @@ TEST_SUITE(CL) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetConvolutionLayer, CLConvolutionLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetConvolutionLayerDataset(), - framework::dataset::make("Data type", { DataType::F32 })), + framework::dataset::make("DataType", { DataType::F32 })), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5ConvolutionLayer, CLConvolutionLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::LeNet5ConvolutionLayerDataset(), - framework::dataset::make("Data type", DataType::F32)), + framework::dataset::make("DataType", DataType::F32)), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetConvolutionLayer, CLConvolutionLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetConvolutionLayerDataset(), - framework::dataset::make("Data type", DataType::F32)), + framework::dataset::make("DataType", DataType::F32)), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() diff --git a/tests/benchmark_new/CL/FullyConnectedLayer.cpp b/tests/benchmark_new/CL/FullyConnectedLayer.cpp index f2ada4d47a..6b177fd8fa 100644 --- a/tests/benchmark_new/CL/FullyConnectedLayer.cpp +++ b/tests/benchmark_new/CL/FullyConnectedLayer.cpp @@ -45,17 +45,17 @@ TEST_SUITE(CL) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetFullyConnectedLayer, CLFullyConnectedLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetFullyConnectedLayerDataset(), - framework::dataset::make("Data type", { DataType::F32 })), + framework::dataset::make("DataType", { DataType::F32 })), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5FullyConnectedLayer, CLFullyConnectedLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::LeNet5FullyConnectedLayerDataset(), - framework::dataset::make("Data type", DataType::F32)), + framework::dataset::make("DataType", DataType::F32)), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetFullyConnectedLayer, CLFullyConnectedLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetFullyConnectedLayerDataset(), - framework::dataset::make("Data type", DataType::F32)), + framework::dataset::make("DataType", DataType::F32)), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() diff --git a/tests/benchmark_new/CL/GEMM.cpp b/tests/benchmark_new/CL/GEMM.cpp index e46175590e..2fd928d131 100644 --- a/tests/benchmark_new/CL/GEMM.cpp +++ b/tests/benchmark_new/CL/GEMM.cpp @@ -37,7 +37,7 @@ namespace test { namespace { -auto data_types = framework::dataset::make("Data type", +auto data_types = framework::dataset::make("DataType", { #if ARM_COMPUTE_ENABLE_FP16 DataType::FP16, diff --git a/tests/benchmark_new/CL/NormalizationLayer.cpp b/tests/benchmark_new/CL/NormalizationLayer.cpp index 088d8739d0..8e8c18054e 100644 --- a/tests/benchmark_new/CL/NormalizationLayer.cpp +++ b/tests/benchmark_new/CL/NormalizationLayer.cpp @@ -43,12 +43,12 @@ TEST_SUITE(CL) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetNormalizationLayer, CLNormalizationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetNormalizationLayerDataset(), - framework::dataset::make("Data type", { DataType::F32 })), + framework::dataset::make("DataType", { DataType::F32 })), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetNormalizationLayer, CLNormalizationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetNormalizationLayerDataset(), - framework::dataset::make("Data type", DataType::F32)), + framework::dataset::make("DataType", DataType::F32)), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() diff --git a/tests/benchmark_new/CL/PoolingLayer.cpp b/tests/benchmark_new/CL/PoolingLayer.cpp index 2dc0951d38..39da61b0fe 100644 --- a/tests/benchmark_new/CL/PoolingLayer.cpp +++ b/tests/benchmark_new/CL/PoolingLayer.cpp @@ -45,17 +45,17 @@ TEST_SUITE(CL) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetPoolingLayer, CLPoolingLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetPoolingLayerDataset(), - framework::dataset::make("Data type", { DataType::F32 })), + framework::dataset::make("DataType", { DataType::F32 })), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5PoolingLayer, CLPoolingLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::LeNet5PoolingLayerDataset(), - framework::dataset::make("Data type", DataType::F32)), + framework::dataset::make("DataType", DataType::F32)), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetPoolingLayer, CLPoolingLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetPoolingLayerDataset(), - framework::dataset::make("Data type", DataType::F32)), + framework::dataset::make("DataType", DataType::F32)), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() diff --git a/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp b/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp index 90c15c536a..eaac1fe71f 100644 --- a/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp +++ b/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp @@ -58,7 +58,7 @@ TEST_SUITE(SYSTEM_TEST) TEST_SUITE(CL) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, CLAlexNetFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::make("Data type", DataType::F32), + framework::dataset::combine(framework::dataset::make("DataType", DataType::F32), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() -- cgit v1.2.1