Skip to content

Commit ed096b0

Browse files
author
Nicholas Sielicki
committed
fix(tests): fix -Wnarrowing warnings
bad74fc re-triggered -Wnarrowing on rebase. The natural type of the array rvalue here is size_t[] because it's defined in terms of the stripe size, and the stripe size array is size_t[]. The entire rval is then implicitly converted to int[] through assignment, which causes narrowing. Offsets here should just be size_t in the first place, though, as it's what the uut is expecting. Signed-off-by: Nicholas Sielicki <nslick@amazon.com>
1 parent a50e8c9 commit ed096b0

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

tests/unit/scheduler.c

+20-20
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static inline int test_multiplexer(nccl_net_ofi_scheduler_t *scheduler,
9090
size_t msg_size,
9191
size_t num_stripes,
9292
int *rail_id,
93-
int *offset,
93+
size_t *offset,
9494
size_t *msg_size_per_stripe)
9595
{
9696
int ret = 0;
@@ -158,7 +158,7 @@ static inline int test_threshold_scheduler()
158158
size_t msg_size_per_stripe_1[6][1] =
159159
{{msg_sizes_1[0]}, {msg_sizes_1[1]}, {msg_sizes_1[2]}, {msg_sizes_1[3]}, {msg_sizes_1[4]}, {msg_sizes_1[5]}};
160160
int rail_ids_1[6][1] = {{0}, {1}, {2}, {3}, {0}, {1}}; /* In round-robin for each iteration a new rail-id is used */
161-
int offsets_1[6][1] = {{0}, {0}, {0}, {0}, {0}, {0}}; /* Offset remaines 0 in round robin */
161+
size_t offsets_1[6][1] = {{0}, {0}, {0}, {0}, {0}, {0}}; /* Offset remaines 0 in round robin */
162162
for (int iter = 0; iter < 6; iter++) {
163163
ret = test_multiplexer(scheduler,
164164
num_rails,
@@ -192,12 +192,12 @@ static inline int test_threshold_scheduler()
192192
/* For each message ensure that two rails are used. Also ensure that the rail-id pairs
193193
* are round-robin between each schedule */
194194
int rail_ids_2[6][2] = {{2, 3}, {0, 1}, {2, 3}, {0, 1}, {2, 3}, {0, 1}};
195-
int offsets_2[6][2] = {{0, stripe_size[0]},
196-
{0, stripe_size[1]},
197-
{0, stripe_size[2]},
198-
{0, stripe_size[3]},
199-
{0, stripe_size[4]},
200-
{0, stripe_size[5]}};
195+
size_t offsets_2[6][2] = {{0, stripe_size[0]},
196+
{0, stripe_size[1]},
197+
{0, stripe_size[2]},
198+
{0, stripe_size[3]},
199+
{0, stripe_size[4]},
200+
{0, stripe_size[5]}};
201201
size_t msg_size_per_stripe_2[6][2] = {{stripe_size[0], remaining_stripe_size[0]},
202202
{stripe_size[1], remaining_stripe_size[1]},
203203
{stripe_size[2], remaining_stripe_size[2]},
@@ -234,12 +234,12 @@ static inline int test_threshold_scheduler()
234234
/* For each message ensure that three rails are used. Also ensure that the rail-id triplets
235235
* are round-robin between each schedule */
236236
int rail_ids_3[6][2] = {{2, 3}, {0, 1}, {2, 3}, {0, 1}, {2, 3}, {0, 1}};
237-
int offsets_3[6][2] = {{0, (stripe_size[0] * 2) / 2},
238-
{0, (stripe_size[1] * 2) / 2},
239-
{0, (stripe_size[2] * 2) / 2},
240-
{0, (stripe_size[3] * 2) / 2},
241-
{0, (stripe_size[4] * 2) / 2},
242-
{0, (stripe_size[5] * 2) / 2}};
237+
size_t offsets_3[6][2] = {{0, (stripe_size[0] * 2) / 2},
238+
{0, (stripe_size[1] * 2) / 2},
239+
{0, (stripe_size[2] * 2) / 2},
240+
{0, (stripe_size[3] * 2) / 2},
241+
{0, (stripe_size[4] * 2) / 2},
242+
{0, (stripe_size[5] * 2) / 2}};
243243
size_t msg_size_per_stripe_3[6][2] = {{(stripe_size[0] * 2) / 2, remaining_stripe_size[0]},
244244
{(stripe_size[1] * 2) / 2, remaining_stripe_size[1]},
245245
{(stripe_size[2] * 2) / 2, remaining_stripe_size[2]},
@@ -275,12 +275,12 @@ static inline int test_threshold_scheduler()
275275
}
276276
/* For each message ensure that all four rails are used. */
277277
int rail_ids_4[6][4] = {{2, 3, 0, 1}, {2, 3, 0, 1}, {2, 3, 0, 1}, {2, 3, 0, 1}, {2, 3, 0, 1}, {2, 3, 0, 1}};
278-
int offsets_4[6][4] = {{0, stripe_size[0], stripe_size[0] * 2, stripe_size[0] * 3},
279-
{0, stripe_size[1], stripe_size[1] * 2, stripe_size[1] * 3},
280-
{0, stripe_size[2], stripe_size[2] * 2, stripe_size[2] * 3},
281-
{0, stripe_size[3], stripe_size[3] * 2, stripe_size[3] * 3},
282-
{0, stripe_size[4], stripe_size[4] * 2, stripe_size[4] * 3},
283-
{0, stripe_size[5], stripe_size[5] * 2, stripe_size[5] * 3}};
278+
size_t offsets_4[6][4] = {{0, stripe_size[0], stripe_size[0] * 2, stripe_size[0] * 3},
279+
{0, stripe_size[1], stripe_size[1] * 2, stripe_size[1] * 3},
280+
{0, stripe_size[2], stripe_size[2] * 2, stripe_size[2] * 3},
281+
{0, stripe_size[3], stripe_size[3] * 2, stripe_size[3] * 3},
282+
{0, stripe_size[4], stripe_size[4] * 2, stripe_size[4] * 3},
283+
{0, stripe_size[5], stripe_size[5] * 2, stripe_size[5] * 3}};
284284
size_t msg_size_per_stripe_4[6][4] = {{stripe_size[0], stripe_size[0], stripe_size[0], remaining_stripe_size[0]},
285285
{stripe_size[1], stripe_size[1], stripe_size[1], remaining_stripe_size[1]},
286286
{stripe_size[2], stripe_size[2], stripe_size[2], remaining_stripe_size[2]},

0 commit comments

Comments
 (0)