Commit e98feb06 authored by Wesley Bland's avatar Wesley Bland Committed by Pavan Balaji
Browse files

Rename MPIC_Sendrecv_ft to MPIC_Sendrecv



The FT functions are now the default (only) way to call the collective
helper functions. This is one of a few patches to migrate all uses to no
longer use the MPIC_*_ft naming scheme.Rename MPIC_Send_ft to MPIC_Send
Signed-off-by: Pavan Balaji's avatarPavan Balaji <balaji@mcs.anl.gov>
parent ddeb54a4
......@@ -3889,7 +3889,7 @@ int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
MPI_Comm comm, MPI_Status *status, int *errflag);
int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
MPI_Comm comm, int *errflag);
int MPIC_Sendrecv_ft(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int dest, int sendtag, void *recvbuf, int recvcount,
MPI_Datatype recvtype, int source, int recvtag,
MPI_Comm comm, MPI_Status *status, int *errflag);
......
......@@ -168,7 +168,7 @@ int MPIR_Allgather_intra (
recv_offset = dst_tree_root * recvcount * recvtype_extent;
if (dst < comm_size) {
mpi_errno = MPIC_Sendrecv_ft(((char *)recvbuf + send_offset),
mpi_errno = MPIC_Sendrecv(((char *)recvbuf + send_offset),
curr_cnt, recvtype, dst,
MPIR_ALLGATHER_TAG,
((char *)recvbuf + recv_offset),
......@@ -336,7 +336,7 @@ int MPIR_Allgather_intra (
recv_offset = dst_tree_root * nbytes;
if (dst < comm_size) {
mpi_errno = MPIC_Sendrecv_ft(((char *)tmp_buf + send_offset),
mpi_errno = MPIC_Sendrecv(((char *)tmp_buf + send_offset),
curr_cnt, MPI_BYTE, dst,
MPIR_ALLGATHER_TAG,
((char *)tmp_buf + recv_offset),
......@@ -489,7 +489,7 @@ int MPIR_Allgather_intra (
src = (rank + pof2) % comm_size;
dst = (rank - pof2 + comm_size) % comm_size;
mpi_errno = MPIC_Sendrecv_ft(tmp_buf, curr_cnt, recvtype, dst,
mpi_errno = MPIC_Sendrecv(tmp_buf, curr_cnt, recvtype, dst,
MPIR_ALLGATHER_TAG,
((char *)tmp_buf + curr_cnt*recvtype_extent),
curr_cnt, recvtype,
......@@ -512,7 +512,7 @@ int MPIR_Allgather_intra (
src = (rank + pof2) % comm_size;
dst = (rank - pof2 + comm_size) % comm_size;
mpi_errno = MPIC_Sendrecv_ft(tmp_buf, rem * recvcount, recvtype,
mpi_errno = MPIC_Sendrecv(tmp_buf, rem * recvcount, recvtype,
dst, MPIR_ALLGATHER_TAG,
((char *)tmp_buf + curr_cnt*recvtype_extent),
rem * recvcount, recvtype,
......@@ -571,7 +571,7 @@ int MPIR_Allgather_intra (
j = rank;
jnext = left;
for (i=1; i<comm_size; i++) {
mpi_errno = MPIC_Sendrecv_ft(((char *)recvbuf +
mpi_errno = MPIC_Sendrecv(((char *)recvbuf +
j*recvcount*recvtype_extent),
recvcount, recvtype, right,
MPIR_ALLGATHER_TAG,
......
......@@ -186,7 +186,7 @@ int MPIR_Allgatherv_intra (
for (j=0; j<dst_tree_root; j++)
recv_offset += recvcounts[j];
mpi_errno = MPIC_Sendrecv_ft(((char *)tmp_buf + send_offset * recvtype_extent),
mpi_errno = MPIC_Sendrecv(((char *)tmp_buf + send_offset * recvtype_extent),
curr_cnt, recvtype, dst,
MPIR_ALLGATHERV_TAG,
((char *)tmp_buf + recv_offset * recvtype_extent),
......@@ -388,7 +388,7 @@ int MPIR_Allgatherv_intra (
recv_offset *= nbytes;
if (dst < comm_size) {
mpi_errno = MPIC_Sendrecv_ft(((char *)tmp_buf + send_offset),
mpi_errno = MPIC_Sendrecv(((char *)tmp_buf + send_offset),
curr_cnt, MPI_BYTE, dst,
MPIR_ALLGATHERV_TAG,
((char *)tmp_buf + recv_offset),
......@@ -551,7 +551,7 @@ int MPIR_Allgatherv_intra (
src = (rank + pof2) % comm_size;
dst = (rank - pof2 + comm_size) % comm_size;
mpi_errno = MPIC_Sendrecv_ft(tmp_buf, curr_cnt, recvtype, dst,
mpi_errno = MPIC_Sendrecv(tmp_buf, curr_cnt, recvtype, dst,
MPIR_ALLGATHERV_TAG,
((char *)tmp_buf + curr_cnt*recvtype_extent),
total_count - curr_cnt, recvtype,
......@@ -580,7 +580,7 @@ int MPIR_Allgatherv_intra (
for (i=0; i<rem; i++)
send_cnt += recvcounts[(rank+i)%comm_size];
mpi_errno = MPIC_Sendrecv_ft(tmp_buf, send_cnt, recvtype,
mpi_errno = MPIC_Sendrecv(tmp_buf, send_cnt, recvtype,
dst, MPIR_ALLGATHERV_TAG,
((char *)tmp_buf + curr_cnt*recvtype_extent),
total_count - curr_cnt, recvtype,
......@@ -693,7 +693,7 @@ int MPIR_Allgatherv_intra (
tosend -= sendnow;
}
else { /* There's data to be sent and received */
mpi_errno = MPIC_Sendrecv_ft(sbuf, sendnow, recvtype, right, MPIR_ALLGATHERV_TAG,
mpi_errno = MPIC_Sendrecv(sbuf, sendnow, recvtype, right, MPIR_ALLGATHERV_TAG,
rbuf, recvnow, recvtype, left, MPIR_ALLGATHERV_TAG,
comm, &status, errflag);
if (mpi_errno) {
......
......@@ -155,7 +155,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
/* Send the most current data, which is in recvbuf. Recv
into tmp_buf */
mpi_errno = MPIC_Sendrecv_ft(recvbuf, count, datatype,
mpi_errno = MPIC_Sendrecv(recvbuf, count, datatype,
cdst, tag, tmp_buf,
count, datatype, cdst,
tag, comm,
......@@ -234,7 +234,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
}
/* Send data from recvbuf. Recv into tmp_buf */
mpi_errno = MPIC_Sendrecv_ft((char *) recvbuf +
mpi_errno = MPIC_Sendrecv((char *) recvbuf +
disps[send_idx]*extent,
send_cnt, datatype,
cdst, tag,
......@@ -300,7 +300,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
recv_cnt += cnts[i];
}
mpi_errno = MPIC_Sendrecv_ft((char *) recvbuf +
mpi_errno = MPIC_Sendrecv((char *) recvbuf +
disps[send_idx]*extent,
send_cnt, datatype,
cdst, tag,
......
......@@ -354,7 +354,7 @@ int MPIR_Allreduce_intra (
/* Send the most current data, which is in recvbuf. Recv
into tmp_buf */
mpi_errno = MPIC_Sendrecv_ft(recvbuf, count, datatype,
mpi_errno = MPIC_Sendrecv(recvbuf, count, datatype,
dst, MPIR_ALLREDUCE_TAG, tmp_buf,
count, datatype, dst,
MPIR_ALLREDUCE_TAG, comm,
......@@ -435,7 +435,7 @@ int MPIR_Allreduce_intra (
send_cnt, recv_cnt, last_idx);
*/
/* Send data from recvbuf. Recv into tmp_buf */
mpi_errno = MPIC_Sendrecv_ft((char *) recvbuf +
mpi_errno = MPIC_Sendrecv((char *) recvbuf +
disps[send_idx]*extent,
send_cnt, datatype,
dst, MPIR_ALLREDUCE_TAG,
......@@ -500,7 +500,7 @@ int MPIR_Allreduce_intra (
recv_cnt += cnts[i];
}
mpi_errno = MPIC_Sendrecv_ft((char *) recvbuf +
mpi_errno = MPIC_Sendrecv((char *) recvbuf +
disps[send_idx]*extent,
send_cnt, datatype,
dst, MPIR_ALLREDUCE_TAG,
......
......@@ -224,7 +224,7 @@ int MPIR_Alltoall_intra(
mpi_errno = MPIR_Pack_impl(recvbuf, 1, newtype, tmp_buf, pack_size, &position);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
mpi_errno = MPIC_Sendrecv_ft(tmp_buf, position, MPI_PACKED, dst,
mpi_errno = MPIC_Sendrecv(tmp_buf, position, MPI_PACKED, dst,
MPIR_ALLTOALL_TAG, recvbuf, 1, newtype,
src, MPIR_ALLTOALL_TAG, comm,
MPI_STATUS_IGNORE, errflag);
......@@ -310,7 +310,7 @@ int MPIR_Alltoall_intra(
my_tree_root <<= i;
if (dst < comm_size) {
mpi_errno = MPIC_Sendrecv_ft(((char *)tmp_buf +
mpi_errno = MPIC_Sendrecv(((char *)tmp_buf +
my_tree_root*sendbuf_extent),
curr_cnt, sendtype,
dst, MPIR_ALLTOALL_TAG,
......@@ -528,7 +528,7 @@ int MPIR_Alltoall_intra(
dst = (rank + i) % comm_size;
}
mpi_errno = MPIC_Sendrecv_ft(((char *)sendbuf +
mpi_errno = MPIC_Sendrecv(((char *)sendbuf +
dst*sendcount*sendtype_extent),
sendcount, sendtype, dst,
MPIR_ALLTOALL_TAG,
......@@ -632,7 +632,7 @@ int MPIR_Alltoall_inter(
sendaddr = (char *)sendbuf + dst*sendcount*sendtype_extent;
}
mpi_errno = MPIC_Sendrecv_ft(sendaddr, sendcount, sendtype, dst,
mpi_errno = MPIC_Sendrecv(sendaddr, sendcount, sendtype, dst,
MPIR_ALLTOALL_TAG, recvaddr,
recvcount, recvtype, src,
MPIR_ALLTOALL_TAG, comm, &status, errflag);
......
......@@ -298,7 +298,7 @@ int MPIR_Alltoallv_inter(const void *sendbuf, const int *sendcounts, const int *
sendcount = sendcounts[dst];
}
mpi_errno = MPIC_Sendrecv_ft(sendaddr, sendcount, sendtype, dst,
mpi_errno = MPIC_Sendrecv(sendaddr, sendcount, sendtype, dst,
MPIR_ALLTOALLV_TAG, recvaddr, recvcount,
recvtype, src, MPIR_ALLTOALLV_TAG,
comm, &status, errflag);
......
......@@ -197,7 +197,7 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int
for (i=1; i<comm_size; i++) {
src = (rank - i + comm_size) % comm_size;
dst = (rank + i) % comm_size;
mpi_errno = MPIC_Sendrecv_ft(((char *)sendbuf+sdispls[dst]),
mpi_errno = MPIC_Sendrecv(((char *)sendbuf+sdispls[dst]),
sendcounts[dst], sendtypes[dst], dst,
MPIR_ALLTOALLW_TAG,
((char *)recvbuf+rdispls[src]),
......@@ -294,7 +294,7 @@ int MPIR_Alltoallw_inter(const void *sendbuf, const int sendcounts[], const int
sendtype = sendtypes[dst];
}
mpi_errno = MPIC_Sendrecv_ft(sendaddr, sendcount, sendtype,
mpi_errno = MPIC_Sendrecv(sendaddr, sendcount, sendtype,
dst, MPIR_ALLTOALLW_TAG, recvaddr,
recvcount, recvtype, src,
MPIR_ALLTOALLW_TAG, comm, &status, errflag);
......
......@@ -73,7 +73,7 @@ int MPIR_Barrier_intra( MPID_Comm *comm_ptr, int *errflag )
while (mask < size) {
dst = (rank + mask) % size;
src = (rank - mask + size) % size;
mpi_errno = MPIC_Sendrecv_ft(NULL, 0, MPI_BYTE, dst,
mpi_errno = MPIC_Sendrecv(NULL, 0, MPI_BYTE, dst,
MPIR_BARRIER_TAG, NULL, 0, MPI_BYTE,
src, MPIR_BARRIER_TAG, comm,
MPI_STATUS_IGNORE, errflag);
......
......@@ -513,7 +513,7 @@ static int MPIR_Bcast_scatter_doubling_allgather(
if (relative_dst < comm_size)
{
mpi_errno = MPIC_Sendrecv_ft(((char *)tmp_buf + send_offset),
mpi_errno = MPIC_Sendrecv(((char *)tmp_buf + send_offset),
curr_size, MPI_BYTE, dst, MPIR_BCAST_TAG,
((char *)tmp_buf + recv_offset),
(nbytes-recv_offset < 0 ? 0 : nbytes-recv_offset),
......@@ -814,7 +814,7 @@ static int MPIR_Bcast_scatter_ring_allgather(
right_count = 0;
right_disp = rel_j * scatter_size;
mpi_errno = MPIC_Sendrecv_ft((char *)tmp_buf + right_disp, right_count,
mpi_errno = MPIC_Sendrecv((char *)tmp_buf + right_disp, right_count,
MPI_BYTE, right, MPIR_BCAST_TAG,
(char *)tmp_buf + left_disp, left_count,
MPI_BYTE, left, MPIR_BCAST_TAG,
......
......@@ -150,7 +150,7 @@ int MPIR_Exscan (
dst = rank ^ mask;
if (dst < comm_size) {
/* Send partial_scan to dst. Recv into tmp_buf */
mpi_errno = MPIC_Sendrecv_ft(partial_scan, count, datatype,
mpi_errno = MPIC_Sendrecv(partial_scan, count, datatype,
dst, MPIR_EXSCAN_TAG, tmp_buf,
count, datatype, dst,
MPIR_EXSCAN_TAG, comm,
......
......@@ -40,57 +40,6 @@ int MPIC_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status)
}
#undef FUNCNAME
#define FUNCNAME MPIC_Sendrecv
#undef FCNAME
#define FCNAME "MPIC_Sendrecv"
static int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int dest, int sendtag, void *recvbuf, int recvcount,
MPI_Datatype recvtype, int source, int recvtag,
MPI_Comm comm, MPI_Status *status)
{
MPID_Request *recv_req_ptr=NULL, *send_req_ptr=NULL;
int mpi_errno = MPI_SUCCESS;
int context_id;
MPID_Comm *comm_ptr = NULL;
MPIDI_STATE_DECL(MPID_STATE_MPIC_SENDRECV);
MPIDI_PT2PT_FUNC_ENTER_BOTH(MPID_STATE_MPIC_SENDRECV);
MPIU_ERR_CHKANDJUMP1((sendcount < 0), mpi_errno, MPI_ERR_COUNT,
"**countneg", "**countneg %d", sendcount);
MPIU_ERR_CHKANDJUMP1((recvcount < 0), mpi_errno, MPI_ERR_COUNT,
"**countneg", "**countneg %d", recvcount);
MPID_Comm_get_ptr( comm, comm_ptr );
context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ?
MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL;
mpi_errno = MPID_Irecv(recvbuf, recvcount, recvtype, source, recvtag,
comm_ptr, context_id, &recv_req_ptr);
if (mpi_errno) { MPIU_ERR_POP(mpi_errno); }
mpi_errno = MPID_Isend(sendbuf, sendcount, sendtype, dest, sendtag,
comm_ptr, context_id, &send_req_ptr);
if (mpi_errno) { MPIU_ERR_POP(mpi_errno); }
mpi_errno = MPIC_Wait(send_req_ptr);
if (mpi_errno) { MPIU_ERR_POP(mpi_errno); }
mpi_errno = MPIC_Wait(recv_req_ptr);
if (mpi_errno) { MPIU_ERR_POPFATAL(mpi_errno); }
if (status != MPI_STATUS_IGNORE)
*status = recv_req_ptr->status;
mpi_errno = recv_req_ptr->status.MPI_ERROR;
MPID_Request_release(send_req_ptr);
MPID_Request_release(recv_req_ptr);
fn_fail:
/* --BEGIN ERROR HANDLING-- */
MPIDI_PT2PT_FUNC_EXIT_BOTH(MPID_STATE_MPIC_SENDRECV);
return mpi_errno;
/* --END ERROR HANDLING-- */
}
/* NOTE: for regular collectives (as opposed to irregular collectives) calling
* this function repeatedly will almost always be slower than performing the
* equivalent inline because of the overhead of the repeated malloc/free */
......@@ -551,10 +500,10 @@ int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int
}
#undef FUNCNAME
#define FUNCNAME MPIC_Sendrecv_ft
#define FUNCNAME MPIC_Sendrecv
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIC_Sendrecv_ft(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int dest, int sendtag, void *recvbuf, int recvcount,
MPI_Datatype recvtype, int source, int recvtag,
MPI_Comm comm, MPI_Status *status, int *errflag)
......
......@@ -593,7 +593,7 @@ int MPIR_Ireduce_scatter_rec_dbl(const void *sendbuf, void *recvbuf, const int r
* will in the future when we update the NBC code to be fault-tolerant
* in roughly the same fashion. [goodell@ 2011-03-03] */
/* The following reduction is done here instead of after
the MPIC_Sendrecv_ft or MPIC_Recv above. This is
the MPIC_Sendrecv or MPIC_Recv above. This is
because to do it above, in the noncommutative
case, we would need an extra temp buffer so as not to
overwrite temp_recvbuf, because temp_recvbuf may have
......
......@@ -576,7 +576,7 @@ int MPIR_Ireduce_scatter_block_rec_dbl(const void *sendbuf, void *recvbuf, int r
* will in the future when we update the NBC code to be fault-tolerant
* in roughly the same fashion. [goodell@ 2011-03-03] */
/* The following reduction is done here instead of after
the MPIC_Sendrecv_ft or MPIC_Recv above. This is
the MPIC_Sendrecv or MPIC_Recv above. This is
because to do it above, in the noncommutative
case, we would need an extra temp buffer so as not to
overwrite temp_recvbuf, because temp_recvbuf may have
......
......@@ -109,7 +109,7 @@ static int MPIR_Reduce_scatter_noncomm(const void *sendbuf, void *recvbuf, const
send_offset += size;
}
mpi_errno = MPIC_Sendrecv_ft(outgoing_data + send_offset*true_extent,
mpi_errno = MPIC_Sendrecv(outgoing_data + send_offset*true_extent,
size, datatype, peer, MPIR_REDUCE_SCATTER_TAG,
incoming_data + recv_offset*true_extent,
size, datatype, peer, MPIR_REDUCE_SCATTER_TAG,
......@@ -414,7 +414,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
*/
/* Send data from tmp_results. Recv into tmp_recvbuf */
if ((send_cnt != 0) && (recv_cnt != 0))
mpi_errno = MPIC_Sendrecv_ft((char *) tmp_results +
mpi_errno = MPIC_Sendrecv((char *) tmp_results +
newdisps[send_idx]*extent,
send_cnt, datatype,
dst, MPIR_REDUCE_SCATTER_TAG,
......@@ -530,14 +530,14 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
/* send the data that dst needs. recv data that this process
needs from src into tmp_recvbuf */
if (sendbuf != MPI_IN_PLACE)
mpi_errno = MPIC_Sendrecv_ft(((char *)sendbuf+disps[dst]*extent),
mpi_errno = MPIC_Sendrecv(((char *)sendbuf+disps[dst]*extent),
recvcounts[dst], datatype, dst,
MPIR_REDUCE_SCATTER_TAG, tmp_recvbuf,
recvcounts[rank], datatype, src,
MPIR_REDUCE_SCATTER_TAG, comm,
MPI_STATUS_IGNORE, errflag);
else
mpi_errno = MPIC_Sendrecv_ft(((char *)recvbuf+disps[dst]*extent),
mpi_errno = MPIC_Sendrecv(((char *)recvbuf+disps[dst]*extent),
recvcounts[dst], datatype, dst,
MPIR_REDUCE_SCATTER_TAG, tmp_recvbuf,
recvcounts[rank], datatype, src,
......@@ -714,7 +714,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
received in tmp_recvbuf and then accumulated into
tmp_results. accumulation is done later below. */
mpi_errno = MPIC_Sendrecv_ft(tmp_results, 1, sendtype, dst,
mpi_errno = MPIC_Sendrecv(tmp_results, 1, sendtype, dst,
MPIR_REDUCE_SCATTER_TAG,
tmp_recvbuf, 1, recvtype, dst,
MPIR_REDUCE_SCATTER_TAG, comm,
......@@ -796,7 +796,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
}
/* The following reduction is done here instead of after
the MPIC_Sendrecv_ft or MPIC_Recv above. This is
the MPIC_Sendrecv or MPIC_Recv above. This is
because to do it above, in the noncommutative
case, we would need an extra temp buffer so as not to
overwrite temp_recvbuf, because temp_recvbuf may have
......
......@@ -119,7 +119,7 @@ static int MPIR_Reduce_scatter_block_noncomm (
send_offset += size;
}
mpi_errno = MPIC_Sendrecv_ft(outgoing_data + send_offset*true_extent,
mpi_errno = MPIC_Sendrecv(outgoing_data + send_offset*true_extent,
size, datatype, peer, MPIR_REDUCE_SCATTER_BLOCK_TAG,
incoming_data + recv_offset*true_extent,
size, datatype, peer, MPIR_REDUCE_SCATTER_BLOCK_TAG,
......@@ -431,7 +431,7 @@ int MPIR_Reduce_scatter_block_intra (
*/
/* Send data from tmp_results. Recv into tmp_recvbuf */
if ((send_cnt != 0) && (recv_cnt != 0))
mpi_errno = MPIC_Sendrecv_ft((char *) tmp_results +
mpi_errno = MPIC_Sendrecv((char *) tmp_results +
newdisps[send_idx]*extent,
send_cnt, datatype,
dst, MPIR_REDUCE_SCATTER_BLOCK_TAG,
......@@ -534,14 +534,14 @@ int MPIR_Reduce_scatter_block_intra (
/* send the data that dst needs. recv data that this process
needs from src into tmp_recvbuf */
if (sendbuf != MPI_IN_PLACE)
mpi_errno = MPIC_Sendrecv_ft(((char *)sendbuf+disps[dst]*extent),
mpi_errno = MPIC_Sendrecv(((char *)sendbuf+disps[dst]*extent),
recvcount, datatype, dst,
MPIR_REDUCE_SCATTER_BLOCK_TAG, tmp_recvbuf,
recvcount, datatype, src,
MPIR_REDUCE_SCATTER_BLOCK_TAG, comm,
MPI_STATUS_IGNORE, errflag);
else
mpi_errno = MPIC_Sendrecv_ft(((char *)recvbuf+disps[dst]*extent),
mpi_errno = MPIC_Sendrecv(((char *)recvbuf+disps[dst]*extent),
recvcount, datatype, dst,
MPIR_REDUCE_SCATTER_BLOCK_TAG, tmp_recvbuf,
recvcount, datatype, src,
......@@ -707,7 +707,7 @@ int MPIR_Reduce_scatter_block_intra (
received in tmp_recvbuf and then accumulated into
tmp_results. accumulation is done later below. */
mpi_errno = MPIC_Sendrecv_ft(tmp_results, 1, sendtype, dst,
mpi_errno = MPIC_Sendrecv(tmp_results, 1, sendtype, dst,
MPIR_REDUCE_SCATTER_BLOCK_TAG,
tmp_recvbuf, 1, recvtype, dst,
MPIR_REDUCE_SCATTER_BLOCK_TAG, comm,
......@@ -789,7 +789,7 @@ int MPIR_Reduce_scatter_block_intra (
}
/* The following reduction is done here instead of after
the MPIC_Sendrecv_ft or MPIC_Recv above. This is
the MPIC_Sendrecv or MPIC_Recv above. This is
because to do it above, in the noncommutative
case, we would need an extra temp buffer so as not to
overwrite temp_recvbuf, because temp_recvbuf may have
......
......@@ -413,7 +413,7 @@ static int MPIR_Reduce_redscat_gather (
send_cnt, recv_cnt, last_idx);
*/
/* Send data from recvbuf. Recv into tmp_buf */
mpi_errno = MPIC_Sendrecv_ft((char *) recvbuf +
mpi_errno = MPIC_Sendrecv((char *) recvbuf +
disps[send_idx]*extent,
send_cnt, datatype,
dst, MPIR_REDUCE_TAG,
......
......@@ -150,7 +150,7 @@ static int MPIR_Scan_generic (
dst = rank ^ mask;
if (dst < comm_size) {
/* Send partial_scan to dst. Recv into tmp_buf */
mpi_errno = MPIC_Sendrecv_ft(partial_scan, count, datatype,
mpi_errno = MPIC_Sendrecv(partial_scan, count, datatype,
dst, MPIR_SCAN_TAG, tmp_buf,
count, datatype, dst,
MPIR_SCAN_TAG, comm,
......
......@@ -383,7 +383,7 @@ PMPI_LOCAL int MPIR_Comm_create_inter(MPID_Comm *comm_ptr, MPID_Group *group_ptr
info[0] = new_context_id;
info[1] = group_ptr->size;
mpi_errno = MPIC_Sendrecv_ft(info, 2, MPI_INT, 0, 0,
mpi_errno = MPIC_Sendrecv(info, 2, MPI_INT, 0, 0,
rinfo, 2, MPI_INT, 0, 0,
comm, MPI_STATUS_IGNORE, &errflag );
if (mpi_errno) { MPIU_ERR_POP( mpi_errno ); }
......@@ -397,7 +397,7 @@ PMPI_LOCAL int MPIR_Comm_create_inter(MPID_Comm *comm_ptr, MPID_Group *group_ptr
mpi_errno,"remote_mapping");
/* Populate and exchange the ranks */
mpi_errno = MPIC_Sendrecv_ft( mapping, group_ptr->size, MPI_INT, 0, 0,
mpi_errno = MPIC_Sendrecv( mapping, group_ptr->size, MPI_INT, 0, 0,
remote_mapping, remote_size, MPI_INT, 0, 0,
comm, MPI_STATUS_IGNORE, &errflag );
if (mpi_errno) { MPIU_ERR_POP( mpi_errno ); }
......
......@@ -231,7 +231,7 @@ int MPIR_Comm_split_impl(MPID_Comm *comm_ptr, int color, int key, MPID_Comm **ne
/* In the intercomm case, we need to exchange the context ids */
if (comm_ptr->comm_kind == MPID_INTERCOMM) {
if (comm_ptr->rank == 0) {
mpi_errno = MPIC_Sendrecv_ft( &new_context_id, 1, MPIR_CONTEXT_ID_T_DATATYPE, 0, 0,
mpi_errno = MPIC_Sendrecv( &new_context_id, 1, MPIR_CONTEXT_ID_T_DATATYPE, 0, 0,
&remote_context_id, 1, MPIR_CONTEXT_ID_T_DATATYPE,
0, 0, comm_ptr->handle, MPI_STATUS_IGNORE, &errflag );
if (mpi_errno) { MPIU_ERR_POP( mpi_errno ); }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment