aboutsummaryrefslogtreecommitdiff
path: root/tests/benchmark_new/NEON
diff options
context:
space:
mode:
authorMoritz Pflanzer <moritz.pflanzer@arm.com>2017-07-17 13:50:12 +0100
committerAnthony Barbier <anthony.barbier@arm.com>2018-09-17 14:16:42 +0100
commitd03b00acd71847fa2db1c5308c87d3b57c781bf9 (patch)
tree7c58283ca1a067428ccafd0f310c8c0e89800306 /tests/benchmark_new/NEON
parentee493ae23b8cd6de5a6c578cea34bccb478d2f64 (diff)
downloadComputeLibrary-d03b00acd71847fa2db1c5308c87d3b57c781bf9.tar.gz
COMPMID-415: Fix dataset modes
Change-Id: I266e8a22890c914edb3335104f073e79d2bf0ad9 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80766 Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com> Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests/benchmark_new/NEON')
-rw-r--r--tests/benchmark_new/NEON/ActivationLayer.cpp6
-rw-r--r--tests/benchmark_new/NEON/ConvolutionLayer.cpp6
-rw-r--r--tests/benchmark_new/NEON/DirectConvolutionLayer.cpp2
-rw-r--r--tests/benchmark_new/NEON/FullyConnectedLayer.cpp6
-rw-r--r--tests/benchmark_new/NEON/GEMM.cpp2
-rw-r--r--tests/benchmark_new/NEON/NormalizationLayer.cpp4
-rw-r--r--tests/benchmark_new/NEON/PoolingLayer.cpp6
-rw-r--r--tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp2
-rw-r--r--tests/benchmark_new/NEON/SYSTEM/LeNet5.cpp2
9 files changed, 18 insertions, 18 deletions
diff --git a/tests/benchmark_new/NEON/ActivationLayer.cpp b/tests/benchmark_new/NEON/ActivationLayer.cpp
index 75e98c4ccb..ee8d6633aa 100644
--- a/tests/benchmark_new/NEON/ActivationLayer.cpp
+++ b/tests/benchmark_new/NEON/ActivationLayer.cpp
@@ -41,17 +41,17 @@ using NEActivationLayerFixture = ActivationLayerFixture<Tensor, NEActivationLaye
TEST_SUITE(NEON)
-REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetActivationLayer, NEActivationLayerFixture,
+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("Batches", { 1, 4, 8 })));
-REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5ActivationLayer, NEActivationLayerFixture,
+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("Batches", { 1, 4, 8 })));
-REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetActivationLayer, NEActivationLayerFixture,
+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("Batches", { 1, 4, 8 })));
diff --git a/tests/benchmark_new/NEON/ConvolutionLayer.cpp b/tests/benchmark_new/NEON/ConvolutionLayer.cpp
index 57d046e9a5..3d9b2a3acf 100644
--- a/tests/benchmark_new/NEON/ConvolutionLayer.cpp
+++ b/tests/benchmark_new/NEON/ConvolutionLayer.cpp
@@ -43,17 +43,17 @@ using NEConvolutionLayerFixture = ConvolutionLayerFixture<Tensor, NEConvolutionL
TEST_SUITE(NEON)
-REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetConvolutionLayer, NEConvolutionLayerFixture,
+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("Batches", { 1, 4, 8 })));
-REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5ConvolutionLayer, NEConvolutionLayerFixture,
+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("Batches", { 1, 4, 8 })));
-REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetConvolutionLayer, NEConvolutionLayerFixture,
+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("Batches", { 1, 4, 8 })));
diff --git a/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp b/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp
index a63cbae8e5..6610fd3ec9 100644
--- a/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp
+++ b/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp
@@ -41,7 +41,7 @@ using NEDirectConvolutionLayerFixture = ConvolutionLayerFixture<Tensor, NEDirect
TEST_SUITE(NEON)
-REGISTER_FIXTURE_DATA_TEST_CASE(DirectConvolutionLayer, NEDirectConvolutionLayerFixture,
+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("Batches", { 1, 4, 8 })));
diff --git a/tests/benchmark_new/NEON/FullyConnectedLayer.cpp b/tests/benchmark_new/NEON/FullyConnectedLayer.cpp
index 75815ad363..4a72b27665 100644
--- a/tests/benchmark_new/NEON/FullyConnectedLayer.cpp
+++ b/tests/benchmark_new/NEON/FullyConnectedLayer.cpp
@@ -43,17 +43,17 @@ using NEFullyConnectedLayerFixture = FullyConnectedLayerFixture<Tensor, NEFullyC
TEST_SUITE(NEON)
-REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetFullyConnectedLayer, NEFullyConnectedLayerFixture,
+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("Batches", { 1, 4, 8 })));
-REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5FullyConnectedLayer, NEFullyConnectedLayerFixture,
+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("Batches", { 1, 4, 8 })));
-REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetFullyConnectedLayer, NEFullyConnectedLayerFixture,
+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("Batches", { 1, 4, 8 })));
diff --git a/tests/benchmark_new/NEON/GEMM.cpp b/tests/benchmark_new/NEON/GEMM.cpp
index 2ba9a71664..724b514490 100644
--- a/tests/benchmark_new/NEON/GEMM.cpp
+++ b/tests/benchmark_new/NEON/GEMM.cpp
@@ -52,7 +52,7 @@ using NEGEMMFixture = GEMMFixture<Tensor, NEGEMM>;
TEST_SUITE(NEON)
-REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetGEMM, NEGEMMFixture, framework::dataset::combine(datasets::GoogLeNetGEMMDataset(), std::move(data_types)));
+REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetGEMM, NEGEMMFixture, framework::DatasetMode::ALL, framework::dataset::combine(datasets::GoogLeNetGEMMDataset(), std::move(data_types)));
TEST_SUITE_END()
} // namespace test
diff --git a/tests/benchmark_new/NEON/NormalizationLayer.cpp b/tests/benchmark_new/NEON/NormalizationLayer.cpp
index d9f1323620..8c1f37df0a 100644
--- a/tests/benchmark_new/NEON/NormalizationLayer.cpp
+++ b/tests/benchmark_new/NEON/NormalizationLayer.cpp
@@ -41,12 +41,12 @@ using NENormalizationLayerFixture = NormalizationLayerFixture<Tensor, NENormaliz
TEST_SUITE(NEON)
-REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetNormalizationLayer, NENormalizationLayerFixture,
+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("Batches", { 1, 4, 8 })));
-REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetNormalizationLayer, NENormalizationLayerFixture,
+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("Batches", { 1, 4, 8 })));
diff --git a/tests/benchmark_new/NEON/PoolingLayer.cpp b/tests/benchmark_new/NEON/PoolingLayer.cpp
index fdaadd0493..6100f40653 100644
--- a/tests/benchmark_new/NEON/PoolingLayer.cpp
+++ b/tests/benchmark_new/NEON/PoolingLayer.cpp
@@ -43,17 +43,17 @@ using NEPoolingLayerFixture = PoolingLayerFixture<Tensor, NEPoolingLayer, neon::
TEST_SUITE(NEON)
-REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetPoolingLayer, NEPoolingLayerFixture,
+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("Batches", { 1, 4, 8 })));
-REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5PoolingLayer, NEPoolingLayerFixture,
+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("Batches", { 1, 4, 8 })));
-REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetPoolingLayer, NEPoolingLayerFixture,
+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("Batches", { 1, 4, 8 })));
diff --git a/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp b/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp
index 2a50bc9d85..8ed70f7a6e 100644
--- a/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp
+++ b/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp
@@ -57,7 +57,7 @@ using NEAlexNetFixture = AlexNetFixture<ITensor,
TEST_SUITE(SYSTEM_TEST)
TEST_SUITE(NEON)
-REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, NEAlexNetFixture,
+REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, NEAlexNetFixture, framework::DatasetMode::ALL,
framework::dataset::combine(framework::dataset::make("Data type", { DataType::F32, DataType::QS8 }),
framework::dataset::make("Batches", { 1, 4, 8 })));
diff --git a/tests/benchmark_new/NEON/SYSTEM/LeNet5.cpp b/tests/benchmark_new/NEON/SYSTEM/LeNet5.cpp
index 3957ce76b9..9a5c49e975 100644
--- a/tests/benchmark_new/NEON/SYSTEM/LeNet5.cpp
+++ b/tests/benchmark_new/NEON/SYSTEM/LeNet5.cpp
@@ -51,7 +51,7 @@ using NELeNet5Fixture = LeNet5Fixture<Tensor,
TEST_SUITE(SYSTEM_TEST)
TEST_SUITE(NEON)
-REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5, NELeNet5Fixture,
+REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5, NELeNet5Fixture, framework::DatasetMode::ALL,
framework::dataset::make("Batches", { 1, 4, 8 }));
TEST_SUITE_END()
generated by cgit v1.2.1 (git 2.23.0) at 2024-06-29 20:42:57 +0000