Skip to content

Commit c5038b5

Browse files
janjustjanjust
authored
Merge pull request #13459 from mentOS31/v5.0.x-coll_ucc_fix_initialization
COLL/UCC: Fix initialization in non-blocking (v5.0.x)
2 parents e982ef6 + 8d88926 commit c5038b5

16 files changed

+33
-15
lines changed

‎.mailmap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,5 @@ George Katevenis <[email protected]>
137137
Brian Barrett <[email protected]>
138138

139139
Andrii Bilokur <[email protected]> B-a-S <[email protected]>
140+
141+
Kento Hasegawa <[email protected]> hasegawa.kento <[email protected]>

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

Lines changed: 2 additions & 1 deletion
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
@@ -98,7 +99,7 @@ int mca_coll_ucc_iallgather(const void *sbuf, int scount, struct ompi_datatype_t
9899
mca_coll_ucc_req_t *coll_req = NULL;
99100

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

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

Lines changed: 2 additions & 1 deletion
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
@@ -99,7 +100,7 @@ int mca_coll_ucc_iallgatherv(const void *sbuf, int scount,
99100
mca_coll_ucc_req_t *coll_req = NULL;
100101

101102
UCC_VERBOSE(3, "running ucc iallgatherv");
102-
COLL_UCC_GET_REQ(coll_req);
103+
COLL_UCC_GET_REQ(coll_req, comm);
103104
COLL_UCC_CHECK(mca_coll_ucc_allgatherv_init(sbuf, scount, sdtype,
104105
rbuf, rcounts, rdisps, rdtype,
105106
ucc_module, &req, coll_req));

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

Lines changed: 2 additions & 1 deletion
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
@@ -89,7 +90,7 @@ int mca_coll_ucc_iallreduce(const void *sbuf, void *rbuf, int count,
8990
mca_coll_ucc_req_t *coll_req = NULL;
9091

9192
UCC_VERBOSE(3, "running ucc iallreduce");
92-
COLL_UCC_GET_REQ(coll_req);
93+
COLL_UCC_GET_REQ(coll_req, comm);
9394
COLL_UCC_CHECK(mca_coll_ucc_allreduce_init(sbuf, rbuf, count, dtype, op,
9495
ucc_module, &req, coll_req));
9596
COLL_UCC_POST_AND_CHECK(req);

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

Lines changed: 2 additions & 1 deletion
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
@@ -97,7 +98,7 @@ int mca_coll_ucc_ialltoall(const void *sbuf, int scount, struct ompi_datatype_t
9798
mca_coll_ucc_req_t *coll_req = NULL;
9899

99100
UCC_VERBOSE(3, "running ucc ialltoall");
100-
COLL_UCC_GET_REQ(coll_req);
101+
COLL_UCC_GET_REQ(coll_req, comm);
101102
COLL_UCC_CHECK(mca_coll_ucc_alltoall_init(sbuf, scount, sdtype,
102103
rbuf, rcount, rdtype,
103104
ucc_module, &req, coll_req));

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

Lines changed: 2 additions & 1 deletion
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
@@ -100,7 +101,7 @@ int mca_coll_ucc_ialltoallv(const void *sbuf, const int *scounts,
100101
mca_coll_ucc_req_t *coll_req = NULL;
101102

102103
UCC_VERBOSE(3, "running ucc ialltoallv");
103-
COLL_UCC_GET_REQ(coll_req);
104+
COLL_UCC_GET_REQ(coll_req, comm);
104105
COLL_UCC_CHECK(mca_coll_ucc_alltoallv_init(sbuf, scounts, sdisps, sdtype,
105106
rbuf, rcounts, rdisps, rdtype,
106107
ucc_module, &req, coll_req));

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

Lines changed: 2 additions & 1 deletion
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
@@ -48,7 +49,7 @@ int mca_coll_ucc_ibarrier(struct ompi_communicator_t *comm,
4849
mca_coll_ucc_req_t *coll_req = NULL;
4950

5051
UCC_VERBOSE(3, "running ucc ibarrier");
51-
COLL_UCC_GET_REQ(coll_req);
52+
COLL_UCC_GET_REQ(coll_req, comm);
5253
COLL_UCC_CHECK(mca_coll_ucc_barrier_init(ucc_module, &req, coll_req));
5354
COLL_UCC_POST_AND_CHECK(req);
5455
*request = &coll_req->super;

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

Lines changed: 2 additions & 1 deletion
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
@@ -66,7 +67,7 @@ int mca_coll_ucc_ibcast(void *buf, int count, struct ompi_datatype_t *dtype,
6667
mca_coll_ucc_req_t *coll_req = NULL;
6768

6869
UCC_VERBOSE(3, "running ucc ibcast");
69-
COLL_UCC_GET_REQ(coll_req);
70+
COLL_UCC_GET_REQ(coll_req, comm);
7071
COLL_UCC_CHECK(mca_coll_ucc_bcast_init(buf, count, dtype, root,
7172
ucc_module, &req, coll_req));
7273
COLL_UCC_POST_AND_CHECK(req);

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

Lines changed: 3 additions & 1 deletion
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
Additional copyrights may follow
56
$HEADER$
@@ -25,7 +26,7 @@
2526
} \
2627
} while(0)
2728

28-
#define COLL_UCC_GET_REQ(_coll_req) do { \
29+
#define COLL_UCC_GET_REQ(_coll_req, _comm) do { \
2930
opal_free_list_item_t *item; \
3031
item = opal_free_list_wait (&mca_coll_ucc_component.requests); \
3132
if (OPAL_UNLIKELY(NULL == item)) { \
@@ -40,6 +41,7 @@
4041
_coll_req->super.req_state = OMPI_REQUEST_ACTIVE; \
4142
_coll_req->super.req_free = mca_coll_ucc_req_free; \
4243
_coll_req->super.req_type = OMPI_REQUEST_COLL; \
44+
_coll_req->super.req_mpi_object.comm = _comm; \
4345
} while(0)
4446

4547
#define COLL_UCC_REQ_INIT(_coll_req, _req, _coll, _module) do{ \

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

Lines changed: 2 additions & 1 deletion
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
@@ -114,7 +115,7 @@ int mca_coll_ucc_igather(const void *sbuf, int scount, struct ompi_datatype_t *s
114115
mca_coll_ucc_req_t *coll_req = NULL;
115116

116117
UCC_VERBOSE(3, "running ucc igather");
117-
COLL_UCC_GET_REQ(coll_req);
118+
COLL_UCC_GET_REQ(coll_req, comm);
118119
COLL_UCC_CHECK(mca_coll_ucc_gather_init(sbuf, scount, sdtype, rbuf, rcount,
119120
rdtype, root, ucc_module,
120121
&req, coll_req));

0 commit comments

Comments
 (0)