Skip to content

Commit 88d79e5

Browse files
morgolockmorgolock
committed
refactor: Flatten nested concat usage in validation/CL and CPP.
Updated CL/CPP validation tests to use the local make alias instead of fully qualifying framework::dataset::make. Change-Id: I363d51ad9bbf15b2e972dda0a533f2929f3a4395 Signed-off-by: Pablo Marquez Tello <[email protected]>
1 parent 6032403 commit 88d79e5

File tree

116 files changed

+3036
-2916
lines changed

Some content is hidden

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

116 files changed

+3036
-2916
lines changed

‎tests/validation/CL/AbsLayer.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019 Arm Limited.
2+
* Copyright (c) 2019, 2025 Arm Limited.
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -40,20 +40,21 @@ namespace test
4040
{
4141
namespace validation
4242
{
43+
using framework::dataset::make;
4344
TEST_SUITE(CL)
4445
TEST_SUITE(AbsLayer)
4546
template <typename T>
4647
using CLAbsLayerFixture = AbsValidationFixture<CLTensor, CLAccessor, CLAbsLayer, T>;
4748

4849
TEST_SUITE(Float)
4950
TEST_SUITE(FP16)
50-
FIXTURE_DATA_TEST_CASE(RunSmall, CLAbsLayerFixture<half>, framework::DatasetMode::PRECOMMIT, combine(datasets::SmallShapes(), framework::dataset::make("DataType",
51+
FIXTURE_DATA_TEST_CASE(RunSmall, CLAbsLayerFixture<half>, framework::DatasetMode::PRECOMMIT, combine(datasets::SmallShapes(), make("DataType",
5152
DataType::F16)))
5253
{
5354
// Validate output
5455
validate(CLAccessor(_target), _reference);
5556
}
56-
FIXTURE_DATA_TEST_CASE(RunLarge, CLAbsLayerFixture<half>, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), framework::dataset::make("DataType",
57+
FIXTURE_DATA_TEST_CASE(RunLarge, CLAbsLayerFixture<half>, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), make("DataType",
5758
DataType::F16)))
5859
{
5960
// Validate output
@@ -62,13 +63,13 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLAbsLayerFixture<half>, framework::DatasetMode
6263

6364
TEST_SUITE_END() // FP16
6465
TEST_SUITE(FP32)
65-
FIXTURE_DATA_TEST_CASE(RunSmall, CLAbsLayerFixture<float>, framework::DatasetMode::PRECOMMIT, combine(datasets::SmallShapes(), framework::dataset::make("DataType",
66+
FIXTURE_DATA_TEST_CASE(RunSmall, CLAbsLayerFixture<float>, framework::DatasetMode::PRECOMMIT, combine(datasets::SmallShapes(), make("DataType",
6667
DataType::F32)))
6768
{
6869
// Validate output
6970
validate(CLAccessor(_target), _reference);
7071
}
71-
FIXTURE_DATA_TEST_CASE(RunLarge, CLAbsLayerFixture<float>, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), framework::dataset::make("DataType",
72+
FIXTURE_DATA_TEST_CASE(RunLarge, CLAbsLayerFixture<float>, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), make("DataType",
7273
DataType::F32)))
7374
{
7475
// Validate output

‎tests/validation/CL/ActivationLayer.cpp‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ namespace test
4242
{
4343
namespace validation
4444
{
45+
using framework::dataset::make;
4546
namespace
4647
{
4748
constexpr AbsoluteTolerance<float> tolerance_qsymm16(1.f);
@@ -81,22 +82,22 @@ AbsoluteTolerance<float> tolerance(ActivationLayerInfo::ActivationFunction activ
8182
}
8283

8384
/** CNN data types */
84-
const auto CNNDataTypes = framework::dataset::make("DataType",
85+
const auto CNNDataTypes = make("DataType",
8586
{
8687
DataType::F16,
8788
DataType::F32
8889
});
8990

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

9394
} // namespace
9495

9596
TEST_SUITE(CL)
9697
TEST_SUITE(ActivationLayer)
9798
// *INDENT-OFF*
9899
// clang-format off
99-
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), // Mismatching data types
100+
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(make("InputInfo", { TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), // Mismatching data types
100101
TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32),
101102
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
102103
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QASYMM8),
@@ -106,7 +107,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(framework::dataset::ma
106107
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QSYMM16),
107108
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QSYMM16), // Invalid activation function for QSYMM16
108109
}),
109-
framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F16),
110+
make("OutputInfo",{ TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F16),
110111
TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32),
111112
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
112113
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QASYMM8),
@@ -116,7 +117,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(framework::dataset::ma
116117
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QSYMM16, QuantizationInfo(1.f / 32768.f, 0)),
117118
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QSYMM16, QuantizationInfo(1.f / 32768.f, 0)),
118119
}),
119-
framework::dataset::make("ActivationInfo", { ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
120+
make("ActivationInfo", { ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
120121
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
121122
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
122123
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::LU_BOUNDED_RELU),
@@ -126,7 +127,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(framework::dataset::ma
126127
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::LOGISTIC),
127128
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::SQRT),
128129
}),
129-
framework::dataset::make("Expected", { false, true, true, true, false, false, true, true, false })),
130+
make("Expected", { false, true, true, true, false, false, true, true, false })),
130131
input_info, output_info, act_info, expected)
131132
{
132133
ARM_COMPUTE_EXPECT(bool(CLActivationLayer::validate(&input_info.clone()->set_is_resizable(false), (output_info.total_size() == 0) ? nullptr : &output_info.clone()->set_is_resizable(false), act_info)) == expected, framework::LogLevel::ERRORS);
@@ -144,7 +145,7 @@ TEST_SUITE(Float)
144145
TEST_SUITE(FP16)
145146
/** [CLActivationLayer Test snippet] **/
146147
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerFixture<half>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), ActivationDataset,
147-
framework::dataset::make("DataType",
148+
make("DataType",
148149
DataType::F16)))
149150
{
150151
// Validate output
@@ -154,7 +155,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerFixture<half>, framework::Data
154155
TEST_SUITE_END() // FP16
155156

156157
TEST_SUITE(FP32)
157-
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerFixture<float>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), ActivationDataset, framework::dataset::make("DataType",
158+
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerFixture<float>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), ActivationDataset, make("DataType",
158159
DataType::F32)))
159160
{
160161
// Validate output
@@ -166,42 +167,42 @@ TEST_SUITE_END() // Float
166167
template <typename T>
167168
using CLActivationLayerQuantizedFixture = ActivationValidationQuantizedFixture<CLTensor, CLAccessor, CLActivationLayer, T>;
168169

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

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

179180
TEST_SUITE(Quantized)
180181
TEST_SUITE(QASYMM8)
181182
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerQuantizedFixture<uint8_t>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), QuantizedActivationDataset8,
182-
framework::dataset::make("DataType",
183+
make("DataType",
183184
DataType::QASYMM8),
184-
framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.1f, 128.0f) })))
185+
make("QuantizationInfo", { QuantizationInfo(0.1f, 128.0f) })))
185186
{
186187
// Validate output
187188
validate(CLAccessor(_target), _reference, tolerance(_function, _data_type));
188189
}
189190
TEST_SUITE_END() // QASYMM8
190191
TEST_SUITE(QASYMM8_SIGNED)
191192
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerQuantizedFixture<int8_t>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), QuantizedActivationDataset8,
192-
framework::dataset::make("DataType",
193+
make("DataType",
193194
DataType::QASYMM8_SIGNED),
194-
framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.1f, 10.0f) })))
195+
make("QuantizationInfo", { QuantizationInfo(0.1f, 10.0f) })))
195196
{
196197
// Validate output
197198
validate(CLAccessor(_target), _reference, tolerance(_function, _data_type));
198199
}
199200
TEST_SUITE_END() // QASYMM8_SIGNED
200201
TEST_SUITE(QSYMM16)
201202
FIXTURE_DATA_TEST_CASE(RunSmall, CLActivationLayerQuantizedFixture<int16_t>, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), QuantizedActivationDataset16,
202-
framework::dataset::make("DataType",
203+
make("DataType",
203204
DataType::QSYMM16),
204-
framework::dataset::make("QuantizationInfo", { QuantizationInfo(1.f / 32768.f, 0) })))
205+
make("QuantizationInfo", { QuantizationInfo(1.f / 32768.f, 0) })))
205206
{
206207
// Validate output
207208
validate(CLAccessor(_target), _reference, tolerance_qsymm16);

0 commit comments

Comments
 (0)