diff options
| author | SiCong Li <sicong.li@arm.com> | 2017-07-27 17:59:20 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:16:42 +0100 |
| commit | 02dfb2cd0bfab1bcff141db4598c23055e67311b (patch) | |
| tree | 033efc87dc1127d9d6cbf07a0e490392ef439637 /tests/benchmark_new/CL | |
| parent | a36ccf1b5c66a5f25bdde1ce69b60e49ed67bb41 (diff) | |
| download | ComputeLibrary-02dfb2cd0bfab1bcff141db4598c23055e67311b.tar.gz | |
COMPMID-457 Fix F16 NormalizationLayer CL kernel
Change-Id: I307c7ef6a49c852615c4425dc8dc0b1066a6974f
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/81895
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Diffstat (limited to 'tests/benchmark_new/CL')
| -rw-r--r-- | tests/benchmark_new/CL/NormalizationLayer.cpp | 12 | ||||
| -rw-r--r-- | tests/benchmark_new/CL/SYSTEM/AlexNet.cpp | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tests/benchmark_new/CL/NormalizationLayer.cpp b/tests/benchmark_new/CL/NormalizationLayer.cpp index 6d5142c7d7..7ba78a5e99 100644 --- a/tests/benchmark_new/CL/NormalizationLayer.cpp +++ b/tests/benchmark_new/CL/NormalizationLayer.cpp @@ -30,25 +30,31 @@ #include "framework/datasets/Datasets.h" #include "tests/CL/CLAccessor.h" #include "tests/TypePrinter.h" -#include "tests/datasets_new/NormalizationLayerDataset.h" +#include "tests/datasets_new/AlexNetNormalizationLayerDataset.h" +#include "tests/datasets_new/GoogLeNetNormalizationLayerDataset.h" #include "tests/fixtures_new/NormalizationLayerFixture.h" namespace arm_compute { namespace test { +namespace +{ +const auto normalization_layer_data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); +} // namespace + using CLNormalizationLayerFixture = NormalizationLayerFixture<CLTensor, CLNormalizationLayer, CLAccessor>; TEST_SUITE(CL) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetNormalizationLayer, CLNormalizationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetNormalizationLayerDataset(), - framework::dataset::make("DataType", { DataType::F32 })), + normalization_layer_data_types), 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("DataType", DataType::F32)), + normalization_layer_data_types), 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 85cd701648..e6d91d9706 100644 --- a/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp +++ b/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp @@ -36,7 +36,6 @@ #include "framework/datasets/Datasets.h" #include "tests/CL/CLAccessor.h" #include "tests/TypePrinter.h" -#include "tests/datasets_new/ActivationLayerDataset.h" #include "tests/fixtures_new/AlexNetFixture.h" namespace arm_compute |