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/NEON/ActivationLayer.cpp | 6 +++--- tests/benchmark_new/NEON/ConvolutionLayer.cpp | 6 +++--- tests/benchmark_new/NEON/DirectConvolutionLayer.cpp | 2 +- tests/benchmark_new/NEON/FullyConnectedLayer.cpp | 6 +++--- tests/benchmark_new/NEON/GEMM.cpp | 2 +- tests/benchmark_new/NEON/NormalizationLayer.cpp | 4 ++-- tests/benchmark_new/NEON/PoolingLayer.cpp | 6 +++--- tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) (limited to 'tests/benchmark_new/NEON') diff --git a/tests/benchmark_new/NEON/ActivationLayer.cpp b/tests/benchmark_new/NEON/ActivationLayer.cpp index ee8d6633aa..47838f43ba 100644 --- a/tests/benchmark_new/NEON/ActivationLayer.cpp +++ b/tests/benchmark_new/NEON/ActivationLayer.cpp @@ -43,17 +43,17 @@ TEST_SUITE(NEON) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetActivationLayer, NEActivationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetActivationLayerDataset(), - framework::dataset::make("Data type", { DataType::F32, DataType::QS8 })), + framework::dataset::make("DataType", { DataType::F32, DataType::QS8 })), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5ActivationLayer, NEActivationLayerFixture, 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, NEActivationLayerFixture, 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/NEON/ConvolutionLayer.cpp b/tests/benchmark_new/NEON/ConvolutionLayer.cpp index 3d9b2a3acf..633ad6de5b 100644 --- a/tests/benchmark_new/NEON/ConvolutionLayer.cpp +++ b/tests/benchmark_new/NEON/ConvolutionLayer.cpp @@ -45,17 +45,17 @@ TEST_SUITE(NEON) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetConvolutionLayer, NEConvolutionLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetConvolutionLayerDataset(), - framework::dataset::make("Data type", { DataType::F32, DataType::QS8 })), + framework::dataset::make("DataType", { DataType::F32, DataType::QS8 })), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5ConvolutionLayer, NEConvolutionLayerFixture, 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, NEConvolutionLayerFixture, 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/NEON/DirectConvolutionLayer.cpp b/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp index 6610fd3ec9..b4e040d88c 100644 --- a/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp +++ b/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp @@ -43,7 +43,7 @@ TEST_SUITE(NEON) REGISTER_FIXTURE_DATA_TEST_CASE(DirectConvolutionLayer, NEDirectConvolutionLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::DirectConvolutionLayerDataset(), - framework::dataset::make("Data type", { DataType::F32, DataType::QS8 })), + framework::dataset::make("DataType", { DataType::F32, DataType::QS8 })), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() diff --git a/tests/benchmark_new/NEON/FullyConnectedLayer.cpp b/tests/benchmark_new/NEON/FullyConnectedLayer.cpp index 4a72b27665..5fa139ec7f 100644 --- a/tests/benchmark_new/NEON/FullyConnectedLayer.cpp +++ b/tests/benchmark_new/NEON/FullyConnectedLayer.cpp @@ -45,17 +45,17 @@ TEST_SUITE(NEON) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetFullyConnectedLayer, NEFullyConnectedLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetFullyConnectedLayerDataset(), - framework::dataset::make("Data type", { DataType::F32, DataType::QS8 })), + framework::dataset::make("DataType", { DataType::F32, DataType::QS8 })), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5FullyConnectedLayer, NEFullyConnectedLayerFixture, 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, NEFullyConnectedLayerFixture, 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/NEON/GEMM.cpp b/tests/benchmark_new/NEON/GEMM.cpp index 724b514490..640ec1c032 100644 --- a/tests/benchmark_new/NEON/GEMM.cpp +++ b/tests/benchmark_new/NEON/GEMM.cpp @@ -38,7 +38,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::F16, diff --git a/tests/benchmark_new/NEON/NormalizationLayer.cpp b/tests/benchmark_new/NEON/NormalizationLayer.cpp index 8c1f37df0a..01b960ebd2 100644 --- a/tests/benchmark_new/NEON/NormalizationLayer.cpp +++ b/tests/benchmark_new/NEON/NormalizationLayer.cpp @@ -43,12 +43,12 @@ TEST_SUITE(NEON) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetNormalizationLayer, NENormalizationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetNormalizationLayerDataset(), - framework::dataset::make("Data type", { DataType::F32, DataType::QS8 })), + framework::dataset::make("DataType", { DataType::F32, DataType::QS8 })), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetNormalizationLayer, NENormalizationLayerFixture, 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/NEON/PoolingLayer.cpp b/tests/benchmark_new/NEON/PoolingLayer.cpp index 6100f40653..05a3600abe 100644 --- a/tests/benchmark_new/NEON/PoolingLayer.cpp +++ b/tests/benchmark_new/NEON/PoolingLayer.cpp @@ -45,17 +45,17 @@ TEST_SUITE(NEON) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetPoolingLayer, NEPoolingLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetPoolingLayerDataset(), - framework::dataset::make("Data type", { DataType::F32, DataType::QS8 })), + framework::dataset::make("DataType", { DataType::F32, DataType::QS8 })), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5PoolingLayer, NEPoolingLayerFixture, 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, NEPoolingLayerFixture, 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/NEON/SYSTEM/AlexNet.cpp b/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp index 8ed70f7a6e..b6fb12eae2 100644 --- a/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp +++ b/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp @@ -58,7 +58,7 @@ TEST_SUITE(SYSTEM_TEST) TEST_SUITE(NEON) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, NEAlexNetFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::make("Data type", { DataType::F32, DataType::QS8 }), + framework::dataset::combine(framework::dataset::make("DataType", { DataType::F32, DataType::QS8 }), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() -- cgit v1.2.1