Skip to content

Commit 2dec57d

Browse files
author
hasegawa.kento
committed
COLL/UCC: renaming <coll>_init to avoid naming conflicts
Signed-off-by: hasegawa.kento <hasegawa.kento@fujitsu.com>
1 parent 6ec63e2 commit 2dec57d

15 files changed

+130
-42
lines changed

‎ompi/mca/coll/ucc/coll_ucc.h‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/**
22
Copyright (c) 2021 Mellanox Technologies. All rights reserved.
33
Copyright (c) 2022 NVIDIA Corporation. All rights reserved.
4+
Copyright (c) 2025 Fujitsu Limited. All rights reserved.
45
$COPYRIGHT$
56
67
Additional copyrights may follow
@@ -305,5 +306,78 @@ int mca_coll_ucc_iscatter(const void *sbuf, size_t scount,
305306
ompi_request_t** request,
306307
mca_coll_base_module_t *module);
307308

309+
int mca_coll_ucc_allreduce_init(const void *sbuf, void *rbuf, size_t count,
310+
struct ompi_datatype_t *dtype, struct ompi_op_t *op,
311+
struct ompi_communicator_t *comm, struct ompi_info_t *info,
312+
ompi_request_t **request, mca_coll_base_module_t *module);
313+
314+
int mca_coll_ucc_reduce_init(const void *sbuf, void *rbuf, size_t count,
315+
struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root,
316+
struct ompi_communicator_t *comm, struct ompi_info_t *info,
317+
ompi_request_t **request, mca_coll_base_module_t *module);
318+
319+
int mca_coll_ucc_barrier_init(struct ompi_communicator_t *comm, struct ompi_info_t *info,
320+
ompi_request_t **request, mca_coll_base_module_t *module);
321+
322+
int mca_coll_ucc_bcast_init(void *buff, size_t count, struct ompi_datatype_t *datatype, int root,
323+
struct ompi_communicator_t *comm, struct ompi_info_t *info,
324+
ompi_request_t **request, mca_coll_base_module_t *module);
325+
326+
int mca_coll_ucc_alltoall_init(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
327+
void *rbuf, size_t rcount, struct ompi_datatype_t *rdtype,
328+
struct ompi_communicator_t *comm, struct ompi_info_t *info,
329+
ompi_request_t **request, mca_coll_base_module_t *module);
330+
331+
int mca_coll_ucc_alltoallv_init(const void *sbuf, ompi_count_array_t scounts,
332+
ompi_disp_array_t sdisps, struct ompi_datatype_t *sdtype,
333+
void *rbuf, ompi_count_array_t rcounts, ompi_disp_array_t rdisps,
334+
struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm,
335+
struct ompi_info_t *info, ompi_request_t **request,
336+
mca_coll_base_module_t *module);
337+
338+
int mca_coll_ucc_allgather_init(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
339+
void *rbuf, size_t rcount, struct ompi_datatype_t *rdtype,
340+
struct ompi_communicator_t *comm, struct ompi_info_t *info,
341+
ompi_request_t **request, mca_coll_base_module_t *module);
342+
343+
int mca_coll_ucc_allgatherv_init(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
344+
void *rbuf, ompi_count_array_t rcounts, ompi_disp_array_t disps,
345+
struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm,
346+
struct ompi_info_t *info, ompi_request_t **request,
347+
mca_coll_base_module_t *module);
348+
349+
int mca_coll_ucc_gather_init(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
350+
void *rbuf, size_t rcount, struct ompi_datatype_t *rdtype, int root,
351+
struct ompi_communicator_t *comm, struct ompi_info_t *info,
352+
ompi_request_t **request, mca_coll_base_module_t *module);
353+
354+
int mca_coll_ucc_gatherv_init(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
355+
void *rbuf, ompi_count_array_t rcounts, ompi_disp_array_t disps,
356+
struct ompi_datatype_t *rdtype, int root,
357+
struct ompi_communicator_t *comm, struct ompi_info_t *info,
358+
ompi_request_t **request, mca_coll_base_module_t *module);
359+
360+
int mca_coll_ucc_reduce_scatter_block_init(const void *sbuf, void *rbuf, size_t rcount,
361+
struct ompi_datatype_t *dtype, struct ompi_op_t *op,
362+
struct ompi_communicator_t *comm,
363+
struct ompi_info_t *info, ompi_request_t **request,
364+
mca_coll_base_module_t *module);
365+
366+
int mca_coll_ucc_reduce_scatter_init(const void *sbuf, void *rbuf, ompi_count_array_t rcounts,
367+
struct ompi_datatype_t *dtype, struct ompi_op_t *op,
368+
struct ompi_communicator_t *comm, struct ompi_info_t *info,
369+
ompi_request_t **request, mca_coll_base_module_t *module);
370+
371+
int mca_coll_ucc_scatterv_init(const void *sbuf, ompi_count_array_t scounts,
372+
ompi_disp_array_t disps, struct ompi_datatype_t *sdtype, void *rbuf,
373+
size_t rcount, struct ompi_datatype_t *rdtype, int root,
374+
struct ompi_communicator_t *comm, struct ompi_info_t *info,
375+
ompi_request_t **request, mca_coll_base_module_t *module);
376+
377+
int mca_coll_ucc_scatter_init(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
378+
void *rbuf, size_t rcount, struct ompi_datatype_t *rdtype, int root,
379+
struct ompi_communicator_t *comm, struct ompi_info_t *info,
380+
ompi_request_t **request, mca_coll_base_module_t *module);
381+
308382
END_C_DECLS
309383
#endif

‎ompi/mca/coll/ucc/coll_ucc_allgather.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
/**
33
* Copyright (c) 2021 Mellanox Technologies. All rights reserved.
4+
* Copyright (c) 2025 Fujitsu Limited. All rights reserved.
45
* $COPYRIGHT$
56
*
67
* Additional copyrights may follow
@@ -9,7 +10,7 @@
910

1011
#include "coll_ucc_common.h"
1112

12-
static inline ucc_status_t mca_coll_ucc_allgather_init(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
13+
static inline ucc_status_t mca_coll_ucc_allgather_iniz(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
1314
void* rbuf, size_t rcount, struct ompi_datatype_t *rdtype,
1415
mca_coll_ucc_module_t *ucc_module,
1516
ucc_coll_req_h *req,
@@ -74,7 +75,7 @@ int mca_coll_ucc_allgather(const void *sbuf, size_t scount, struct ompi_datatype
7475
ucc_coll_req_h req;
7576

7677
UCC_VERBOSE(3, "running ucc allgather");
77-
COLL_UCC_CHECK(mca_coll_ucc_allgather_init(sbuf, scount, sdtype,
78+
COLL_UCC_CHECK(mca_coll_ucc_allgather_iniz(sbuf, scount, sdtype,
7879
rbuf, rcount, rdtype,
7980
ucc_module, &req, NULL));
8081
COLL_UCC_POST_AND_CHECK(req);
@@ -98,7 +99,7 @@ int mca_coll_ucc_iallgather(const void *sbuf, size_t scount, struct ompi_datatyp
9899

99100
UCC_VERBOSE(3, "running ucc iallgather");
100101
COLL_UCC_GET_REQ(coll_req);
101-
COLL_UCC_CHECK(mca_coll_ucc_allgather_init(sbuf, scount, sdtype,
102+
COLL_UCC_CHECK(mca_coll_ucc_allgather_iniz(sbuf, scount, sdtype,
102103
rbuf, rcount, rdtype,
103104
ucc_module, &req, coll_req));
104105
COLL_UCC_POST_AND_CHECK(req);

‎ompi/mca/coll/ucc/coll_ucc_allgatherv.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
/**
33
* Copyright (c) 2021 Mellanox Technologies. All rights reserved.
4+
* Copyright (c) 2025 Fujitsu Limited. All rights reserved.
45
* $COPYRIGHT$
56
*
67
* Additional copyrights may follow
@@ -9,7 +10,7 @@
910

1011
#include "coll_ucc_common.h"
1112

12-
static inline ucc_status_t mca_coll_ucc_allgatherv_init(const void *sbuf, size_t scount,
13+
static inline ucc_status_t mca_coll_ucc_allgatherv_iniz(const void *sbuf, size_t scount,
1314
struct ompi_datatype_t *sdtype,
1415
void* rbuf, ompi_count_array_t rcounts, ompi_disp_array_t rdisps,
1516
struct ompi_datatype_t *rdtype,
@@ -75,7 +76,7 @@ int mca_coll_ucc_allgatherv(const void *sbuf, size_t scount,
7576

7677
UCC_VERBOSE(3, "running ucc allgatherv");
7778

78-
COLL_UCC_CHECK(mca_coll_ucc_allgatherv_init(sbuf, scount, sdtype,
79+
COLL_UCC_CHECK(mca_coll_ucc_allgatherv_iniz(sbuf, scount, sdtype,
7980
rbuf, rcounts, rdisps, rdtype,
8081
ucc_module, &req, NULL));
8182
COLL_UCC_POST_AND_CHECK(req);
@@ -102,7 +103,7 @@ int mca_coll_ucc_iallgatherv(const void *sbuf, size_t scount,
102103

103104
UCC_VERBOSE(3, "running ucc iallgatherv");
104105
COLL_UCC_GET_REQ(coll_req);
105-
COLL_UCC_CHECK(mca_coll_ucc_allgatherv_init(sbuf, scount, sdtype,
106+
COLL_UCC_CHECK(mca_coll_ucc_allgatherv_iniz(sbuf, scount, sdtype,
106107
rbuf, rcounts, rdisps, rdtype,
107108
ucc_module, &req, coll_req));
108109
COLL_UCC_POST_AND_CHECK(req);

‎ompi/mca/coll/ucc/coll_ucc_allreduce.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
/**
33
* Copyright (c) 2021 Mellanox Technologies. All rights reserved.
4+
* Copyright (c) 2025 Fujitsu Limited. All rights reserved.
45
* $COPYRIGHT$
56
*
67
* Additional copyrights may follow
@@ -9,7 +10,7 @@
910

1011
#include "coll_ucc_common.h"
1112

12-
static inline ucc_status_t mca_coll_ucc_allreduce_init(const void *sbuf, void *rbuf, size_t count,
13+
static inline ucc_status_t mca_coll_ucc_allreduce_iniz(const void *sbuf, void *rbuf, size_t count,
1314
struct ompi_datatype_t *dtype,
1415
struct ompi_op_t *op, mca_coll_ucc_module_t *ucc_module,
1516
ucc_coll_req_h *req,
@@ -67,7 +68,7 @@ int mca_coll_ucc_allreduce(const void *sbuf, void *rbuf, size_t count,
6768
ucc_coll_req_h req;
6869

6970
UCC_VERBOSE(3, "running ucc allreduce");
70-
COLL_UCC_CHECK(mca_coll_ucc_allreduce_init(sbuf, rbuf, count, dtype, op,
71+
COLL_UCC_CHECK(mca_coll_ucc_allreduce_iniz(sbuf, rbuf, count, dtype, op,
7172
ucc_module, &req, NULL));
7273
COLL_UCC_POST_AND_CHECK(req);
7374
COLL_UCC_CHECK(coll_ucc_req_wait(req));
@@ -90,7 +91,7 @@ int mca_coll_ucc_iallreduce(const void *sbuf, void *rbuf, size_t count,
9091

9192
UCC_VERBOSE(3, "running ucc iallreduce");
9293
COLL_UCC_GET_REQ(coll_req);
93-
COLL_UCC_CHECK(mca_coll_ucc_allreduce_init(sbuf, rbuf, count, dtype, op,
94+
COLL_UCC_CHECK(mca_coll_ucc_allreduce_iniz(sbuf, rbuf, count, dtype, op,
9495
ucc_module, &req, coll_req));
9596
COLL_UCC_POST_AND_CHECK(req);
9697
*request = &coll_req->super;

‎ompi/mca/coll/ucc/coll_ucc_alltoall.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
/**
33
* Copyright (c) 2021 Mellanox Technologies. All rights reserved.
4+
* Copyright (c) 2025 Fujitsu Limited. All rights reserved.
45
* $COPYRIGHT$
56
*
67
* Additional copyrights may follow
@@ -9,7 +10,7 @@
910

1011
#include "coll_ucc_common.h"
1112

12-
static inline ucc_status_t mca_coll_ucc_alltoall_init(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
13+
static inline ucc_status_t mca_coll_ucc_alltoall_iniz(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
1314
void* rbuf, size_t rcount, struct ompi_datatype_t *rdtype,
1415
mca_coll_ucc_module_t *ucc_module,
1516
ucc_coll_req_h *req,
@@ -74,7 +75,7 @@ int mca_coll_ucc_alltoall(const void *sbuf, size_t scount, struct ompi_datatype_
7475
ucc_coll_req_h req;
7576

7677
UCC_VERBOSE(3, "running ucc alltoall");
77-
COLL_UCC_CHECK(mca_coll_ucc_alltoall_init(sbuf, scount, sdtype,
78+
COLL_UCC_CHECK(mca_coll_ucc_alltoall_iniz(sbuf, scount, sdtype,
7879
rbuf, rcount, rdtype,
7980
ucc_module, &req, NULL));
8081
COLL_UCC_POST_AND_CHECK(req);
@@ -98,7 +99,7 @@ int mca_coll_ucc_ialltoall(const void *sbuf, size_t scount, struct ompi_datatype
9899

99100
UCC_VERBOSE(3, "running ucc ialltoall");
100101
COLL_UCC_GET_REQ(coll_req);
101-
COLL_UCC_CHECK(mca_coll_ucc_alltoall_init(sbuf, scount, sdtype,
102+
COLL_UCC_CHECK(mca_coll_ucc_alltoall_iniz(sbuf, scount, sdtype,
102103
rbuf, rcount, rdtype,
103104
ucc_module, &req, coll_req));
104105
COLL_UCC_POST_AND_CHECK(req);

‎ompi/mca/coll/ucc/coll_ucc_alltoallv.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
/**
33
* Copyright (c) 2021 Mellanox Technologies. All rights reserved.
4+
* Copyright (c) 2025 Fujitsu Limited. All rights reserved.
45
* $COPYRIGHT$
56
*
67
* Additional copyrights may follow
@@ -9,7 +10,7 @@
910

1011
#include "coll_ucc_common.h"
1112

12-
static inline ucc_status_t mca_coll_ucc_alltoallv_init(const void *sbuf, ompi_count_array_t scounts,
13+
static inline ucc_status_t mca_coll_ucc_alltoallv_iniz(const void *sbuf, ompi_count_array_t scounts,
1314
ompi_disp_array_t sdisps, struct ompi_datatype_t *sdtype,
1415
void* rbuf, ompi_count_array_t rcounts, ompi_disp_array_t rdisps,
1516
struct ompi_datatype_t *rdtype,
@@ -77,7 +78,7 @@ int mca_coll_ucc_alltoallv(const void *sbuf, ompi_count_array_t scounts,
7778

7879
UCC_VERBOSE(3, "running ucc alltoallv");
7980

80-
COLL_UCC_CHECK(mca_coll_ucc_alltoallv_init(sbuf, scounts, sdisps, sdtype,
81+
COLL_UCC_CHECK(mca_coll_ucc_alltoallv_iniz(sbuf, scounts, sdisps, sdtype,
8182
rbuf, rcounts, rdisps, rdtype,
8283
ucc_module, &req, NULL));
8384
COLL_UCC_POST_AND_CHECK(req);
@@ -104,7 +105,7 @@ int mca_coll_ucc_ialltoallv(const void *sbuf, ompi_count_array_t scounts,
104105

105106
UCC_VERBOSE(3, "running ucc ialltoallv");
106107
COLL_UCC_GET_REQ(coll_req);
107-
COLL_UCC_CHECK(mca_coll_ucc_alltoallv_init(sbuf, scounts, sdisps, sdtype,
108+
COLL_UCC_CHECK(mca_coll_ucc_alltoallv_iniz(sbuf, scounts, sdisps, sdtype,
108109
rbuf, rcounts, rdisps, rdtype,
109110
ucc_module, &req, coll_req));
110111
COLL_UCC_POST_AND_CHECK(req);

‎ompi/mca/coll/ucc/coll_ucc_barrier.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/**
22
* Copyright (c) 2021 Mellanox Technologies. All rights reserved.
3+
* Copyright (c) 2025 Fujitsu Limited. All rights reserved.
34
* $COPYRIGHT$
45
*
56
* Additional copyrights may follow
@@ -8,7 +9,7 @@
89

910
#include "coll_ucc_common.h"
1011

11-
static inline ucc_status_t mca_coll_ucc_barrier_init(mca_coll_ucc_module_t *ucc_module,
12+
static inline ucc_status_t mca_coll_ucc_barrier_iniz(mca_coll_ucc_module_t *ucc_module,
1213
ucc_coll_req_h *req,
1314
mca_coll_ucc_req_t *coll_req)
1415
{
@@ -30,7 +31,7 @@ int mca_coll_ucc_barrier(struct ompi_communicator_t *comm,
3031
ucc_coll_req_h req;
3132

3233
UCC_VERBOSE(3, "running ucc barrier");
33-
COLL_UCC_CHECK(mca_coll_ucc_barrier_init(ucc_module, &req, NULL));
34+
COLL_UCC_CHECK(mca_coll_ucc_barrier_iniz(ucc_module, &req, NULL));
3435
COLL_UCC_POST_AND_CHECK(req);
3536
COLL_UCC_CHECK(coll_ucc_req_wait(req));
3637
return OMPI_SUCCESS;
@@ -49,7 +50,7 @@ int mca_coll_ucc_ibarrier(struct ompi_communicator_t *comm,
4950

5051
UCC_VERBOSE(3, "running ucc ibarrier");
5152
COLL_UCC_GET_REQ(coll_req);
52-
COLL_UCC_CHECK(mca_coll_ucc_barrier_init(ucc_module, &req, coll_req));
53+
COLL_UCC_CHECK(mca_coll_ucc_barrier_iniz(ucc_module, &req, coll_req));
5354
COLL_UCC_POST_AND_CHECK(req);
5455
*request = &coll_req->super;
5556
return OMPI_SUCCESS;

‎ompi/mca/coll/ucc/coll_ucc_bcast.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/**
22
* Copyright (c) 2021 Mellanox Technologies. All rights reserved.
3+
* Copyright (c) 2025 Fujitsu Limited. All rights reserved.
34
* $COPYRIGHT$
45
*
56
* Additional copyrights may follow
@@ -8,7 +9,7 @@
89

910
#include "coll_ucc_common.h"
1011

11-
static inline ucc_status_t mca_coll_ucc_bcast_init(void *buf, size_t count, struct ompi_datatype_t *dtype,
12+
static inline ucc_status_t mca_coll_ucc_bcast_iniz(void *buf, size_t count, struct ompi_datatype_t *dtype,
1213
int root, mca_coll_ucc_module_t *ucc_module,
1314
ucc_coll_req_h *req,
1415
mca_coll_ucc_req_t *coll_req)
@@ -44,7 +45,7 @@ int mca_coll_ucc_bcast(void *buf, size_t count, struct ompi_datatype_t *dtype,
4445
mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module;
4546
ucc_coll_req_h req;
4647
UCC_VERBOSE(3, "running ucc bcast");
47-
COLL_UCC_CHECK(mca_coll_ucc_bcast_init(buf, count, dtype, root,
48+
COLL_UCC_CHECK(mca_coll_ucc_bcast_iniz(buf, count, dtype, root,
4849
ucc_module, &req, NULL));
4950
COLL_UCC_POST_AND_CHECK(req);
5051
COLL_UCC_CHECK(coll_ucc_req_wait(req));
@@ -66,7 +67,7 @@ int mca_coll_ucc_ibcast(void *buf, size_t count, struct ompi_datatype_t *dtype,
6667

6768
UCC_VERBOSE(3, "running ucc ibcast");
6869
COLL_UCC_GET_REQ(coll_req);
69-
COLL_UCC_CHECK(mca_coll_ucc_bcast_init(buf, count, dtype, root,
70+
COLL_UCC_CHECK(mca_coll_ucc_bcast_iniz(buf, count, dtype, root,
7071
ucc_module, &req, coll_req));
7172
COLL_UCC_POST_AND_CHECK(req);
7273
*request = &coll_req->super;

‎ompi/mca/coll/ucc/coll_ucc_gather.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/**
33
* Copyright (c) 2021 Mellanox Technologies. All rights reserved.
44
* Copyright (c) 2022 NVIDIA Corporation. All rights reserved.
5+
* Copyright (c) 2025 Fujitsu Limited. All rights reserved.
56
* $COPYRIGHT$
67
*
78
* Additional copyrights may follow
@@ -11,7 +12,7 @@
1112
#include "coll_ucc_common.h"
1213

1314
static inline
14-
ucc_status_t mca_coll_ucc_gather_init(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
15+
ucc_status_t mca_coll_ucc_gather_iniz(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
1516
void *rbuf, size_t rcount, struct ompi_datatype_t *rdtype,
1617
int root, mca_coll_ucc_module_t *ucc_module,
1718
ucc_coll_req_h *req,
@@ -91,7 +92,7 @@ int mca_coll_ucc_gather(const void *sbuf, size_t scount, struct ompi_datatype_t
9192
ucc_coll_req_h req;
9293

9394
UCC_VERBOSE(3, "running ucc gather");
94-
COLL_UCC_CHECK(mca_coll_ucc_gather_init(sbuf, scount, sdtype, rbuf, rcount,
95+
COLL_UCC_CHECK(mca_coll_ucc_gather_iniz(sbuf, scount, sdtype, rbuf, rcount,
9596
rdtype, root, ucc_module,
9697
&req, NULL));
9798
COLL_UCC_POST_AND_CHECK(req);
@@ -116,7 +117,7 @@ int mca_coll_ucc_igather(const void *sbuf, size_t scount, struct ompi_datatype_t
116117

117118
UCC_VERBOSE(3, "running ucc igather");
118119
COLL_UCC_GET_REQ(coll_req);
119-
COLL_UCC_CHECK(mca_coll_ucc_gather_init(sbuf, scount, sdtype, rbuf, rcount,
120+
COLL_UCC_CHECK(mca_coll_ucc_gather_iniz(sbuf, scount, sdtype, rbuf, rcount,
120121
rdtype, root, ucc_module,
121122
&req, coll_req));
122123
COLL_UCC_POST_AND_CHECK(req);

0 commit comments

Comments
 (0)