Skip to content

Commit 5d011ee

Browse files
morgolockmorgolock
committed
refactor: Flatten nested zip usage in validation/NEON.
Change-Id: Ibcee6150c876f7d7f0022ef5e22a37f1ecacb8ba Signed-off-by: Pablo Marquez Tello <pablo.tello@arm.com>
1 parent 0d69ce5 commit 5d011ee

79 files changed

Lines changed: 577 additions & 456 deletions

File tree

Some content is hidden

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

‎tests/validation/NEON/ActivationLayer.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,20 +162,21 @@ TEST_CASE(ActivationAPI, framework::DatasetMode::ALL)
162162

163163
// *INDENT-OFF*
164164
// clang-format off
165-
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(
165+
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(
166166
framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), // Mismatching data types
167167
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
168168
TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), // Mismatching shapes
169169
}),
170170
framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F16),
171171
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
172172
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
173-
})),
173+
}),
174174
framework::dataset::make("ActivationInfo", { ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
175175
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
176176
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
177-
})),
178-
framework::dataset::make("Expected", { false, true, false})),
177+
}),
178+
framework::dataset::make("Expected", { false, true, false})
179+
),
179180
input_info, output_info, act_info, expected)
180181
{
181182
bool is_valid = bool(NEActivationLayer::validate(&input_info.clone()->set_is_resizable(false), &output_info.clone()->set_is_resizable(false), act_info));

‎tests/validation/NEON/ArgMinMax.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ TEST_SUITE(ArgMinMax)
6969

7070
// *INDENT-OFF*
7171
// clang-format off
72-
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip(
72+
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(
7373
framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 3U, 16U, 2U), 1, DataType::F32), // Invalid axis
7474
TensorInfo(TensorShape(27U, 3U, 16U, 2U), 1, DataType::F32), // Invalid output shape
7575
TensorInfo(TensorShape(32U, 16U, 16U, 2U), 1, DataType::F32),
@@ -79,10 +79,11 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip(
7979
TensorInfo(TensorShape(27U, 3U, 1U, 2U), 1, DataType::F32),
8080
TensorInfo(TensorShape(32U, 16U, 2U), 1, DataType::S32),
8181
TensorInfo(TensorShape(32U, 16U, 1U, 2U), 1, DataType::F32)
82-
})),
83-
framework::dataset::make("Axis", { 4, 0, 2, 0 })),
84-
framework::dataset::make("Operation", { ReductionOperation::ARG_IDX_MAX, ReductionOperation::ARG_IDX_MAX, ReductionOperation::ARG_IDX_MAX, ReductionOperation::MEAN_SUM })),
85-
framework::dataset::make("Expected", { false, false, true, false })),
82+
}),
83+
framework::dataset::make("Axis", { 4, 0, 2, 0 }),
84+
framework::dataset::make("Operation", { ReductionOperation::ARG_IDX_MAX, ReductionOperation::ARG_IDX_MAX, ReductionOperation::ARG_IDX_MAX, ReductionOperation::MEAN_SUM }),
85+
framework::dataset::make("Expected", { false, false, true, false })
86+
),
8687
input_info, output_info, axis, operation, expected)
8788
{
8889
const Status status = NEArgMinMaxLayer::validate(&input_info.clone()->set_is_resizable(false), axis, &output_info.clone()->set_is_resizable(false), operation);

‎tests/validation/NEON/ArithmeticAddition.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ using NEArithmeticAdditionFixture = ArithmeticAdditionValidationFixture<Tensor,
6565

6666
// *INDENT-OFF*
6767
// clang-format off
68-
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(
68+
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(
6969
framework::dataset::make("Input1Info", { TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
7070
TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::U8), // Unsupported broadcast
7171
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), // Invalid data type combination
@@ -75,13 +75,14 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(
7575
TensorInfo(TensorShape(1U, 13U, 2U), 1, DataType::S16),
7676
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::S16),
7777
TensorInfo(TensorShape(48U, 11U, 2U), 1, DataType::F32),
78-
})),
78+
}),
7979
framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
8080
TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::S16),
8181
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8),
8282
TensorInfo(TensorShape(48U, 11U, 2U), 1, DataType::F32),
83-
})),
84-
framework::dataset::make("Expected", { true, false, false, false})),
83+
}),
84+
framework::dataset::make("Expected", { true, false, false, false})
85+
),
8586
input1_info, input2_info, output_info, expected)
8687
{
8788
Status s = NEArithmeticAddition::validate(&input1_info.clone()->set_is_resizable(false),

‎tests/validation/NEON/ArithmeticSubtraction.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ using NEArithmeticSubtractionBroadcastFixture = ArithmeticSubtractionBroadcastVa
119119

120120
// *INDENT-OFF*
121121
// clang-format off
122-
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip(
122+
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(
123123
framework::dataset::make("Input1Info", { TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
124124
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), // Invalid data type combination
125125
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), // Mismatching shapes
@@ -131,20 +131,21 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip(
131131
TensorInfo(TensorShape(48U, 11U, 2U), 1, DataType::F32),
132132
TensorInfo(TensorShape(48U, 11U, 2U), 1, DataType::F32),
133133
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QASYMM8),
134-
})),
134+
}),
135135
framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
136136
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8),
137137
TensorInfo(TensorShape(48U, 11U, 2U), 1, DataType::F32),
138138
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QASYMM8),
139139
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::QASYMM8),
140-
})),
140+
}),
141141
framework::dataset::make("ConvertPolicy",{ ConvertPolicy::SATURATE,
142142
ConvertPolicy::SATURATE,
143143
ConvertPolicy::WRAP,
144144
ConvertPolicy::WRAP,
145145
ConvertPolicy::WRAP,
146-
})),
147-
framework::dataset::make("Expected", { true, false, false, false, false})),
146+
}),
147+
framework::dataset::make("Expected", { true, false, false, false, false})
148+
),
148149
input1_info, input2_info, output_info, policy, expected)
149150
{
150151
ARM_COMPUTE_EXPECT(bool(NEArithmeticSubtraction::validate(&input1_info.clone()->set_is_resizable(false), &input2_info.clone()->set_is_resizable(false), &output_info.clone()->set_is_resizable(false), policy)) == expected, framework::LogLevel::ERRORS);

‎tests/validation/NEON/BatchConcatenateLayer.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ TEST_SUITE(BatchConcatenateLayer)
4444

4545
// *INDENT-OFF*
4646
// clang-format off
47-
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(
47+
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(
4848
framework::dataset::make("InputInfo1", { TensorInfo(TensorShape(23U, 27U, 5U, 4U), 1, DataType::F32), // Mismatching data type input/output
4949
TensorInfo(TensorShape(20U, 27U, 4U, 4U), 1, DataType::F32), // Mismatching x dimension
5050
TensorInfo(TensorShape(23U, 26U, 4U, 3U), 1, DataType::F32), // Mismatching y dim
@@ -56,14 +56,15 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(
5656
TensorInfo(TensorShape(23U, 27U, 4U, 4U), 1, DataType::F32),
5757
TensorInfo(TensorShape(23U, 27U, 3U, 3U), 1, DataType::F32),
5858
TensorInfo(TensorShape(16U, 27U, 3U, 6U), 1, DataType::F32)
59-
})),
59+
}),
6060
framework::dataset::make("OutputInfo", { TensorInfo(TensorShape(23U, 27U, 5U, 4U), 1, DataType::F16),
6161
TensorInfo(TensorShape(23U, 12U, 4U, 4U), 1, DataType::F32),
6262
TensorInfo(TensorShape(23U, 27U, 4U, 4U), 1, DataType::F32),
6363
TensorInfo(TensorShape(23U, 20U, 4U, 3U), 1, DataType::F32),
6464
TensorInfo(TensorShape(16U, 27U, 3U, 12U), 1, DataType::F32)
65-
})),
66-
framework::dataset::make("Expected", { false, false, false, false, true })),
65+
}),
66+
framework::dataset::make("Expected", { false, false, false, false, true })
67+
),
6768
input_info1, input_info2, output_info,expected)
6869
{
6970
std::vector<TensorInfo> inputs_vector_info;

‎tests/validation/NEON/BatchNormalizationLayer.cpp‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ using NEBatchNormalizationLayerFixture = BatchNormalizationLayerValidationFixtur
7676

7777
// *INDENT-OFF*
7878
// clang-format off
79-
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip(
79+
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(
8080
framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32),
8181
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), // Mismatching data types
8282
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), // Mismatching data types
@@ -88,20 +88,21 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip(
8888
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F16),
8989
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
9090
TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32),
91-
})),
91+
}),
9292
framework::dataset::make("MVBGInfo",{ TensorInfo(TensorShape(2U), 1, DataType::F32),
9393
TensorInfo(TensorShape(2U), 1, DataType::F16),
9494
TensorInfo(TensorShape(2U), 1, DataType::F32),
9595
TensorInfo(TensorShape(5U), 1, DataType::F32),
9696
TensorInfo(TensorShape(2U), 1, DataType::F32),
97-
})),
97+
}),
9898
framework::dataset::make("ActivationLayerInfo",{ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
9999
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::BOUNDED_RELU, 6.f),
100100
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::BOUNDED_RELU, 6.f),
101101
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::LU_BOUNDED_RELU, 6.f),
102102
ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::LU_BOUNDED_RELU, 2.f, 6.f),
103-
})),
104-
framework::dataset::make("Expected", { true, false, false, false, false})),
103+
}),
104+
framework::dataset::make("Expected", { true, false, false, false, false})
105+
),
105106
input_info, output_info, mvbg_info, act_info, expected)
106107
{
107108
const auto &mean_info = mvbg_info;
@@ -189,7 +190,7 @@ using NEBatchNormalizationLayerFusionFixture = BatchNormalizationLayerFusionVali
189190

190191
// *INDENT-OFF*
191192
// clang-format off
192-
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(
193+
DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(
193194
framework::dataset::make("Weights", { TensorInfo(TensorShape(32U, 13U, 2U, 2U), 1, DataType::F32), // Valid
194195
TensorInfo(TensorShape(32U, 13U, 2U, 2U), 1, DataType::F32), // Mismatching data types
195196
TensorInfo(TensorShape(32U, 13U, 2U, 2U), 1, DataType::F16), // Mismatching data types
@@ -199,8 +200,9 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(
199200
TensorInfo(TensorShape(2U), 1, DataType::F16),
200201
TensorInfo(TensorShape(2U), 1, DataType::F32),
201202
TensorInfo(TensorShape(5U), 1, DataType::F32),
202-
})),
203-
framework::dataset::make("Expected", { true, false, false, false})),
203+
}),
204+
framework::dataset::make("Expected", { true, false, false, false})
205+
),
204206
weights_info, mvbg_info, expected)
205207
{
206208
const auto &weights_in_info = weights_info;

‎tests/validation/NEON/BatchToSpaceLayer.cpp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ using NEBatchToSpaceLayerFixture = BatchToSpaceLayerValidationFixture<Tensor, Ac
4949

5050
// *INDENT-OFF*
5151
// clang-format off
52-
DATA_TEST_CASE(ValidateStatic, framework::DatasetMode::ALL, zip(zip(zip(zip(zip(
52+
DATA_TEST_CASE(ValidateStatic, framework::DatasetMode::ALL, zip(
5353
framework::dataset::make("InputInfo", { TensorInfo(TensorShape(16U, 8U, 2U, 4U), 1, DataType::F32),
5454
TensorInfo(TensorShape(16U, 8U, 2U, 16U), 1, DataType::F32), // Supported: blockx != blocky && blockx > blocky
5555
TensorInfo(TensorShape(16U, 8U, 2U, 16U), 1, DataType::F32), // Supported: blockx != blocky && blocky > blockx
@@ -61,11 +61,11 @@ DATA_TEST_CASE(ValidateStatic, framework::DatasetMode::ALL, zip(zip(zip(zip(zip(
6161
TensorInfo(TensorShape(16U, 8U, 2U, 16U), 1, DataType::F32), // Supported: correct tensor shape with cropping
6262
TensorInfo(TensorShape(16U, 8U, 2U, 16U), 1, DataType::F32), // Invalid tensor shape with cropping
6363
}),
64-
framework::dataset::make("BlockShapeX", { 2, 4, 2, 2, 2, 2, 2, 2, 2, 2 })),
65-
framework::dataset::make("BlockShapeY", { 2, 2, 4, 2, -2, 2, 2, 2, 2, 2 })),
64+
framework::dataset::make("BlockShapeX", { 2, 4, 2, 2, 2, 2, 2, 2, 2, 2 }),
65+
framework::dataset::make("BlockShapeY", { 2, 2, 4, 2, -2, 2, 2, 2, 2, 2 }),
6666
framework::dataset::make("CropInfo", {
6767
CropInfo{}, CropInfo{}, CropInfo{}, CropInfo{}, CropInfo{}, CropInfo{}, CropInfo{}, CropInfo{}, CropInfo{3, 2, 1, 3}, CropInfo{3, 2, 1, 3}
68-
})),
68+
}),
6969
framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(32U, 16U, 2U, 1U), 1, DataType::F32),
7070
TensorInfo(TensorShape(64U, 16U, 2U, 2U), 1, DataType::F32),
7171
TensorInfo(TensorShape(32U, 32U, 2U, 2U), 1, DataType::F32),
@@ -76,8 +76,9 @@ DATA_TEST_CASE(ValidateStatic, framework::DatasetMode::ALL, zip(zip(zip(zip(zip(
7676
TensorInfo(TensorShape(33U, 32U, 2U, 4U), 1, DataType::F32),
7777
TensorInfo(TensorShape(27, 12U, 2U, 4U), 1, DataType::F32),
7878
TensorInfo(TensorShape(32U, 16U, 2U, 4U), 1, DataType::F32),
79-
})),
80-
framework::dataset::make("Expected", { true, true, true, false, false, false, false, false, true, false})),
79+
}),
80+
framework::dataset::make("Expected", { true, true, true, false, false, false, false, false, true, false})
81+
),
8182
input_info, block_shape_x, block_shape_y, crop_info, output_info, expected)
8283
{
8384
bool has_error = bool(NEBatchToSpaceLayer::validate(&input_info.clone()->set_is_resizable(false), block_shape_x, block_shape_y, &output_info.clone()->set_is_resizable(false), crop_info));

0 commit comments

Comments
 (0)