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

Rename MPIC_Recv_ft to MPIC_Recv



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.
Signed-off-by: Pavan Balaji's avatarPavan Balaji <balaji@mcs.anl.gov>
parent 2204a718
......@@ -3885,7 +3885,7 @@ int MPIC_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status);
/* FT versions of te MPIC_ functions */
int MPIC_Send_ft(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
MPI_Comm comm, int *errflag);
int MPIC_Recv_ft(void *buf, int count, MPI_Datatype datatype, int source, int tag,
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_ft(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
MPI_Comm comm, int *errflag);
......
......@@ -252,7 +252,7 @@ int MPIR_Allgather_intra (
else if ((dst < rank) &&
(dst < tree_root + nprocs_completed) &&
(rank >= tree_root + nprocs_completed)) {
mpi_errno = MPIC_Recv_ft(((char *)recvbuf + offset),
mpi_errno = MPIC_Recv(((char *)recvbuf + offset),
(comm_size - (my_tree_root + mask))*recvcount,
recvtype, dst,
MPIR_ALLGATHER_TAG,
......@@ -413,7 +413,7 @@ int MPIR_Allgather_intra (
else if ((dst < rank) &&
(dst < tree_root + nprocs_completed) &&
(rank >= tree_root + nprocs_completed)) {
mpi_errno = MPIC_Recv_ft(((char *)tmp_buf + offset),
mpi_errno = MPIC_Recv(((char *)tmp_buf + offset),
tmp_buf_size - offset,
MPI_BYTE, dst,
MPIR_ALLGATHER_TAG,
......
......@@ -281,7 +281,7 @@ int MPIR_Allgatherv_intra (
for (j=0; j<(my_tree_root+mask); j++)
offset += recvcounts[j];
mpi_errno = MPIC_Recv_ft(((char *)tmp_buf + offset * recvtype_extent),
mpi_errno = MPIC_Recv(((char *)tmp_buf + offset * recvtype_extent),
total_count - offset, recvtype,
dst, MPIR_ALLGATHERV_TAG,
comm, &status, errflag);
......@@ -469,7 +469,7 @@ int MPIR_Allgatherv_intra (
else if ((dst < rank) &&
(dst < tree_root + nprocs_completed) &&
(rank >= tree_root + nprocs_completed)) {
mpi_errno = MPIC_Recv_ft(((char *)tmp_buf + offset),
mpi_errno = MPIC_Recv(((char *)tmp_buf + offset),
tmp_buf_size-offset, MPI_BYTE,
dst,
MPIR_ALLGATHERV_TAG,
......@@ -673,7 +673,7 @@ int MPIR_Allgatherv_intra (
* consecutive processes contribute 0 bytes each. */
}
else if (!sendnow) { /* If there's no data to send, just do a recv call */
mpi_errno = MPIC_Recv_ft(rbuf, recvnow, recvtype, left, MPIR_ALLGATHERV_TAG, comm, &status, errflag);
mpi_errno = MPIC_Recv(rbuf, recvnow, recvtype, left, MPIR_ALLGATHERV_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
*errflag = TRUE;
......
......@@ -107,7 +107,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
}
else { /* odd */
to_comm_rank(csrc, group_rank-1);
mpi_errno = MPIC_Recv_ft(tmp_buf, count,
mpi_errno = MPIC_Recv(tmp_buf, count,
datatype, csrc,
tag, comm,
MPI_STATUS_IGNORE, errflag);
......@@ -335,7 +335,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
}
else { /* even */
to_comm_rank(csrc, group_rank+1);
mpi_errno = MPIC_Recv_ft(recvbuf, count,
mpi_errno = MPIC_Recv(recvbuf, count,
datatype, csrc,
tag, comm,
MPI_STATUS_IGNORE, errflag);
......
......@@ -309,7 +309,7 @@ int MPIR_Allreduce_intra (
newrank = -1;
}
else { /* odd */
mpi_errno = MPIC_Recv_ft(tmp_buf, count,
mpi_errno = MPIC_Recv(tmp_buf, count,
datatype, rank-1,
MPIR_ALLREDUCE_TAG, comm,
MPI_STATUS_IGNORE, errflag);
......@@ -532,7 +532,7 @@ int MPIR_Allreduce_intra (
datatype, rank-1,
MPIR_ALLREDUCE_TAG, comm, errflag);
else /* even */
mpi_errno = MPIC_Recv_ft(recvbuf, count,
mpi_errno = MPIC_Recv(recvbuf, count,
datatype, rank+1,
MPIR_ALLREDUCE_TAG, comm,
MPI_STATUS_IGNORE, errflag);
......
......@@ -385,7 +385,7 @@ int MPIR_Alltoall_intra(
else if ((dst < rank) &&
(dst < tree_root + nprocs_completed) &&
(rank >= tree_root + nprocs_completed)) {
mpi_errno = MPIC_Recv_ft(((char *)tmp_buf +
mpi_errno = MPIC_Recv(((char *)tmp_buf +
dst_tree_root*sendbuf_extent),
sendbuf_extent*(comm_size-dst_tree_root),
sendtype,
......
......@@ -138,10 +138,10 @@ static int MPIR_Bcast_binomial(
src = rank - mask;
if (src < 0) src += comm_size;
if (!is_contig || !is_homogeneous)
mpi_errno = MPIC_Recv_ft(tmp_buf,nbytes,MPI_BYTE,src,
mpi_errno = MPIC_Recv(tmp_buf,nbytes,MPI_BYTE,src,
MPIR_BCAST_TAG,comm, &status, errflag);
else
mpi_errno = MPIC_Recv_ft(buffer,count,datatype,src,
mpi_errno = MPIC_Recv(buffer,count,datatype,src,
MPIR_BCAST_TAG,comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -297,7 +297,7 @@ static int scatter_for_bcast(
}
else
{
mpi_errno = MPIC_Recv_ft(((char *)tmp_buf +
mpi_errno = MPIC_Recv(((char *)tmp_buf +
relative_rank*scatter_size),
recv_size, MPI_BYTE, src,
MPIR_BCAST_TAG, comm, &status, errflag);
......@@ -610,7 +610,7 @@ static int MPIR_Bcast_scatter_doubling_allgather(
{
/* printf("Rank %d waiting to recv from rank %d\n",
relative_rank, dst); */
mpi_errno = MPIC_Recv_ft(((char *)tmp_buf + offset),
mpi_errno = MPIC_Recv(((char *)tmp_buf + offset),
nbytes - offset,
MPI_BYTE, dst, MPIR_BCAST_TAG,
comm, &status, errflag);
......@@ -962,7 +962,7 @@ static int MPIR_SMP_Bcast(
}
}
else if (0 == comm_ptr->node_comm->rank) {
mpi_errno = MPIC_Recv_ft(buffer,count,datatype,MPIU_Get_intranode_rank(comm_ptr, root),
mpi_errno = MPIC_Recv(buffer,count,datatype,MPIU_Get_intranode_rank(comm_ptr, root),
MPIR_BCAST_TAG,comm_ptr->node_comm->handle, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -1301,7 +1301,7 @@ int MPIR_Bcast_inter (
if (rank == 0)
{
mpi_errno = MPIC_Recv_ft(buffer, count, datatype, root,
mpi_errno = MPIC_Recv(buffer, count, datatype, root,
MPIR_BCAST_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......
......@@ -184,7 +184,7 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
* receive buffer, place it directly. This
* should cover the case where the root is
* rank 0. */
mpi_errno = MPIC_Recv_ft(((char *)recvbuf +
mpi_errno = MPIC_Recv(((char *)recvbuf +
(((rank + mask) % comm_size)*recvcount*extent)),
recvblks * recvcount, recvtype, src,
MPIR_GATHER_TAG, comm,
......@@ -197,7 +197,7 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
}
}
else if (nbytes < MPIR_PARAM_GATHER_VSMALL_MSG_SIZE) {
mpi_errno = MPIC_Recv_ft(tmp_buf, recvblks * nbytes, MPI_BYTE,
mpi_errno = MPIC_Recv(tmp_buf, recvblks * nbytes, MPI_BYTE,
src, MPIR_GATHER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -220,7 +220,7 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
mpi_errno = MPIR_Type_commit_impl(&tmp_type);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
mpi_errno = MPIC_Recv_ft(recvbuf, 1, tmp_type, src,
mpi_errno = MPIC_Recv(recvbuf, 1, tmp_type, src,
MPIR_GATHER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -246,7 +246,7 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
offset = mask * nbytes;
else
offset = (mask - 1) * nbytes;
mpi_errno = MPIC_Recv_ft(((char *)tmp_buf + offset),
mpi_errno = MPIC_Recv(((char *)tmp_buf + offset),
recvblks * nbytes, MPI_BYTE, src,
MPIR_GATHER_TAG, comm,
&status, errflag);
......@@ -372,7 +372,7 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
if (src < comm_size)
{
src = (src + root) % comm_size;
mpi_errno = MPIC_Recv_ft(((char *)tmp_buf + curr_cnt),
mpi_errno = MPIC_Recv(((char *)tmp_buf + curr_cnt),
tmp_buf_size-curr_cnt, MPI_BYTE, src,
MPIR_GATHER_TAG, comm,
&status, errflag);
......@@ -509,7 +509,7 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
if (root == MPI_ROOT)
{
/* root receives data from rank 0 on remote group */
mpi_errno = MPIC_Recv_ft(recvbuf, recvcount*remote_size,
mpi_errno = MPIC_Recv(recvbuf, recvcount*remote_size,
recvtype, 0, MPIR_GATHER_TAG, comm,
&status, errflag);
if (mpi_errno) {
......@@ -583,7 +583,7 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
for (i=0; i<remote_size; i++)
{
mpi_errno = MPIC_Recv_ft(((char *)recvbuf+recvcount*i*extent),
mpi_errno = MPIC_Recv(((char *)recvbuf+recvcount*i*extent),
recvcount, recvtype, i,
MPIR_GATHER_TAG, comm, &status, errflag);
if (mpi_errno) {
......
......@@ -442,10 +442,10 @@ int MPIC_Send_ft(const void *buf, int count, MPI_Datatype datatype, int dest, in
}
#undef FUNCNAME
#define FUNCNAME MPIC_Recv_ft
#define FUNCNAME MPIC_Recv
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIC_Recv_ft(void *buf, int count, MPI_Datatype datatype, int source, int tag,
int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
MPI_Comm comm, MPI_Status *status, int *errflag)
{
int mpi_errno = MPI_SUCCESS;
......
......@@ -312,7 +312,7 @@ int MPIR_Igather_binomial(const void *sendbuf, int sendcount, MPI_Datatype sendt
src = relative_rank | mask;
if (src < comm_size) {
src = (src + root) % comm_size;
mpi_errno = MPIC_Recv_ft(((char *)tmp_buf + curr_cnt),
mpi_errno = MPIC_Recv(((char *)tmp_buf + curr_cnt),
tmp_buf_size-curr_cnt, MPI_BYTE, src,
MPIR_GATHER_TAG, comm,
&status, 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_ft above. This is
the MPIC_Sendrecv_ft 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_ft above. This is
the MPIC_Sendrecv_ft 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
......
......@@ -358,7 +358,7 @@ int MPIR_Iscatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtyp
src = rank - mask;
if (src < 0) src += comm_size;
mpi_errno = MPIC_Recv_ft(tmp_buf, tmp_buf_size, MPI_BYTE, src,
mpi_errno = MPIC_Recv(tmp_buf, tmp_buf_size, MPI_BYTE, src,
MPIR_SCATTER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......
......@@ -336,7 +336,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
newrank = -1;
}
else { /* odd */
mpi_errno = MPIC_Recv_ft(tmp_recvbuf, total_count,
mpi_errno = MPIC_Recv(tmp_recvbuf, total_count,
datatype, rank-1,
MPIR_REDUCE_SCATTER_TAG, comm,
MPI_STATUS_IGNORE, errflag);
......@@ -424,7 +424,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
MPIR_REDUCE_SCATTER_TAG, comm,
MPI_STATUS_IGNORE, errflag);
else if ((send_cnt == 0) && (recv_cnt != 0))
mpi_errno = MPIC_Recv_ft((char *) tmp_recvbuf +
mpi_errno = MPIC_Recv((char *) tmp_recvbuf +
newdisps[recv_idx]*extent,
recv_cnt, datatype, dst,
MPIR_REDUCE_SCATTER_TAG, comm,
......@@ -490,7 +490,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
}
else { /* even */
if (recvcounts[rank]) {
mpi_errno = MPIC_Recv_ft(recvbuf, recvcounts[rank],
mpi_errno = MPIC_Recv(recvbuf, recvcounts[rank],
datatype, rank+1,
MPIR_REDUCE_SCATTER_TAG, comm,
MPI_STATUS_IGNORE, errflag);
......@@ -779,7 +779,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
else if ((dst < rank) &&
(dst < tree_root + nprocs_completed) &&
(rank >= tree_root + nprocs_completed)) {
mpi_errno = MPIC_Recv_ft(tmp_recvbuf, 1, recvtype, dst,
mpi_errno = MPIC_Recv(tmp_recvbuf, 1, recvtype, dst,
MPIR_REDUCE_SCATTER_TAG,
comm, MPI_STATUS_IGNORE, errflag);
received = 1;
......@@ -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_ft above. This is
the MPIC_Sendrecv_ft 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
......
......@@ -353,7 +353,7 @@ int MPIR_Reduce_scatter_block_intra (
newrank = -1;
}
else { /* odd */
mpi_errno = MPIC_Recv_ft(tmp_recvbuf, total_count,
mpi_errno = MPIC_Recv(tmp_recvbuf, total_count,
datatype, rank-1,
MPIR_REDUCE_SCATTER_BLOCK_TAG, comm,
MPI_STATUS_IGNORE, errflag);
......@@ -441,7 +441,7 @@ int MPIR_Reduce_scatter_block_intra (
MPIR_REDUCE_SCATTER_BLOCK_TAG, comm,
MPI_STATUS_IGNORE, errflag);
else if ((send_cnt == 0) && (recv_cnt != 0))
mpi_errno = MPIC_Recv_ft((char *) tmp_recvbuf +
mpi_errno = MPIC_Recv((char *) tmp_recvbuf +
newdisps[recv_idx]*extent,
recv_cnt, datatype, dst,
MPIR_REDUCE_SCATTER_BLOCK_TAG, comm,
......@@ -495,7 +495,7 @@ int MPIR_Reduce_scatter_block_intra (
MPIR_REDUCE_SCATTER_BLOCK_TAG, comm, errflag);
}
else { /* even */
mpi_errno = MPIC_Recv_ft(recvbuf, recvcount,
mpi_errno = MPIC_Recv(recvbuf, recvcount,
datatype, rank+1,
MPIR_REDUCE_SCATTER_BLOCK_TAG, comm,
MPI_STATUS_IGNORE, errflag);
......@@ -772,7 +772,7 @@ int MPIR_Reduce_scatter_block_intra (
else if ((dst < rank) &&
(dst < tree_root + nprocs_completed) &&
(rank >= tree_root + nprocs_completed)) {
mpi_errno = MPIC_Recv_ft(tmp_recvbuf, 1, recvtype, dst,
mpi_errno = MPIC_Recv(tmp_recvbuf, 1, recvtype, dst,
MPIR_REDUCE_SCATTER_BLOCK_TAG,
comm, MPI_STATUS_IGNORE, errflag);
received = 1;
......@@ -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_ft above. This is
the MPIC_Sendrecv_ft 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
......
......@@ -136,7 +136,7 @@ static int MPIR_Reduce_binomial (
source = (relrank | mask);
if (source < comm_size) {
source = (source + lroot) % comm_size;
mpi_errno = MPIC_Recv_ft(tmp_buf, count, datatype, source,
mpi_errno = MPIC_Recv(tmp_buf, count, datatype, source,
MPIR_REDUCE_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -187,7 +187,7 @@ static int MPIR_Reduce_binomial (
}
else if (rank == root)
{
mpi_errno = MPIC_Recv_ft(recvbuf, count, datatype, 0,
mpi_errno = MPIC_Recv(recvbuf, count, datatype, 0,
MPIR_REDUCE_TAG, comm, &status, errflag);
}
if (mpi_errno) {
......@@ -343,7 +343,7 @@ static int MPIR_Reduce_redscat_gather (
newrank = -1;
}
else { /* even */
mpi_errno = MPIC_Recv_ft(tmp_buf, count,
mpi_errno = MPIC_Recv(tmp_buf, count,
datatype, rank+1,
MPIR_REDUCE_TAG, comm,
MPI_STATUS_IGNORE, errflag);
......@@ -468,7 +468,7 @@ static int MPIR_Reduce_redscat_gather (
for (i=1; i<pof2; i++)
disps[i] = disps[i-1] + cnts[i-1];
mpi_errno = MPIC_Recv_ft(recvbuf, cnts[0], datatype,
mpi_errno = MPIC_Recv(recvbuf, cnts[0], datatype,
0, MPIR_REDUCE_TAG, comm,
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
......@@ -570,7 +570,7 @@ static int MPIR_Reduce_redscat_gather (
/* recv and continue */
/* printf("Rank %d, recv_idx %d, recv_cnt %d, last_idx %d\n", newrank, recv_idx, recv_cnt, last_idx);
fflush(stdout); */
mpi_errno = MPIC_Recv_ft((char *) recvbuf +
mpi_errno = MPIC_Recv((char *) recvbuf +
disps[recv_idx]*extent,
recv_cnt, datatype, dst,
MPIR_REDUCE_TAG, comm,
......@@ -899,7 +899,7 @@ int MPIR_Reduce_inter (
if (root == MPI_ROOT) {
/* root receives data from rank 0 on remote group */
mpi_errno = MPIC_Recv_ft(recvbuf, count, datatype, 0,
mpi_errno = MPIC_Recv(recvbuf, count, datatype, 0,
MPIR_REDUCE_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......
......@@ -299,7 +299,7 @@ int MPIR_Scan(
reduced data of rank 1,2,3. */
if (comm_ptr->node_roots_comm != NULL && comm_ptr->node_comm != NULL)
{
mpi_errno = MPIC_Recv_ft(localfulldata, count, datatype,
mpi_errno = MPIC_Recv(localfulldata, count, datatype,
comm_ptr->node_comm->local_size - 1, MPIR_SCAN_TAG,
comm_ptr->node_comm->handle, &status, errflag);
if (mpi_errno) {
......@@ -357,7 +357,7 @@ int MPIR_Scan(
}
if (MPIU_Get_internode_rank(comm_ptr, rank) != 0)
{
mpi_errno = MPIC_Recv_ft(tempbuf, count, datatype,
mpi_errno = MPIC_Recv(tempbuf, count, datatype,
MPIU_Get_internode_rank(comm_ptr, rank) - 1,
MPIR_SCAN_TAG, comm_ptr->node_roots_comm->handle,
&status, errflag);
......
......@@ -161,7 +161,7 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
they don't have to forward data to anyone. Others
receive data into a temporary buffer. */
if (relative_rank % 2) {
mpi_errno = MPIC_Recv_ft(recvbuf, recvcount, recvtype,
mpi_errno = MPIC_Recv(recvbuf, recvcount, recvtype,
src, MPIR_SCATTER_TAG, comm,
&status, errflag);
if (mpi_errno) {
......@@ -172,7 +172,7 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
}
}
else {
mpi_errno = MPIC_Recv_ft(tmp_buf, tmp_buf_size, MPI_BYTE, src,
mpi_errno = MPIC_Recv(tmp_buf, tmp_buf_size, MPI_BYTE, src,
MPIR_SCATTER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -326,7 +326,7 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
src = rank - mask;
if (src < 0) src += comm_size;
mpi_errno = MPIC_Recv_ft(tmp_buf, tmp_buf_size, MPI_BYTE, src,
mpi_errno = MPIC_Recv(tmp_buf, tmp_buf_size, MPI_BYTE, src,
MPIR_SCATTER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -475,7 +475,7 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype
/* adjust for potential negative lower bound in datatype */
tmp_buf = (void *)((char*)tmp_buf - true_lb);
mpi_errno = MPIC_Recv_ft(tmp_buf, recvcount*local_size,
mpi_errno = MPIC_Recv(tmp_buf, recvcount*local_size,
recvtype, root,
MPIR_SCATTER_TAG, comm, &status, errflag);
if (mpi_errno) {
......@@ -521,7 +521,7 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype
}
}
else {
mpi_errno = MPIC_Recv_ft(recvbuf,recvcount,recvtype,root,
mpi_errno = MPIC_Recv(recvbuf,recvcount,recvtype,root,
MPIR_SCATTER_TAG,comm,&status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......
......@@ -128,7 +128,7 @@ int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs,
else if (root != MPI_PROC_NULL) { /* non-root nodes, and in the intercomm. case, non-root nodes on remote side */
if (recvcount) {
mpi_errno = MPIC_Recv_ft(recvbuf,recvcount,recvtype,root,
mpi_errno = MPIC_Recv(recvbuf,recvcount,recvtype,root,
MPIR_SCATTERV_TAG,comm,MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......
......@@ -318,7 +318,7 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[],
buf = MPIU_Malloc(count*sizeof(int));
MPIU_ERR_CHKANDJUMP(!buf, mpi_errno, MPI_ERR_OTHER, "**nomem");
mpi_errno = MPIC_Recv_ft(buf, count, MPI_INT, MPI_ANY_SOURCE, MPIR_TOPO_A_TAG, comm_old, MPI_STATUS_IGNORE, &errflag);
mpi_errno = MPIC_Recv(buf, count, MPI_INT, MPI_ANY_SOURCE, MPIR_TOPO_A_TAG, comm_old, MPI_STATUS_IGNORE, &errflag);
/* FIXME: buf is never freed on error! */
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
......@@ -352,7 +352,7 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[],
buf = MPIU_Malloc(count*sizeof(int));
MPIU_ERR_CHKANDJUMP(!buf, mpi_errno, MPI_ERR_OTHER, "**nomem");
mpi_errno = MPIC_Recv_ft(buf, count, MPI_INT, MPI_ANY_SOURCE, MPIR_TOPO_B_TAG, comm_old, MPI_STATUS_IGNORE, &errflag);
mpi_errno = MPIC_Recv(buf, count, MPI_INT, MPI_ANY_SOURCE, MPIR_TOPO_B_TAG, comm_old, MPI_STATUS_IGNORE, &errflag);
/* FIXME: buf is never freed on error! */
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