Skip to content

Commit f3d0c59

Browse files
committed
communicator: Rename allreduce_fn to iallreduce_fn
The allreduce_fn is non-blocking. Rename it to iallreduce_fn to make it clear. Signed-off-by: Jessie Yang <jiaxiyan@amazon.com>
1 parent 223ed58 commit f3d0c59

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

ompi/communicator/comm_cid.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ opal_atomic_int64_t ompi_comm_next_base_cid = 1;
6565

6666
struct ompi_comm_cid_context_t;
6767

68-
typedef int (*ompi_comm_allreduce_impl_fn_t) (int *inbuf, int *outbuf, int count, struct ompi_op_t *op,
69-
struct ompi_comm_cid_context_t *cid_context,
70-
ompi_request_t **req);
68+
typedef int (*ompi_comm_iallreduce_impl_fn_t) (int *inbuf, int *outbuf, int count, struct ompi_op_t *op,
69+
struct ompi_comm_cid_context_t *cid_context,
70+
ompi_request_t **req);
7171

7272

7373
struct ompi_comm_cid_context_t {
@@ -78,7 +78,7 @@ struct ompi_comm_cid_context_t {
7878
ompi_communicator_t *comm;
7979
ompi_communicator_t *bridgecomm;
8080

81-
ompi_comm_allreduce_impl_fn_t allreduce_fn;
81+
ompi_comm_iallreduce_impl_fn_t iallreduce_fn;
8282

8383
int nextcid;
8484
int nextlocal_cid;
@@ -225,38 +225,38 @@ static ompi_comm_cid_context_t *mca_comm_cid_context_alloc (ompi_communicator_t
225225
* for the current mode. */
226226
switch (mode) {
227227
case OMPI_COMM_CID_INTRA:
228-
context->allreduce_fn = ompi_comm_allreduce_intra_nb;
228+
context->iallreduce_fn = ompi_comm_allreduce_intra_nb;
229229
break;
230230
case OMPI_COMM_CID_INTER:
231-
context->allreduce_fn = ompi_comm_allreduce_inter_nb;
231+
context->iallreduce_fn = ompi_comm_allreduce_inter_nb;
232232
break;
233233
case OMPI_COMM_CID_GROUP:
234234
case OMPI_COMM_CID_GROUP_NEW:
235-
context->allreduce_fn = ompi_comm_allreduce_group_nb;
235+
context->iallreduce_fn = ompi_comm_allreduce_group_nb;
236236
context->pml_tag = ((int *) arg0)[0];
237237
break;
238238
case OMPI_COMM_CID_INTRA_PMIX:
239-
context->allreduce_fn = ompi_comm_allreduce_intra_pmix_nb;
239+
context->iallreduce_fn = ompi_comm_allreduce_intra_pmix_nb;
240240
context->local_leader = ((int *) arg0)[0];
241241
if (arg1) {
242242
context->port_string = strdup ((char *) arg1);
243243
}
244244
context->pmix_tag = strdup ((char *) pmix_tag);
245245
break;
246246
case OMPI_COMM_CID_INTRA_BRIDGE:
247-
context->allreduce_fn = ompi_comm_allreduce_intra_bridge_nb;
247+
context->iallreduce_fn = ompi_comm_allreduce_intra_bridge_nb;
248248
context->local_leader = ((int *) arg0)[0];
249249
context->remote_leader = ((int *) arg1)[0];
250250
break;
251251
#if OPAL_ENABLE_FT_MPI
252252
case OMPI_COMM_CID_INTRA_FT:
253-
context->allreduce_fn = ompi_comm_ft_allreduce_intra_nb;
253+
context->iallreduce_fn = ompi_comm_ft_allreduce_intra_nb;
254254
break;
255255
case OMPI_COMM_CID_INTER_FT:
256-
context->allreduce_fn = ompi_comm_ft_allreduce_inter_nb;
256+
context->iallreduce_fn = ompi_comm_ft_allreduce_inter_nb;
257257
break;
258258
case OMPI_COMM_CID_INTRA_PMIX_FT:
259-
context->allreduce_fn = ompi_comm_ft_allreduce_intra_pmix_nb;
259+
context->iallreduce_fn = ompi_comm_ft_allreduce_intra_pmix_nb;
260260
break;
261261
#endif /* OPAL_ENABLE_FT_MPI */
262262
default:
@@ -600,8 +600,8 @@ static int ompi_comm_allreduce_getnextcid (ompi_comm_request_t *request)
600600
#endif /* OPAL_ENABLE_FT_MPI */
601601
}
602602

603-
ret = context->allreduce_fn (&context->nextlocal_cid, &context->nextcid, 1, MPI_MAX,
604-
context, &subreq);
603+
ret = context->iallreduce_fn (&context->nextlocal_cid, &context->nextcid, 1, MPI_MAX,
604+
context, &subreq);
605605
/* there was a failure during non-blocking collective
606606
* all we can do is abort
607607
*/
@@ -666,7 +666,7 @@ static int ompi_comm_checkcid (ompi_comm_request_t *request)
666666

667667
++context->iter;
668668

669-
ret = context->allreduce_fn (&context->flag, &context->rflag, 1, MPI_MIN, context, &subreq);
669+
ret = context->iallreduce_fn (&context->flag, &context->rflag, 1, MPI_MIN, context, &subreq);
670670
if (OMPI_SUCCESS == ret) {
671671
ompi_comm_request_schedule_append (request, ompi_comm_nextcid_check_flag, &subreq, 1);
672672
} else {
@@ -908,7 +908,7 @@ int ompi_comm_activate_nb (ompi_communicator_t **newcomm, ompi_communicator_t *c
908908
* 2. After the operation it is allowed to send messages over the new communicator.
909909
*/
910910
local_peers = context->max_local_peers;
911-
ret = context->allreduce_fn (&local_peers, &context->max_local_peers, 1, MPI_MAX, context,
911+
ret = context->iallreduce_fn (&local_peers, &context->max_local_peers, 1, MPI_MAX, context,
912912
&subreq);
913913
if (OMPI_SUCCESS != ret) {
914914
ompi_comm_request_return (request);

0 commit comments

Comments
 (0)