From fc2870779e1598f04a37e3f57e983014f8a4efcf Mon Sep 17 00:00:00 2001 From: Nicholas Sielicki Date: Tue, 8 Oct 2024 12:46:02 -0700 Subject: [PATCH] fix(tests): fix -Wnarrowing warnings bad74fcc 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 --- tests/unit/scheduler.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/unit/scheduler.c b/tests/unit/scheduler.c index fc656bf59..108f1372f 100644 --- a/tests/unit/scheduler.c +++ b/tests/unit/scheduler.c @@ -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; @@ -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, @@ -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]}, @@ -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]}, @@ -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]},