Skip to content

Commit ff12b69

Browse files
authored
Merge pull request #12616 from bosilca/nvidia/ucc/blocking
Differentiate blocking unblocking collectives in UCC
2 parents c29f239 + 5e9ed86 commit ff12b69

16 files changed

+19
-3
lines changed

ompi/mca/coll/ucc/coll_ucc_allgather.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ static inline ucc_status_t mca_coll_ucc_allgather_init(const void *sbuf, size_t
3434

3535
ucc_coll_args_t coll = {
3636
.mask = 0,
37+
.flags = 0,
3738
.coll_type = UCC_COLL_TYPE_ALLGATHER,
3839
.src.info = {
3940
.buffer = (void*)sbuf,

ompi/mca/coll/ucc/coll_ucc_allgatherv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ static inline ucc_status_t mca_coll_ucc_allgatherv_init(const void *sbuf, int sc
3131

3232
ucc_coll_args_t coll = {
3333
.mask = 0,
34+
.flags = 0,
3435
.coll_type = UCC_COLL_TYPE_ALLGATHERV,
3536
.src.info = {
3637
.buffer = (void*)sbuf,

ompi/mca/coll/ucc/coll_ucc_allreduce.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ static inline ucc_status_t mca_coll_ucc_allreduce_init(const void *sbuf, void *r
3232
}
3333
ucc_coll_args_t coll = {
3434
.mask = 0,
35+
.flags = 0,
3536
.coll_type = UCC_COLL_TYPE_ALLREDUCE,
3637
.src.info = {
3738
.buffer = (void*)sbuf,

ompi/mca/coll/ucc/coll_ucc_alltoall.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ static inline ucc_status_t mca_coll_ucc_alltoall_init(const void *sbuf, size_t s
3434

3535
ucc_coll_args_t coll = {
3636
.mask = 0,
37+
.flags = 0,
3738
.coll_type = UCC_COLL_TYPE_ALLTOALL,
3839
.src.info = {
3940
.buffer = (void*)sbuf,

ompi/mca/coll/ucc/coll_ucc_alltoallv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ static inline ucc_status_t mca_coll_ucc_alltoallv_init(const void *sbuf, const i
3131

3232
ucc_coll_args_t coll = {
3333
.mask = 0,
34+
.flags = 0,
3435
.coll_type = UCC_COLL_TYPE_ALLTOALLV,
3536
.src.info_v = {
3637
.buffer = (void*)sbuf,

ompi/mca/coll/ucc/coll_ucc_barrier.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ static inline ucc_status_t mca_coll_ucc_barrier_init(mca_coll_ucc_module_t *ucc_
1414
{
1515
ucc_coll_args_t coll = {
1616
.mask = 0,
17+
.flags = 0,
1718
.coll_type = UCC_COLL_TYPE_BARRIER
1819
};
1920
COLL_UCC_REQ_INIT(coll_req, req, coll, ucc_module);

ompi/mca/coll/ucc/coll_ucc_bcast.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ static inline ucc_status_t mca_coll_ucc_bcast_init(void *buf, size_t count, stru
2121

2222
ucc_coll_args_t coll = {
2323
.mask = 0,
24+
.flags = 0,
2425
.coll_type = UCC_COLL_TYPE_BCAST,
2526
.root = root,
2627
.src.info = {

ompi/mca/coll/ucc/coll_ucc_common.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
_coll.mask |= UCC_COLL_ARGS_FIELD_CB; \
4848
_coll.cb.cb = mca_coll_ucc_completion; \
4949
_coll.cb.data = (void*)_coll_req; \
50+
} else { \
51+
_coll.mask |= UCC_COLL_ARGS_FIELD_FLAGS; \
52+
_coll.flags |= UCC_COLL_ARGS_HINT_OPTIMIZE_LATENCY; \
5053
} \
5154
COLL_UCC_CHECK(ucc_collective_init(&_coll, _req, \
5255
_module->ucc_team)); \

ompi/mca/coll/ucc/coll_ucc_gather.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ ucc_status_t mca_coll_ucc_gather_init(const void *sbuf, size_t scount, struct om
4747

4848
ucc_coll_args_t coll = {
4949
.mask = 0,
50+
.flags = 0,
5051
.coll_type = UCC_COLL_TYPE_GATHER,
5152
.root = root,
5253
.src.info = {

ompi/mca/coll/ucc/coll_ucc_gatherv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ static inline ucc_status_t mca_coll_ucc_gatherv_init(const void *sbuf, int scoun
1919
{
2020
ucc_datatype_t ucc_sdt, ucc_rdt;
2121
int comm_rank = ompi_comm_rank(ucc_module->comm);
22-
int comm_size = ompi_comm_size(ucc_module->comm);
2322

2423
ucc_sdt = ompi_dtype_to_ucc_dtype(sdtype);
2524
if (comm_rank == root) {
@@ -41,6 +40,7 @@ static inline ucc_status_t mca_coll_ucc_gatherv_init(const void *sbuf, int scoun
4140

4241
ucc_coll_args_t coll = {
4342
.mask = 0,
43+
.flags = 0,
4444
.coll_type = UCC_COLL_TYPE_GATHERV,
4545
.root = root,
4646
.src.info = {

0 commit comments

Comments
 (0)