Skip to content

coll/ucc: adjust to api changes #9711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jladd-mlnx merged 1 commit into from
Nov 30, 2021
Merged

coll/ucc: adjust to api changes #9711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ompi/mca/coll/ucc/coll_ucc_allreduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static inline ucc_status_t mca_coll_ucc_allreduce_init(const void *sbuf, void *r
goto fallback;
}
ucc_coll_args_t coll = {
.mask = UCC_COLL_ARGS_FIELD_PREDEFINED_REDUCTIONS,
.mask = 0,
.coll_type = UCC_COLL_TYPE_ALLREDUCE,
.src.info = {
.buffer = (void*)sbuf,
Expand All @@ -45,9 +45,7 @@ static inline ucc_status_t mca_coll_ucc_allreduce_init(const void *sbuf, void *r
.datatype = ucc_dt,
.mem_type = UCC_MEMORY_TYPE_UNKNOWN
},
.reduce = {
.predefined_op = ucc_op,
},
.op = ucc_op,
};
if (MPI_IN_PLACE == sbuf) {
coll.mask |= UCC_COLL_ARGS_FIELD_FLAGS;
Expand Down
7 changes: 2 additions & 5 deletions ompi/mca/coll/ucc/coll_ucc_reduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/**
* Copyright (c) 2021 Mellanox Technologies. All rights reserved.
* $COPYRIGHT$
Expand Down Expand Up @@ -32,7 +31,7 @@ static inline ucc_status_t mca_coll_ucc_reduce_init(const void *sbuf, void *rbuf
goto fallback;
}
ucc_coll_args_t coll = {
.mask = UCC_COLL_ARGS_FIELD_PREDEFINED_REDUCTIONS,
.mask = 0,
.coll_type = UCC_COLL_TYPE_REDUCE,
.root = root,
.src.info = {
Expand All @@ -47,9 +46,7 @@ static inline ucc_status_t mca_coll_ucc_reduce_init(const void *sbuf, void *rbuf
.datatype = ucc_dt,
.mem_type = UCC_MEMORY_TYPE_UNKNOWN
},
.reduce = {
.predefined_op = ucc_op,
},
.op = ucc_op,
};
if (MPI_IN_PLACE == sbuf) {
coll.mask |= UCC_COLL_ARGS_FIELD_FLAGS;
Expand Down
6 changes: 2 additions & 4 deletions oshmem/mca/scoll/ucc/scoll_ucc_reduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static inline ucc_status_t mca_scoll_ucc_reduce_init(const void *sbuf, void *rbu
}

ucc_coll_args_t coll = {
.mask = UCC_COLL_ARGS_FIELD_PREDEFINED_REDUCTIONS,
.mask = 0,
.coll_type = UCC_COLL_TYPE_ALLREDUCE,
.src.info = {
.buffer = (void *)sbuf,
Expand All @@ -47,9 +47,7 @@ static inline ucc_status_t mca_scoll_ucc_reduce_init(const void *sbuf, void *rbu
.datatype = ucc_dt,
.mem_type = UCC_MEMORY_TYPE_UNKNOWN
},
.reduce = {
.predefined_op = ucc_op,
},
.op = ucc_op,
};

if (sbuf == rbuf) {
Expand Down