diff options
| author | steniu01 <steven.niu@arm.com> | 2017-08-04 15:30:35 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:16:42 +0100 |
| commit | 6f4933028e2ce1b002d10f91b63d523d05f31683 (patch) | |
| tree | f93c831c3eb96f7df59293b8f59ab74198203ddd /tests/benchmark_new/NEON/DirectConvolutionLayer.cpp | |
| parent | 6106a4de410e7cc59515dd889e159bee7aa45d35 (diff) | |
| download | ComputeLibrary-6f4933028e2ce1b002d10f91b63d523d05f31683.tar.gz | |
COMPMID-475 Enable more data format in the benchmark test
Change-Id: Ibde08dc9c7b37da87ead40aaf3000b0292ea5702
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/82941
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests/benchmark_new/NEON/DirectConvolutionLayer.cpp')
| -rw-r--r-- | tests/benchmark_new/NEON/DirectConvolutionLayer.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp b/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp index c4eec697af..ee0989d5df 100644 --- a/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp +++ b/tests/benchmark_new/NEON/DirectConvolutionLayer.cpp @@ -42,13 +42,9 @@ namespace test namespace { #ifdef ARM_COMPUTE_ENABLE_F16 -const auto alexnet_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F16, DataType::F32 }); -const auto googlenet_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F16, DataType::F32 }); -const auto squeezenet_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F16, DataType::F32 }); +const auto data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F16, DataType::F32 }); #else /* ARM_COMPUTE_ENABLE_F16 */ -const auto alexnet_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F32 }); -const auto googlenet_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F32 }); -const auto squeezenet_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F32 }); +const auto data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F32 }); #endif /* ARM_COMPUTE_ENABLE_F16 */ } // namespace @@ -57,15 +53,15 @@ using NEConvolutionLayerFixture = ConvolutionLayerFixture<Tensor, NEDirectConvol TEST_SUITE(NEON) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetDirectConvolutionLayer, NEConvolutionLayerFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::combine(datasets::AlexNetDirectConvolutionLayerDataset(), alexnet_data_types), + framework::dataset::combine(framework::dataset::combine(datasets::AlexNetDirectConvolutionLayerDataset(), data_types), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetDirectConvolutionLayer, NEConvolutionLayerFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetDirectConvolutionLayerDataset(), googlenet_data_types), + framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetDirectConvolutionLayerDataset(), data_types), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(SqueezeNetDirectConvolutionLayer, NEConvolutionLayerFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::combine(datasets::SqueezeNetConvolutionLayerDataset(), squeezenet_data_types), + framework::dataset::combine(framework::dataset::combine(datasets::SqueezeNetConvolutionLayerDataset(), data_types), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() |