Skip to content

Commit dee9b0d

Browse files
dsharletgxnnpack-bot
dsharletg
authored and
xnnpack-bot
committed
Remove 'variant' from argmaxpool tester, it is unused
PiperOrigin-RevId: 728088414
1 parent de5a083 commit dee9b0d

File tree

3 files changed

+42
-49
lines changed

3 files changed

+42
-49
lines changed

‎test/argmaxpool-microkernel-tester.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222

2323
class ArgMaxPoolMicrokernelTester {
2424
public:
25-
enum class Variant {
26-
Native,
27-
Scalar,
28-
};
29-
3025
ArgMaxPoolMicrokernelTester& output_pixels(size_t output_pixels) {
3126
assert(output_pixels != 0);
3227
this->output_pixels_ = output_pixels;
@@ -143,7 +138,7 @@ class ArgMaxPoolMicrokernelTester {
143138
return this->iterations_;
144139
}
145140

146-
void Test(xnn_f32_argmaxpool_unipass_ukernel_fn argmaxpool, Variant variant = Variant::Native) const {
141+
void Test(xnn_f32_argmaxpool_unipass_ukernel_fn argmaxpool) const {
147142
xnnpack::ReplicableRandomDevice rng;
148143
std::uniform_real_distribution<float> f32dist;
149144

@@ -208,7 +203,7 @@ class ArgMaxPoolMicrokernelTester {
208203
}
209204
}
210205

211-
void Test(xnn_f32_argmaxpool_multipass_ukernel_fn argmaxpool, Variant variant = Variant::Native) const {
206+
void Test(xnn_f32_argmaxpool_multipass_ukernel_fn argmaxpool) const {
212207
xnnpack::ReplicableRandomDevice rng;
213208
std::uniform_real_distribution<float> f32dist;
214209

‎test/f32-argmaxpool.cc

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, channels_eq_1_unipass_fulltile) {
11051105
.pooling_elements(4)
11061106
.pooling_tile(4)
11071107
.channels(channel_tile)
1108-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1108+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
11091109
}
11101110

11111111
TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, channels_eq_1_unipass_fulltile_with_input_offset) {
@@ -1115,7 +1115,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, channels_eq_1_unipass_fulltile_with_input_off
11151115
.pooling_tile(4)
11161116
.channels(channel_tile)
11171117
.input_offset(3)
1118-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1118+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
11191119
}
11201120

11211121
TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, channels_eq_1_unipass_subtile) {
@@ -1125,7 +1125,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, channels_eq_1_unipass_subtile) {
11251125
.pooling_elements(pooling_elements)
11261126
.pooling_tile(4)
11271127
.channels(channel_tile)
1128-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1128+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
11291129
}
11301130
}
11311131

@@ -1137,7 +1137,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, channels_eq_1_unipass_subtile_with_input_offs
11371137
.pooling_tile(4)
11381138
.channels(channel_tile)
11391139
.input_offset(3)
1140-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1140+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
11411141
}
11421142
}
11431143

@@ -1147,7 +1147,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, channels_gt_1_unipass_fulltile) {
11471147
.pooling_elements(4)
11481148
.pooling_tile(4)
11491149
.channels(channels)
1150-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1150+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
11511151
}
11521152
}
11531153

@@ -1158,7 +1158,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, channels_gt_1_unipass_fulltile_with_input_off
11581158
.pooling_tile(4)
11591159
.channels(channels)
11601160
.input_offset(3)
1161-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1161+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
11621162
}
11631163
}
11641164

@@ -1169,7 +1169,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, channels_gt_1_unipass_subtile) {
11691169
.pooling_elements(pooling_elements)
11701170
.pooling_tile(4)
11711171
.channels(channels)
1172-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1172+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
11731173
}
11741174
}
11751175
}
@@ -1182,7 +1182,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, channels_gt_1_unipass_subtile_with_input_offs
11821182
.pooling_tile(4)
11831183
.channels(channels)
11841184
.input_offset(3)
1185-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1185+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
11861186
}
11871187
}
11881188
}
@@ -1196,7 +1196,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, few_output_pixels) {
11961196
.pooling_elements(pooling_elements)
11971197
.pooling_tile(4)
11981198
.channels(channels)
1199-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1199+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
12001200
}
12011201
}
12021202
}
@@ -1212,7 +1212,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, few_output_pixels_with_input_offset) {
12121212
.pooling_tile(4)
12131213
.channels(channels)
12141214
.input_offset(7)
1215-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1215+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
12161216
}
12171217
}
12181218
}
@@ -1228,7 +1228,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, few_output_pixels_with_output_stride) {
12281228
.pooling_tile(4)
12291229
.channels(channels)
12301230
.output_stride(7)
1231-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1231+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
12321232
}
12331233
}
12341234
}
@@ -1246,7 +1246,7 @@ TEST(F32_ARGMAXPOOL_4X__SCALAR_C1, few_output_pixels_with_step) {
12461246
.step(step)
12471247
.channels(channels)
12481248
.output_stride(7)
1249-
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
1249+
.Test(xnn_f32_argmaxpool_ukernel_4x__scalar_c1);
12501250
}
12511251
}
12521252
}
@@ -2343,7 +2343,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, channels_eq_1_unipass_fulltile) {
23432343
.pooling_elements(9)
23442344
.pooling_tile(9)
23452345
.channels(channel_tile)
2346-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2346+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
23472347
}
23482348

23492349
TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, channels_eq_1_unipass_fulltile_with_input_offset) {
@@ -2353,7 +2353,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, channels_eq_1_unipass_fulltile_with_input_off
23532353
.pooling_tile(9)
23542354
.channels(channel_tile)
23552355
.input_offset(3)
2356-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2356+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
23572357
}
23582358

23592359
TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, channels_eq_1_unipass_subtile) {
@@ -2363,7 +2363,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, channels_eq_1_unipass_subtile) {
23632363
.pooling_elements(pooling_elements)
23642364
.pooling_tile(9)
23652365
.channels(channel_tile)
2366-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2366+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
23672367
}
23682368
}
23692369

@@ -2375,7 +2375,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, channels_eq_1_unipass_subtile_with_input_offs
23752375
.pooling_tile(9)
23762376
.channels(channel_tile)
23772377
.input_offset(3)
2378-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2378+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
23792379
}
23802380
}
23812381

@@ -2385,7 +2385,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, channels_gt_1_unipass_fulltile) {
23852385
.pooling_elements(9)
23862386
.pooling_tile(9)
23872387
.channels(channels)
2388-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2388+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
23892389
}
23902390
}
23912391

@@ -2396,7 +2396,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, channels_gt_1_unipass_fulltile_with_input_off
23962396
.pooling_tile(9)
23972397
.channels(channels)
23982398
.input_offset(3)
2399-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2399+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
24002400
}
24012401
}
24022402

@@ -2407,7 +2407,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, channels_gt_1_unipass_subtile) {
24072407
.pooling_elements(pooling_elements)
24082408
.pooling_tile(9)
24092409
.channels(channels)
2410-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2410+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
24112411
}
24122412
}
24132413
}
@@ -2420,7 +2420,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, channels_gt_1_unipass_subtile_with_input_offs
24202420
.pooling_tile(9)
24212421
.channels(channels)
24222422
.input_offset(3)
2423-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2423+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
24242424
}
24252425
}
24262426
}
@@ -2434,7 +2434,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, few_output_pixels) {
24342434
.pooling_elements(pooling_elements)
24352435
.pooling_tile(9)
24362436
.channels(channels)
2437-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2437+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
24382438
}
24392439
}
24402440
}
@@ -2450,7 +2450,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, few_output_pixels_with_input_offset) {
24502450
.pooling_tile(9)
24512451
.channels(channels)
24522452
.input_offset(7)
2453-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2453+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
24542454
}
24552455
}
24562456
}
@@ -2466,7 +2466,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, few_output_pixels_with_output_stride) {
24662466
.pooling_tile(9)
24672467
.channels(channels)
24682468
.output_stride(7)
2469-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2469+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
24702470
}
24712471
}
24722472
}
@@ -2484,7 +2484,7 @@ TEST(F32_ARGMAXPOOL_9X__SCALAR_C1, few_output_pixels_with_step) {
24842484
.step(step)
24852485
.channels(channels)
24862486
.output_stride(7)
2487-
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
2487+
.Test(xnn_f32_argmaxpool_ukernel_9x__scalar_c1);
24882488
}
24892489
}
24902490
}
@@ -4014,7 +4014,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_eq_1_twopass_fulltile) {
40144014
.pooling_elements(17)
40154015
.pooling_tile(9, 8)
40164016
.channels(channel_tile)
4017-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4017+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
40184018
}
40194019

40204020
TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_eq_1_twopass_fulltile_with_input_offset) {
@@ -4024,7 +4024,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_eq_1_twopass_fulltile_with_input_o
40244024
.pooling_tile(9, 8)
40254025
.channels(channel_tile)
40264026
.input_offset(3)
4027-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4027+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
40284028
}
40294029

40304030
TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_eq_1_twopass_subtile) {
@@ -4034,7 +4034,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_eq_1_twopass_subtile) {
40344034
.pooling_elements(pooling_elements)
40354035
.pooling_tile(9, 8)
40364036
.channels(channel_tile)
4037-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4037+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
40384038
}
40394039
}
40404040

@@ -4046,7 +4046,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_eq_1_twopass_subtile_with_input_of
40464046
.pooling_tile(9, 8)
40474047
.channels(channel_tile)
40484048
.input_offset(3)
4049-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4049+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
40504050
}
40514051
}
40524052

@@ -4056,7 +4056,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_gt_1_twopass_fulltile) {
40564056
.pooling_elements(17)
40574057
.pooling_tile(9, 8)
40584058
.channels(channels)
4059-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4059+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
40604060
}
40614061
}
40624062

@@ -4067,7 +4067,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_gt_1_twopass_fulltile_with_input_o
40674067
.pooling_tile(9, 8)
40684068
.channels(channels)
40694069
.input_offset(3)
4070-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4070+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
40714071
}
40724072
}
40734073

@@ -4078,7 +4078,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_gt_1_twopass_subtile) {
40784078
.pooling_elements(17)
40794079
.pooling_tile(9, 8)
40804080
.channels(channels)
4081-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4081+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
40824082
}
40834083
}
40844084
}
@@ -4091,7 +4091,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_gt_1_twopass_subtile_with_input_of
40914091
.pooling_tile(9, 8)
40924092
.channels(channels)
40934093
.input_offset(3)
4094-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4094+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
40954095
}
40964096
}
40974097
}
@@ -4103,7 +4103,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_eq_1_multipass) {
41034103
.pooling_elements(17)
41044104
.pooling_tile(9, 8)
41054105
.channels(channel_tile)
4106-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4106+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
41074107
}
41084108
}
41094109

@@ -4115,7 +4115,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_eq_1_multipass_with_input_offset)
41154115
.pooling_tile(9, 8)
41164116
.channels(channel_tile)
41174117
.input_offset(3)
4118-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4118+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
41194119
}
41204120
}
41214121

@@ -4126,7 +4126,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_gt_1_multipass) {
41264126
.pooling_elements(17)
41274127
.pooling_tile(9, 8)
41284128
.channels(channels)
4129-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4129+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
41304130
}
41314131
}
41324132
}
@@ -4139,7 +4139,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, channels_gt_1_multipass_with_input_offset)
41394139
.pooling_tile(9, 8)
41404140
.channels(channels)
41414141
.input_offset(3)
4142-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4142+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
41434143
}
41444144
}
41454145
}
@@ -4153,7 +4153,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, few_output_pixels) {
41534153
.pooling_elements(pooling_elements)
41544154
.pooling_tile(9, 8)
41554155
.channels(channels)
4156-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4156+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
41574157
}
41584158
}
41594159
}
@@ -4169,7 +4169,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, few_output_pixels_with_input_offset) {
41694169
.pooling_tile(9, 8)
41704170
.channels(channels)
41714171
.input_offset(7)
4172-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4172+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
41734173
}
41744174
}
41754175
}
@@ -4185,7 +4185,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, few_output_pixels_with_output_stride) {
41854185
.pooling_tile(9, 8)
41864186
.channels(channels)
41874187
.output_stride(7)
4188-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4188+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
41894189
}
41904190
}
41914191
}
@@ -4203,7 +4203,7 @@ TEST(F32_ARGMAXPOOL_9P8X__SCALAR_C1, few_output_pixels_with_step) {
42034203
.step(step)
42044204
.channels(channels)
42054205
.output_stride(7)
4206-
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1, ArgMaxPoolMicrokernelTester::Variant::Scalar);
4206+
.Test(xnn_f32_argmaxpool_ukernel_9p8x__scalar_c1);
42074207
}
42084208
}
42094209
}

‎tools/generate-argmaxpool-test.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -991,8 +991,6 @@ def generate_test_cases(ukernel, primary_tile, incremental_tile, channel_tile,
991991
_, test_name = ukernel.split("_", 1)
992992
_, datatype, ukernel_type, _ = ukernel.split("_", 3)
993993
test_args = [ukernel]
994-
if not isa:
995-
test_args.append("ArgMaxPoolMicrokernelTester::Variant::Scalar")
996994
channel_scaled_tile = channel_tile
997995
if vector_tile:
998996
ctype = {"f16": "uint16_t", "f32": "float"}[datatype]

0 commit comments

Comments
 (0)