Skip to content

coll/libnbc: fix the red_schain algo of ireduce with MPI_IN_PLACE #2881

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
merged 1 commit into from
Jan 30, 2017
Merged

coll/libnbc: fix the red_schain algo of ireduce with MPI_IN_PLACE #2881

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
38 changes: 11 additions & 27 deletions ompi/mca/coll/libnbc/nbc_ireduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
* rights reserved.
* Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2014-2016 Research Organization for Information Science
* Copyright (c) 2014-2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2017 IBM Corporation. All rights reserved.
*
* Author(s): Torsten Hoefler <htor@cs.indiana.edu>
*
Expand Down Expand Up @@ -426,39 +425,24 @@ static inline int red_sched_chain (int rank, int p, int root, const void *sendbu

/* last node does not recv */
if (vrank != p-1) {
if (vrank == 0) {
if (sendbuf != recvbuf) {
// for regular src, recv into recvbuf
res = NBC_Sched_recv ((char *)recvbuf+offset, false, thiscount, datatype, rpeer, schedule, true);
} else {
// but for any-src, recv into tmpbuf
// because for MPI_IN_PLACE if we recved into recvbuf here we'd be
// overwriting our sendbuf, and we use it in the operation
// that happens further down
res = NBC_Sched_recv ((char *)offset, true, thiscount, datatype, rpeer, schedule, true);
}
if (vrank == 0 && sendbuf != recvbuf) {
res = NBC_Sched_recv ((char *)recvbuf+offset, false, thiscount, datatype, rpeer, schedule, true);
} else {
if (sendbuf != recvbuf) {
// for regular src, add sendbuf into recvbuf
// (here recvbuf holds the reduction from 1..n-1)
res = NBC_Sched_op ((char *) sendbuf + offset, false, (char *) recvbuf + offset, false,
thiscount, datatype, op, schedule, true);
} else {
// for MPI_IN_PLACE, add tmpbuf into recvbuf
// (here tmpbuf holds the reduction from 1..n-1) and
// recvbuf is our sendbuf
res = NBC_Sched_op ((char *) offset, true, (char *) recvbuf + offset, false,
thiscount, datatype, op, schedule, true);
}
res = NBC_Sched_recv ((char *)offset, true, thiscount, datatype, rpeer, schedule, true);
}
if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
return res;
}

/* root reduces into receivebuf */
if(vrank == 0) {
res = NBC_Sched_op ((char *) sendbuf + offset, false, (char *) recvbuf + offset, false,
thiscount, datatype, op, schedule, true);
if (sendbuf != recvbuf) {
res = NBC_Sched_op ((char *) sendbuf + offset, false, (char *) recvbuf + offset, false,
thiscount, datatype, op, schedule, true);
} else {
res = NBC_Sched_op ((char *)offset, true, (char *) recvbuf + offset, false,
thiscount, datatype, op, schedule, true);
}
} else {
res = NBC_Sched_op ((char *) sendbuf + offset, false, (char *) offset, true, thiscount,
datatype, op, schedule, true);
Expand Down