From 7c10f48ac46b7dfc655a13e8a29e40332c2d8ba3 Mon Sep 17 00:00:00 2001 From: Gian Marco Date: Thu, 11 Jan 2018 15:41:20 +0000 Subject: COMPMID-765 - Reduced to 4 the batch size for AlexNet This patch also removed QS8 AlexNet benchmarking for NEON and set the flag weights_reshaped to false for CL Change-Id: I8db21b007c3b25b870e9072f8e02e36d1c1281c9 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/115999 Reviewed-by: Georgios Pinitas Tested-by: Jenkins --- tests/benchmark/CL/SYSTEM/AlexNet.cpp | 4 ++-- tests/benchmark/NEON/SYSTEM/AlexNet.cpp | 8 ++++---- tests/benchmark/fixtures/AlexNetFixture.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/benchmark/CL/SYSTEM/AlexNet.cpp b/tests/benchmark/CL/SYSTEM/AlexNet.cpp index 5f258412de..1d38c1a0cd 100644 --- a/tests/benchmark/CL/SYSTEM/AlexNet.cpp +++ b/tests/benchmark/CL/SYSTEM/AlexNet.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -60,7 +60,7 @@ TEST_SUITE(SYSTEM_TEST) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, CLAlexNetFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::make("DataType", { DataType::F16, DataType::F32 }), - framework::dataset::make("Batches", { 1, 4, 8 }))); + framework::dataset::make("Batches", { 1, 2, 4 }))); TEST_SUITE_END() TEST_SUITE_END() diff --git a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp index ad16d47b46..2da61802c1 100644 --- a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp +++ b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -46,9 +46,9 @@ namespace test namespace { #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC -const auto alex_net_data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QS8 }); +const auto alex_net_data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); #else /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ -const auto alex_net_data_types = framework::dataset::make("DataType", { DataType::F32, DataType::QS8 }); +const auto alex_net_data_types = framework::dataset::make("DataType", { DataType::F32 }); #endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ } // namespace @@ -69,7 +69,7 @@ TEST_SUITE(SYSTEM_TEST) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, NEAlexNetFixture, framework::DatasetMode::ALL, framework::dataset::combine(alex_net_data_types, - framework::dataset::make("Batches", { 1, 4, 8 }))); + framework::dataset::make("Batches", { 1, 2, 4 }))); TEST_SUITE_END() TEST_SUITE_END() diff --git a/tests/benchmark/fixtures/AlexNetFixture.h b/tests/benchmark/fixtures/AlexNetFixture.h index b943f72364..e15aa621d7 100644 --- a/tests/benchmark/fixtures/AlexNetFixture.h +++ b/tests/benchmark/fixtures/AlexNetFixture.h @@ -51,7 +51,7 @@ public: template void setup(DataType data_type, int batches) { - constexpr bool weights_reshaped = true; + constexpr bool weights_reshaped = false; constexpr int fixed_point_position = 4; network.init(data_type, fixed_point_position, batches, weights_reshaped); -- cgit v1.2.1