@@ -90,7 +90,7 @@ static inline int test_multiplexer(nccl_net_ofi_scheduler_t *scheduler,
90
90
size_t msg_size ,
91
91
size_t num_stripes ,
92
92
int * rail_id ,
93
- int * offset ,
93
+ size_t * offset ,
94
94
size_t * msg_size_per_stripe )
95
95
{
96
96
int ret = 0 ;
@@ -158,7 +158,7 @@ static inline int test_threshold_scheduler()
158
158
size_t msg_size_per_stripe_1 [6 ][1 ] =
159
159
{{msg_sizes_1 [0 ]}, {msg_sizes_1 [1 ]}, {msg_sizes_1 [2 ]}, {msg_sizes_1 [3 ]}, {msg_sizes_1 [4 ]}, {msg_sizes_1 [5 ]}};
160
160
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 */
162
162
for (int iter = 0 ; iter < 6 ; iter ++ ) {
163
163
ret = test_multiplexer (scheduler ,
164
164
num_rails ,
@@ -192,12 +192,12 @@ static inline int test_threshold_scheduler()
192
192
/* For each message ensure that two rails are used. Also ensure that the rail-id pairs
193
193
* are round-robin between each schedule */
194
194
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 ]}};
201
201
size_t msg_size_per_stripe_2 [6 ][2 ] = {{stripe_size [0 ], remaining_stripe_size [0 ]},
202
202
{stripe_size [1 ], remaining_stripe_size [1 ]},
203
203
{stripe_size [2 ], remaining_stripe_size [2 ]},
@@ -234,12 +234,12 @@ static inline int test_threshold_scheduler()
234
234
/* For each message ensure that three rails are used. Also ensure that the rail-id triplets
235
235
* are round-robin between each schedule */
236
236
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 }};
243
243
size_t msg_size_per_stripe_3 [6 ][2 ] = {{(stripe_size [0 ] * 2 ) / 2 , remaining_stripe_size [0 ]},
244
244
{(stripe_size [1 ] * 2 ) / 2 , remaining_stripe_size [1 ]},
245
245
{(stripe_size [2 ] * 2 ) / 2 , remaining_stripe_size [2 ]},
@@ -275,12 +275,12 @@ static inline int test_threshold_scheduler()
275
275
}
276
276
/* For each message ensure that all four rails are used. */
277
277
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 }};
284
284
size_t msg_size_per_stripe_4 [6 ][4 ] = {{stripe_size [0 ], stripe_size [0 ], stripe_size [0 ], remaining_stripe_size [0 ]},
285
285
{stripe_size [1 ], stripe_size [1 ], stripe_size [1 ], remaining_stripe_size [1 ]},
286
286
{stripe_size [2 ], stripe_size [2 ], stripe_size [2 ], remaining_stripe_size [2 ]},
0 commit comments