Skip to content

Commit

Permalink
fix(tests): fix -Wnarrowing warnings
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Nicholas Sielicki committed Oct 9, 2024
1 parent 387f304 commit 2299e9c
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions tests/unit/scheduler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static inline int test_multiplexer(nccl_net_ofi_scheduler_t *scheduler,
size_t msg_size,
size_t num_stripes,
int *rail_id,
int *offset,
size_t *offset,
size_t *msg_size_per_stripe)
{
int ret = 0;
Expand Down Expand Up @@ -158,7 +158,7 @@ static inline int test_threshold_scheduler()
size_t msg_size_per_stripe_1[6][1] =
{{msg_sizes_1[0]}, {msg_sizes_1[1]}, {msg_sizes_1[2]}, {msg_sizes_1[3]}, {msg_sizes_1[4]}, {msg_sizes_1[5]}};
int rail_ids_1[6][1] = {{0}, {1}, {2}, {3}, {0}, {1}}; /* In round-robin for each iteration a new rail-id is used */
int offsets_1[6][1] = {{0}, {0}, {0}, {0}, {0}, {0}}; /* Offset remaines 0 in round robin */
size_t offsets_1[6][1] = {{0}, {0}, {0}, {0}, {0}, {0}}; /* Offset remaines 0 in round robin */
for (int iter = 0; iter < 6; iter++) {
ret = test_multiplexer(scheduler,
num_rails,
Expand Down Expand Up @@ -192,12 +192,12 @@ static inline int test_threshold_scheduler()
/* For each message ensure that two rails are used. Also ensure that the rail-id pairs
* are round-robin between each schedule */
int rail_ids_2[6][2] = {{2, 3}, {0, 1}, {2, 3}, {0, 1}, {2, 3}, {0, 1}};
int offsets_2[6][2] = {{0, stripe_size[0]},
{0, stripe_size[1]},
{0, stripe_size[2]},
{0, stripe_size[3]},
{0, stripe_size[4]},
{0, stripe_size[5]}};
size_t offsets_2[6][2] = {{0, stripe_size[0]},
{0, stripe_size[1]},
{0, stripe_size[2]},
{0, stripe_size[3]},
{0, stripe_size[4]},
{0, stripe_size[5]}};
size_t msg_size_per_stripe_2[6][2] = {{stripe_size[0], remaining_stripe_size[0]},
{stripe_size[1], remaining_stripe_size[1]},
{stripe_size[2], remaining_stripe_size[2]},
Expand Down Expand Up @@ -234,12 +234,12 @@ static inline int test_threshold_scheduler()
/* For each message ensure that three rails are used. Also ensure that the rail-id triplets
* are round-robin between each schedule */
int rail_ids_3[6][3] = {{2, 3, 0}, {1, 2, 3}, {0, 1, 2}, {3, 0, 1}, {2, 3, 0}, {1, 2, 3}};
int offsets_3[6][3] = {{0, stripe_size[0], stripe_size[0] * 2},
{0, stripe_size[1], stripe_size[1] * 2},
{0, stripe_size[2], stripe_size[2] * 2},
{0, stripe_size[3], stripe_size[3] * 2},
{0, stripe_size[4], stripe_size[4] * 2},
{0, stripe_size[5], stripe_size[5] * 2}};
size_t offsets_3[6][3] = {{0, stripe_size[0], stripe_size[0] * 2},
{0, stripe_size[1], stripe_size[1] * 2},
{0, stripe_size[2], stripe_size[2] * 2},
{0, stripe_size[3], stripe_size[3] * 2},
{0, stripe_size[4], stripe_size[4] * 2},
{0, stripe_size[5], stripe_size[5] * 2}};
size_t msg_size_per_stripe_3[6][3] = {{stripe_size[0], stripe_size[0], remaining_stripe_size[0]},
{stripe_size[1], stripe_size[1], remaining_stripe_size[1]},
{stripe_size[2], stripe_size[2], remaining_stripe_size[2]},
Expand Down Expand Up @@ -275,12 +275,12 @@ static inline int test_threshold_scheduler()
}
/* For each message ensure that all four rails are used. */
int rail_ids_4[6][4] = {{0, 1, 2, 3}, {0, 1, 2, 3}, {0, 1, 2, 3}, {0, 1, 2, 3}, {0, 1, 2, 3}, {0, 1, 2, 3}};
int offsets_4[6][4] = {{0, stripe_size[0], stripe_size[0] * 2, stripe_size[0] * 3},
{0, stripe_size[1], stripe_size[1] * 2, stripe_size[1] * 3},
{0, stripe_size[2], stripe_size[2] * 2, stripe_size[2] * 3},
{0, stripe_size[3], stripe_size[3] * 2, stripe_size[3] * 3},
{0, stripe_size[4], stripe_size[4] * 2, stripe_size[4] * 3},
{0, stripe_size[5], stripe_size[5] * 2, stripe_size[5] * 3}};
size_t offsets_4[6][4] = {{0, stripe_size[0], stripe_size[0] * 2, stripe_size[0] * 3},
{0, stripe_size[1], stripe_size[1] * 2, stripe_size[1] * 3},
{0, stripe_size[2], stripe_size[2] * 2, stripe_size[2] * 3},
{0, stripe_size[3], stripe_size[3] * 2, stripe_size[3] * 3},
{0, stripe_size[4], stripe_size[4] * 2, stripe_size[4] * 3},
{0, stripe_size[5], stripe_size[5] * 2, stripe_size[5] * 3}};
size_t msg_size_per_stripe_4[6][4] = {{stripe_size[0], stripe_size[0], stripe_size[0], remaining_stripe_size[0]},
{stripe_size[1], stripe_size[1], stripe_size[1], remaining_stripe_size[1]},
{stripe_size[2], stripe_size[2], stripe_size[2], remaining_stripe_size[2]},
Expand Down

0 comments on commit 2299e9c

Please sign in to comment.