diff options
author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-07-17 13:50:12 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:16:42 +0100 |
commit | d03b00acd71847fa2db1c5308c87d3b57c781bf9 (patch) | |
tree | 7c58283ca1a067428ccafd0f310c8c0e89800306 /tests/benchmark_new/CL | |
parent | ee493ae23b8cd6de5a6c578cea34bccb478d2f64 (diff) | |
download | ComputeLibrary-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/CL')
-rw-r--r-- | tests/benchmark_new/CL/ActivationLayer.cpp | 6 | ||||
-rw-r--r-- | tests/benchmark_new/CL/ConvolutionLayer.cpp | 6 | ||||
-rw-r--r-- | tests/benchmark_new/CL/FullyConnectedLayer.cpp | 6 | ||||
-rw-r--r-- | tests/benchmark_new/CL/GEMM.cpp | 2 | ||||
-rw-r--r-- | tests/benchmark_new/CL/NormalizationLayer.cpp | 4 | ||||
-rw-r--r-- | tests/benchmark_new/CL/PoolingLayer.cpp | 6 | ||||
-rw-r--r-- | tests/benchmark_new/CL/SYSTEM/AlexNet.cpp | 2 | ||||
-rw-r--r-- | tests/benchmark_new/CL/SYSTEM/LeNet5.cpp | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/tests/benchmark_new/CL/ActivationLayer.cpp b/tests/benchmark_new/CL/ActivationLayer.cpp index 2ab23d292f..7ce222925c 100644 --- a/tests/benchmark_new/CL/ActivationLayer.cpp +++ b/tests/benchmark_new/CL/ActivationLayer.cpp @@ -41,17 +41,17 @@ using CLActivationLayerFixture = ActivationLayerFixture<CLTensor, CLActivationLa TEST_SUITE(CL) -REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetActivationLayer, CLActivationLayerFixture, +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("Batches", { 1, 4, 8 }))); -REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5ActivationLayer, CLActivationLayerFixture, +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("Batches", { 1, 4, 8 }))); -REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetActivationLayer, CLActivationLayerFixture, +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("Batches", { 1, 4, 8 }))); diff --git a/tests/benchmark_new/CL/ConvolutionLayer.cpp b/tests/benchmark_new/CL/ConvolutionLayer.cpp index b0faf4ac0f..88eb2fe6ab 100644 --- a/tests/benchmark_new/CL/ConvolutionLayer.cpp +++ b/tests/benchmark_new/CL/ConvolutionLayer.cpp @@ -43,17 +43,17 @@ using CLConvolutionLayerFixture = ConvolutionLayerFixture<CLTensor, CLConvolutio TEST_SUITE(CL) -REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetConvolutionLayer, CLConvolutionLayerFixture, +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("Batches", { 1, 4, 8 }))); -REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5ConvolutionLayer, CLConvolutionLayerFixture, +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("Batches", { 1, 4, 8 }))); -REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetConvolutionLayer, CLConvolutionLayerFixture, +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("Batches", { 1, 4, 8 }))); diff --git a/tests/benchmark_new/CL/FullyConnectedLayer.cpp b/tests/benchmark_new/CL/FullyConnectedLayer.cpp index 3c8d450498..f2ada4d47a 100644 --- a/tests/benchmark_new/CL/FullyConnectedLayer.cpp +++ b/tests/benchmark_new/CL/FullyConnectedLayer.cpp @@ -43,17 +43,17 @@ using CLFullyConnectedLayerFixture = FullyConnectedLayerFixture<CLTensor, CLFull TEST_SUITE(CL) -REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetFullyConnectedLayer, CLFullyConnectedLayerFixture, +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("Batches", { 1, 4, 8 }))); -REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5FullyConnectedLayer, CLFullyConnectedLayerFixture, +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("Batches", { 1, 4, 8 }))); -REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetFullyConnectedLayer, CLFullyConnectedLayerFixture, +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("Batches", { 1, 4, 8 }))); diff --git a/tests/benchmark_new/CL/GEMM.cpp b/tests/benchmark_new/CL/GEMM.cpp index d75db500a0..e46175590e 100644 --- a/tests/benchmark_new/CL/GEMM.cpp +++ b/tests/benchmark_new/CL/GEMM.cpp @@ -50,7 +50,7 @@ using CLGEMMFixture = GEMMFixture<CLTensor, CLGEMM>; TEST_SUITE(CL) -REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetGEMM, CLGEMMFixture, framework::dataset::combine(datasets::GoogLeNetGEMMDataset(), std::move(data_types))); +REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetGEMM, CLGEMMFixture, framework::DatasetMode::ALL, framework::dataset::combine(datasets::GoogLeNetGEMMDataset(), std::move(data_types))); TEST_SUITE_END() } // namespace test diff --git a/tests/benchmark_new/CL/NormalizationLayer.cpp b/tests/benchmark_new/CL/NormalizationLayer.cpp index 95e78c4a18..088d8739d0 100644 --- a/tests/benchmark_new/CL/NormalizationLayer.cpp +++ b/tests/benchmark_new/CL/NormalizationLayer.cpp @@ -41,12 +41,12 @@ using CLNormalizationLayerFixture = NormalizationLayerFixture<CLTensor, CLNormal TEST_SUITE(CL) -REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetNormalizationLayer, CLNormalizationLayerFixture, +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("Batches", { 1, 4, 8 }))); -REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetNormalizationLayer, CLNormalizationLayerFixture, +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("Batches", { 1, 4, 8 }))); diff --git a/tests/benchmark_new/CL/PoolingLayer.cpp b/tests/benchmark_new/CL/PoolingLayer.cpp index 1f2229cb10..2dc0951d38 100644 --- a/tests/benchmark_new/CL/PoolingLayer.cpp +++ b/tests/benchmark_new/CL/PoolingLayer.cpp @@ -43,17 +43,17 @@ using CLPoolingLayerFixture = PoolingLayerFixture<CLTensor, CLPoolingLayer, cl:: TEST_SUITE(CL) -REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetPoolingLayer, CLPoolingLayerFixture, +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("Batches", { 1, 4, 8 }))); -REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5PoolingLayer, CLPoolingLayerFixture, +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("Batches", { 1, 4, 8 }))); -REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetPoolingLayer, CLPoolingLayerFixture, +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("Batches", { 1, 4, 8 }))); diff --git a/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp b/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp index a0673b94df..90c15c536a 100644 --- a/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp +++ b/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp @@ -57,7 +57,7 @@ using CLAlexNetFixture = AlexNetFixture<ICLTensor, TEST_SUITE(SYSTEM_TEST) TEST_SUITE(CL) -REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, CLAlexNetFixture, +REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, CLAlexNetFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::make("Data type", DataType::F32), framework::dataset::make("Batches", { 1, 4, 8 }))); diff --git a/tests/benchmark_new/CL/SYSTEM/LeNet5.cpp b/tests/benchmark_new/CL/SYSTEM/LeNet5.cpp index 0ee7c0177a..b25fb685bf 100644 --- a/tests/benchmark_new/CL/SYSTEM/LeNet5.cpp +++ b/tests/benchmark_new/CL/SYSTEM/LeNet5.cpp @@ -51,7 +51,7 @@ using CLLeNet5Fixture = LeNet5Fixture<CLTensor, TEST_SUITE(SYSTEM_TEST) TEST_SUITE(CL) -REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5, CLLeNet5Fixture, +REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5, CLLeNet5Fixture, framework::DatasetMode::ALL, framework::dataset::make("Batches", { 1, 4, 8 })); TEST_SUITE_END() |