Skip to content

Commit 0d69ce5

Browse files
morgolockmorgolock
committed
refactor: Flatten nested combine and zip usage in validation/CL directory.
Change-Id: I0062adfe564062a310a4ef997888f03a2843f7bc Signed-off-by: Pablo Marquez Tello <[email protected]>
1 parent fb881b2 commit 0d69ce5

File tree

96 files changed

+3777
-4002
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3777
-4002
lines changed

‎tests/validation/CL/ActivationLayer.cpp‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017-2020, 2022 Arm Limited.
2+
* Copyright (c) 2017-2020, 2022, 2025 Arm Limited.
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -56,7 +56,6 @@ constexpr AbsoluteTolerance<float> tolerance_qsymm16(1.f);
5656
AbsoluteTolerance<float> tolerance(ActivationLayerInfo::ActivationFunction activation, DataType data_type)
5757
{
5858
constexpr float epsilon = 1e-6f;
59-
6059
switch(activation)
6160
{
6261
case ActivationLayerInfo::ActivationFunction::LINEAR:
@@ -89,16 +88,15 @@ const auto CNNDataTypes = framework::dataset::make("DataType",
8988
});
9089

9190
/** Input data sets. */
92-
const auto ActivationDataset = combine(combine(framework::dataset::make("InPlace", { false, true }), datasets::ActivationFunctions()), framework::dataset::make("AlphaBeta", { 0.5f, 1.f }));
91+
const auto ActivationDataset = combine(framework::dataset::make("InPlace", { false, true }), datasets::ActivationFunctions(), framework::dataset::make("AlphaBeta", { 0.5f, 1.f }));
9392

9493
} // namespace
9594

9695
TEST_SUITE(CL)
9796
TEST_SUITE(ActivationLayer)
9897
// *INDENT-OFF*
9998
// clang-format off
100-
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(
101-
framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), // Mismatching data types
99+
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), // Mismatching data types
102100
TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32),
103101
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
104102
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QASYMM8),
@@ -117,7 +115,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(
117115
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QSYMM16, QuantizationInfo(1.f / 32768.f, 0)),
118116
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QSYMM16, QuantizationInfo(1.f / 32768.f, 0)),
119117
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QSYMM16, QuantizationInfo(1.f / 32768.f, 0)),
120-
})),
118+
}),
121119
framework::dataset::make("ActivationInfo", { ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
122120
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
123121
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
@@ -127,7 +125,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(
127125
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::TANH),
128126
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::LOGISTIC),
129127
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::SQRT),
130-
})),
128+
}),
131129
framework::dataset::make("Expected", { false, true, true, true, false, false, true, true, false })),
132130
input_info, output_info, act_info, expected)
133131
{
@@ -145,7 +143,7 @@ using CLActivationLayerFixture = ActivationValidationFixture<CLTensor, CLAccesso
145143
TEST_SUITE(Float)
146144
TEST_SUITE(FP16)
147145
/** [CLActivationLayer Test snippet] **/
148-
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerFixture<half>, framework::DatasetMode::ALL, combine(combine(datasets::SmallShapes(), ActivationDataset),
146+
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerFixture<half>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), ActivationDataset,
149147
framework::dataset::make("DataType",
150148
DataType::F16)))
151149
{
@@ -156,7 +154,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerFixture<half>, framework::Data
156154
TEST_SUITE_END() // FP16
157155

158156
TEST_SUITE(FP32)
159-
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerFixture<float>, framework::DatasetMode::ALL, combine(combine(datasets::SmallShapes(), ActivationDataset), framework::dataset::make("DataType",
157+
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerFixture<float>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), ActivationDataset, framework::dataset::make("DataType",
160158
DataType::F32)))
161159
{
162160
// Validate output
@@ -168,41 +166,41 @@ TEST_SUITE_END() // Float
168166
template <typename T>
169167
using CLActivationLayerQuantizedFixture = ActivationValidationQuantizedFixture<CLTensor, CLAccessor, CLActivationLayer, T>;
170168

171-
const auto QuantizedActivationDataset8 = combine(combine(framework::dataset::make("InPlace", { false }),
169+
const auto QuantizedActivationDataset8 = combine(framework::dataset::make("InPlace", { false }),
172170
concat(datasets::ActivationFunctionsQuantized(),
173171
framework::dataset::make("ActivationFunction",
174-
{ ActivationLayerInfo::ActivationFunction::HARD_SWISH, ActivationLayerInfo::ActivationFunction::LEAKY_RELU }))),
172+
{ ActivationLayerInfo::ActivationFunction::HARD_SWISH, ActivationLayerInfo::ActivationFunction::LEAKY_RELU })),
175173
framework::dataset::make("AlphaBeta", { 0.5f, 1.f }));
176174

177-
const auto QuantizedActivationDataset16 = combine(combine(framework::dataset::make("InPlace", { false }),
178-
datasets::ActivationFunctionsQuantized()),
175+
const auto QuantizedActivationDataset16 = combine(framework::dataset::make("InPlace", { false }),
176+
datasets::ActivationFunctionsQuantized(),
179177
framework::dataset::make("AlphaBeta", { 0.5f, 1.f }));
180178

181179
TEST_SUITE(Quantized)
182180
TEST_SUITE(QASYMM8)
183-
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerQuantizedFixture<uint8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::SmallShapes(), QuantizedActivationDataset8),
181+
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerQuantizedFixture<uint8_t>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), QuantizedActivationDataset8,
184182
framework::dataset::make("DataType",
185-
DataType::QASYMM8)),
183+
DataType::QASYMM8),
186184
framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.1f, 128.0f) })))
187185
{
188186
// Validate output
189187
validate(CLAccessor(_target), _reference, tolerance(_function, _data_type));
190188
}
191189
TEST_SUITE_END() // QASYMM8
192190
TEST_SUITE(QASYMM8_SIGNED)
193-
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerQuantizedFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::SmallShapes(), QuantizedActivationDataset8),
191+
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerQuantizedFixture<int8_t>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), QuantizedActivationDataset8,
194192
framework::dataset::make("DataType",
195-
DataType::QASYMM8_SIGNED)),
193+
DataType::QASYMM8_SIGNED),
196194
framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.1f, 10.0f) })))
197195
{
198196
// Validate output
199197
validate(CLAccessor(_target), _reference, tolerance(_function, _data_type));
200198
}
201199
TEST_SUITE_END() // QASYMM8_SIGNED
202200
TEST_SUITE(QSYMM16)
203-
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerQuantizedFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::SmallShapes(), QuantizedActivationDataset16),
201+
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerQuantizedFixture<int16_t>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), QuantizedActivationDataset16,
204202
framework::dataset::make("DataType",
205-
DataType::QSYMM16)),
203+
DataType::QSYMM16),
206204
framework::dataset::make("QuantizationInfo", { QuantizationInfo(1.f / 32768.f, 0) })))
207205
{
208206
// Validate output

0 commit comments

Comments
 (0)