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

Rename MPIC_Send_ft to MPIC_Send



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 b8e7cbd1
......@@ -3883,7 +3883,7 @@ int MPIC_Wait(MPID_Request * request_ptr);
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,
int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
MPI_Comm comm, int *errflag);
int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
MPI_Comm comm, MPI_Status *status, int *errflag);
......
......@@ -233,7 +233,7 @@ int MPIR_Allgather_intra (
if ((dst > rank) &&
(rank < tree_root + nprocs_completed)
&& (dst >= tree_root + nprocs_completed)) {
mpi_errno = MPIC_Send_ft(((char *)recvbuf + offset),
mpi_errno = MPIC_Send(((char *)recvbuf + offset),
last_recv_cnt,
recvtype, dst,
MPIR_ALLGATHER_TAG, comm, errflag);
......@@ -394,7 +394,7 @@ int MPIR_Allgather_intra (
(rank < tree_root + nprocs_completed)
&& (dst >= tree_root + nprocs_completed)) {
mpi_errno = MPIC_Send_ft(((char *)tmp_buf + offset),
mpi_errno = MPIC_Send(((char *)tmp_buf + offset),
last_recv_cnt, MPI_BYTE,
dst, MPIR_ALLGATHER_TAG,
comm, errflag);
......
......@@ -257,7 +257,7 @@ int MPIR_Allgatherv_intra (
offset += recvcounts[j];
offset *= recvtype_extent;
mpi_errno = MPIC_Send_ft(((char *)tmp_buf + offset),
mpi_errno = MPIC_Send(((char *)tmp_buf + offset),
last_recv_cnt,
recvtype, dst,
MPIR_ALLGATHERV_TAG, comm, errflag);
......@@ -450,7 +450,7 @@ int MPIR_Allgatherv_intra (
(rank < tree_root + nprocs_completed)
&& (dst >= tree_root + nprocs_completed)) {
mpi_errno = MPIC_Send_ft(((char *)tmp_buf + offset),
mpi_errno = MPIC_Send(((char *)tmp_buf + offset),
last_recv_cnt, MPI_BYTE,
dst, MPIR_ALLGATHERV_TAG,
comm, errflag);
......@@ -683,7 +683,7 @@ int MPIR_Allgatherv_intra (
torecv -= recvnow;
}
else if (!recvnow) { /* If there's no data to receive, just do a send call */
mpi_errno = MPIC_Send_ft(sbuf, sendnow, recvtype, right, MPIR_ALLGATHERV_TAG, comm, errflag);
mpi_errno = MPIC_Send(sbuf, sendnow, recvtype, right, MPIR_ALLGATHERV_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
*errflag = TRUE;
......
......@@ -90,7 +90,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
if (group_rank < 2*rem) {
if (group_rank % 2 == 0) { /* even */
to_comm_rank(cdst, group_rank+1);
mpi_errno = MPIC_Send_ft(recvbuf, count,
mpi_errno = MPIC_Send(recvbuf, count,
datatype, cdst,
tag, comm, errflag);
if (mpi_errno) {
......@@ -329,7 +329,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
if (group_rank < 2*rem) {
if (group_rank % 2) { /* odd */
to_comm_rank(cdst, group_rank-1);
mpi_errno = MPIC_Send_ft(recvbuf, count,
mpi_errno = MPIC_Send(recvbuf, count,
datatype, cdst,
tag, comm, errflag);
}
......
......@@ -293,7 +293,7 @@ int MPIR_Allreduce_intra (
if (rank < 2*rem) {
if (rank % 2 == 0) { /* even */
mpi_errno = MPIC_Send_ft(recvbuf, count,
mpi_errno = MPIC_Send(recvbuf, count,
datatype, rank+1,
MPIR_ALLREDUCE_TAG, comm, errflag);
if (mpi_errno) {
......@@ -528,7 +528,7 @@ int MPIR_Allreduce_intra (
(rank-1), the ranks who didn't participate above. */
if (rank < 2*rem) {
if (rank % 2) /* odd */
mpi_errno = MPIC_Send_ft(recvbuf, count,
mpi_errno = MPIC_Send(recvbuf, count,
datatype, rank-1,
MPIR_ALLREDUCE_TAG, comm, errflag);
else /* even */
......
......@@ -368,7 +368,7 @@ int MPIR_Alltoall_intra(
(rank < tree_root + nprocs_completed)
&& (dst >= tree_root + nprocs_completed)) {
/* send the data received in this step above */
mpi_errno = MPIC_Send_ft(((char *)tmp_buf +
mpi_errno = MPIC_Send(((char *)tmp_buf +
dst_tree_root*sendbuf_extent),
last_recv_cnt, sendtype,
dst, MPIR_ALLTOALL_TAG,
......
......@@ -184,10 +184,10 @@ static int MPIR_Bcast_binomial(
dst = rank + mask;
if (dst >= comm_size) dst -= comm_size;
if (!is_contig || !is_homogeneous)
mpi_errno = MPIC_Send_ft(tmp_buf,nbytes,MPI_BYTE,dst,
mpi_errno = MPIC_Send(tmp_buf,nbytes,MPI_BYTE,dst,
MPIR_BCAST_TAG,comm, errflag);
else
mpi_errno = MPIC_Send_ft(buffer,count,datatype,dst,
mpi_errno = MPIC_Send(buffer,count,datatype,dst,
MPIR_BCAST_TAG,comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -333,7 +333,7 @@ static int scatter_for_bcast(
{
dst = rank + mask;
if (dst >= comm_size) dst -= comm_size;
mpi_errno = MPIC_Send_ft(((char *)tmp_buf +
mpi_errno = MPIC_Send(((char *)tmp_buf +
scatter_size*(relative_rank+mask)),
send_size, MPI_BYTE, dst,
MPIR_BCAST_TAG, comm, errflag);
......@@ -589,7 +589,7 @@ static int MPIR_Bcast_scatter_doubling_allgather(
/* printf("Rank %d, send to %d, offset %d, size %d\n", rank, dst, offset, recv_size);
fflush(stdout); */
mpi_errno = MPIC_Send_ft(((char *)tmp_buf + offset),
mpi_errno = MPIC_Send(((char *)tmp_buf + offset),
recv_size, MPI_BYTE, dst,
MPIR_BCAST_TAG, comm, errflag);
/* recv_size was set in the previous
......@@ -952,7 +952,7 @@ static int MPIR_SMP_Bcast(
MPIU_Get_intranode_rank(comm_ptr, root) > 0) /* is not the node root (0) */
{ /* and is on our node (!-1) */
if (root == comm_ptr->rank) {
mpi_errno = MPIC_Send_ft(buffer,count,datatype,0,
mpi_errno = MPIC_Send(buffer,count,datatype,0,
MPIR_BCAST_TAG,comm_ptr->node_comm->handle, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -1283,7 +1283,7 @@ int MPIR_Bcast_inter (
{
/* root sends to rank 0 on remote group and returns */
MPIDU_ERR_CHECK_MULTIPLE_THREADS_ENTER( comm_ptr );
mpi_errno = MPIC_Send_ft(buffer, count, datatype, 0,
mpi_errno = MPIC_Send(buffer, count, datatype, 0,
MPIR_BCAST_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......
......@@ -268,7 +268,7 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
if (!tmp_buf_size)
{
/* leaf nodes send directly from sendbuf */
mpi_errno = MPIC_Send_ft(sendbuf, sendcount, sendtype, dst,
mpi_errno = MPIC_Send(sendbuf, sendcount, sendtype, dst,
MPIR_GATHER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -278,7 +278,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_Send_ft(tmp_buf, curr_cnt, MPI_BYTE, dst,
mpi_errno = MPIC_Send(tmp_buf, curr_cnt, MPI_BYTE, dst,
MPIR_GATHER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -301,7 +301,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_Send_ft(MPI_BOTTOM, 1, tmp_type, dst,
mpi_errno = MPIC_Send(MPI_BOTTOM, 1, tmp_type, dst,
MPIR_GATHER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -393,7 +393,7 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
{
dst = relative_rank ^ mask;
dst = (dst + root) % comm_size;
mpi_errno = MPIC_Send_ft(tmp_buf, curr_cnt, MPI_BYTE, dst,
mpi_errno = MPIC_Send(tmp_buf, curr_cnt, MPI_BYTE, dst,
MPIR_GATHER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -560,7 +560,7 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
if (rank == 0)
{
mpi_errno = MPIC_Send_ft(tmp_buf, sendcount*local_size,
mpi_errno = MPIC_Send(tmp_buf, sendcount*local_size,
sendtype, root,
MPIR_GATHER_TAG, comm, errflag);
if (mpi_errno) {
......@@ -596,7 +596,7 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
}
else
{
mpi_errno = MPIC_Send_ft(sendbuf,sendcount,sendtype,root,
mpi_errno = MPIC_Send(sendbuf,sendcount,sendtype,root,
MPIR_GATHER_TAG,comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......
......@@ -158,7 +158,7 @@ int MPIR_Gatherv (
}
}
else {
mpi_errno = MPIC_Send_ft(sendbuf, sendcount, sendtype, root,
mpi_errno = MPIC_Send(sendbuf, sendcount, sendtype, root,
MPIR_GATHERV_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......
......@@ -396,10 +396,10 @@ int MPIC_Wait(MPID_Request * request_ptr)
this is OK since there is no data that can be received corrupted. */
#undef FUNCNAME
#define FUNCNAME MPIC_Send_ft
#define FUNCNAME MPIC_Send
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIC_Send_ft(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
MPI_Comm comm, int *errflag)
{
int mpi_errno = MPI_SUCCESS;
......
......@@ -327,7 +327,7 @@ int MPIR_Igather_binomial(const void *sendbuf, int sendcount, MPI_Datatype sendt
{
dst = relative_rank ^ mask;
dst = (dst + root) % comm_size;
mpi_errno = MPIC_Send_ft(tmp_buf, curr_cnt, MPI_BYTE, dst,
mpi_errno = MPIC_Send(tmp_buf, curr_cnt, MPI_BYTE, dst,
MPIR_GATHER_TAG, comm, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
break;
......
......@@ -388,7 +388,7 @@ int MPIR_Iscatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtyp
send_subtree_cnt = curr_cnt - nbytes * mask;
/* mask is also the size of this process's subtree */
mpi_errno = MPIC_Send_ft(((char *)tmp_buf + nbytes*mask),
mpi_errno = MPIC_Send(((char *)tmp_buf + nbytes*mask),
send_subtree_cnt, MPI_BYTE, dst,
MPIR_SCATTER_TAG, comm, errflag);
if (mpi_errno) {
......
......@@ -320,7 +320,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
if (rank < 2*rem) {
if (rank % 2 == 0) { /* even */
mpi_errno = MPIC_Send_ft(tmp_results, total_count,
mpi_errno = MPIC_Send(tmp_results, total_count,
datatype, rank+1,
MPIR_REDUCE_SCATTER_TAG, comm, errflag);
if (mpi_errno) {
......@@ -430,7 +430,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 ((recv_cnt == 0) && (send_cnt != 0))
mpi_errno = MPIC_Send_ft((char *) tmp_results +
mpi_errno = MPIC_Send((char *) tmp_results +
newdisps[send_idx]*extent,
send_cnt, datatype,
dst, MPIR_REDUCE_SCATTER_TAG,
......@@ -476,7 +476,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
if (rank < 2*rem) {
if (rank % 2) { /* odd */
if (recvcounts[rank-1]) {
mpi_errno = MPIC_Send_ft((char *) tmp_results +
mpi_errno = MPIC_Send((char *) tmp_results +
disps[rank-1]*extent, recvcounts[rank-1],
datatype, rank-1,
MPIR_REDUCE_SCATTER_TAG, comm, errflag);
......@@ -764,7 +764,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
(rank < tree_root + nprocs_completed)
&& (dst >= tree_root + nprocs_completed)) {
/* send the current result */
mpi_errno = MPIC_Send_ft(tmp_recvbuf, 1, recvtype,
mpi_errno = MPIC_Send(tmp_recvbuf, 1, recvtype,
dst, MPIR_REDUCE_SCATTER_TAG,
comm, errflag);
if (mpi_errno) {
......
......@@ -337,7 +337,7 @@ int MPIR_Reduce_scatter_block_intra (
if (rank < 2*rem) {
if (rank % 2 == 0) { /* even */
mpi_errno = MPIC_Send_ft(tmp_results, total_count,
mpi_errno = MPIC_Send(tmp_results, total_count,
datatype, rank+1,
MPIR_REDUCE_SCATTER_BLOCK_TAG, comm, errflag);
if (mpi_errno) {
......@@ -447,7 +447,7 @@ int MPIR_Reduce_scatter_block_intra (
MPIR_REDUCE_SCATTER_BLOCK_TAG, comm,
MPI_STATUS_IGNORE, errflag);
else if ((recv_cnt == 0) && (send_cnt != 0))
mpi_errno = MPIC_Send_ft((char *) tmp_results +
mpi_errno = MPIC_Send((char *) tmp_results +
newdisps[send_idx]*extent,
send_cnt, datatype,
dst, MPIR_REDUCE_SCATTER_BLOCK_TAG,
......@@ -489,7 +489,7 @@ int MPIR_Reduce_scatter_block_intra (
calculated for that process */
if (rank < 2*rem) {
if (rank % 2) { /* odd */
mpi_errno = MPIC_Send_ft((char *) tmp_results +
mpi_errno = MPIC_Send((char *) tmp_results +
disps[rank-1]*extent, recvcount,
datatype, rank-1,
MPIR_REDUCE_SCATTER_BLOCK_TAG, comm, errflag);
......@@ -757,7 +757,7 @@ int MPIR_Reduce_scatter_block_intra (
(rank < tree_root + nprocs_completed)
&& (dst >= tree_root + nprocs_completed)) {
/* send the current result */
mpi_errno = MPIC_Send_ft(tmp_recvbuf, 1, recvtype,
mpi_errno = MPIC_Send(tmp_recvbuf, 1, recvtype,
dst, MPIR_REDUCE_SCATTER_BLOCK_TAG,
comm, errflag);
if (mpi_errno) {
......
......@@ -165,7 +165,7 @@ static int MPIR_Reduce_binomial (
/* I've received all that I'm going to. Send my result to
my parent */
source = ((relrank & (~ mask)) + lroot) % comm_size;
mpi_errno = MPIC_Send_ft(recvbuf, count, datatype,
mpi_errno = MPIC_Send(recvbuf, count, datatype,
source, MPIR_REDUCE_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -182,7 +182,7 @@ static int MPIR_Reduce_binomial (
{
if (rank == 0)
{
mpi_errno = MPIC_Send_ft(recvbuf, count, datatype, root,
mpi_errno = MPIC_Send(recvbuf, count, datatype, root,
MPIR_REDUCE_TAG, comm, errflag);
}
else if (rank == root)
......@@ -327,7 +327,7 @@ static int MPIR_Reduce_redscat_gather (
if (rank < 2*rem) {
if (rank % 2 != 0) { /* odd */
mpi_errno = MPIC_Send_ft(recvbuf, count,
mpi_errno = MPIC_Send(recvbuf, count,
datatype, rank-1,
MPIR_REDUCE_TAG, comm, errflag);
if (mpi_errno) {
......@@ -482,7 +482,7 @@ static int MPIR_Reduce_redscat_gather (
last_idx = 2;
}
else if (newrank == 0) { /* send */
mpi_errno = MPIC_Send_ft(recvbuf, cnts[0], datatype,
mpi_errno = MPIC_Send(recvbuf, cnts[0], datatype,
root, MPIR_REDUCE_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -553,7 +553,7 @@ static int MPIR_Reduce_redscat_gather (
/* printf("Rank %d, send_idx %d, send_cnt %d, last_idx %d\n", newrank, send_idx, send_cnt, last_idx);
fflush(stdout); */
/* Send data from recvbuf. Recv into tmp_buf */
mpi_errno = MPIC_Send_ft((char *) recvbuf +
mpi_errno = MPIC_Send((char *) recvbuf +
disps[send_idx]*extent,
send_cnt, datatype,
dst, MPIR_REDUCE_TAG,
......@@ -948,7 +948,7 @@ int MPIR_Reduce_inter (
if (rank == 0)
{
mpi_errno = MPIC_Send_ft(tmp_buf, count, datatype, root,
mpi_errno = MPIC_Send(tmp_buf, count, datatype, root,
MPIR_REDUCE_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......
......@@ -313,7 +313,7 @@ int MPIR_Scan(
comm_ptr->node_comm != NULL &&
MPIU_Get_intranode_rank(comm_ptr, rank) == comm_ptr->node_comm->local_size - 1)
{
mpi_errno = MPIC_Send_ft(recvbuf, count, datatype,
mpi_errno = MPIC_Send(recvbuf, count, datatype,
0, MPIR_SCAN_TAG, comm_ptr->node_comm->handle, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -345,7 +345,7 @@ int MPIR_Scan(
if (MPIU_Get_internode_rank(comm_ptr, rank) !=
comm_ptr->node_roots_comm->local_size-1)
{
mpi_errno = MPIC_Send_ft(prefulldata, count, datatype,
mpi_errno = MPIC_Send(prefulldata, count, datatype,
MPIU_Get_internode_rank(comm_ptr, rank) + 1,
MPIR_SCAN_TAG, comm_ptr->node_roots_comm->handle, errflag);
if (mpi_errno) {
......
......@@ -205,7 +205,7 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
{
send_subtree_cnt = curr_cnt - sendcount * mask;
/* mask is also the size of this process's subtree */
mpi_errno = MPIC_Send_ft(((char *)sendbuf +
mpi_errno = MPIC_Send(((char *)sendbuf +
extent * sendcount * mask),
send_subtree_cnt,
sendtype, dst,
......@@ -216,7 +216,7 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
/* non-zero root and others */
send_subtree_cnt = curr_cnt - nbytes*mask;
/* mask is also the size of this process's subtree */
mpi_errno = MPIC_Send_ft(((char *)tmp_buf + nbytes*mask),
mpi_errno = MPIC_Send(((char *)tmp_buf + nbytes*mask),
send_subtree_cnt,
MPI_BYTE, dst,
MPIR_SCATTER_TAG, comm, errflag);
......@@ -356,7 +356,7 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
send_subtree_cnt = curr_cnt - nbytes * mask;
/* mask is also the size of this process's subtree */
mpi_errno = MPIC_Send_ft(((char *)tmp_buf + nbytes*mask),
mpi_errno = MPIC_Send(((char *)tmp_buf + nbytes*mask),
send_subtree_cnt, MPI_BYTE, dst,
MPIR_SCATTER_TAG, comm, errflag);
if (mpi_errno) {
......@@ -446,7 +446,7 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype
if (nbytes < MPIR_PARAM_SCATTER_INTER_SHORT_MSG_SIZE) {
if (root == MPI_ROOT) {
/* root sends all data to rank 0 on remote group and returns */
mpi_errno = MPIC_Send_ft(sendbuf, sendcount*remote_size,
mpi_errno = MPIC_Send(sendbuf, sendcount*remote_size,
sendtype, 0, MPIR_SCATTER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
......@@ -509,7 +509,7 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype
if (root == MPI_ROOT) {
MPID_Datatype_get_extent_macro(sendtype, extent);
for (i=0; i<remote_size; i++) {
mpi_errno = MPIC_Send_ft(((char *)sendbuf+sendcount*i*extent),
mpi_errno = MPIC_Send(((char *)sendbuf+sendcount*i*extent),
sendcount, sendtype, i,
MPIR_SCATTER_TAG, comm, errflag);
if (mpi_errno) {
......
......@@ -884,14 +884,14 @@ static int SendPGtoPeerAndFree( MPID_Comm *tmp_comm, int *sendtag_p,
pg_iter = pg_list;
i = pg_iter->lenStr;
/*printf("connect:sending 1 int: %d\n", i);fflush(stdout);*/
mpi_errno = MPIC_Send_ft(&i, 1, MPI_INT, 0, sendtag++, tmp_comm->handle, &errflag);
mpi_errno = MPIC_Send(&i, 1, MPI_INT, 0, sendtag++, tmp_comm->handle, &errflag);
*sendtag_p = sendtag;
if (mpi_errno != MPI_SUCCESS) {
MPIU_ERR_POP(mpi_errno);
}
/* printf("connect:sending string length %d\n", i);fflush(stdout); */
mpi_errno = MPIC_Send_ft(pg_iter->str, i, MPI_CHAR, 0, sendtag++,
mpi_errno = MPIC_Send(pg_iter->str, i, MPI_CHAR, 0, sendtag++,
tmp_comm->handle, &errflag);
*sendtag_p = sendtag;
if (mpi_errno != MPI_SUCCESS) {
......
......@@ -1099,14 +1099,14 @@ static int MPIDI_SendPGtoPeerAndFree( struct MPID_Comm *tmp_comm, int *sendtag_p
pg_iter = pg_list;
i = pg_iter->lenStr;
TRACE_ERR("connect:sending 1 int: %d\n", i);
mpi_errno = MPIC_Send_ft(&i, 1, MPI_INT, 0, sendtag++, tmp_comm->handle, &errflag);
mpi_errno = MPIC_Send(&i, 1, MPI_INT, 0, sendtag++, tmp_comm->handle, &errflag);
*sendtag_p = sendtag;
if (mpi_errno != MPI_SUCCESS) {
TRACE_ERR("MPIC_Send returned with mpi_errno=%d\n", mpi_errno);
}
TRACE_ERR("connect:sending string length %d\n", i);
mpi_errno = MPIC_Send_ft(pg_iter->str, i, MPI_CHAR, 0, sendtag++,
mpi_errno = MPIC_Send(pg_iter->str, i, MPI_CHAR, 0, sendtag++,
tmp_comm->handle, &errflag);
*sendtag_p = sendtag;
if (mpi_errno != MPI_SUCCESS) {
......
......@@ -422,7 +422,7 @@ int _mpi_reduce_for_dyntask(int *sendbuf, int *recvbuf)
parent_rank = (parent) % TASKS;
result += *recvbuf;
TRACE_ERR("_mpi_reduce_for_dyntask - send to parent_rank=%d parent taskid=%d \n", parent_rank, pg_world->vct[parent_rank].taskid);
MPIC_Send_ft(&result, sizeof(int), MPI_BYTE, parent_rank, tag, comm_ptr->handle, &errflag);
MPIC_Send(&result, sizeof(int), MPI_BYTE, parent_rank, tag, comm_ptr->handle, &errflag);
}
else
{
......@@ -438,7 +438,7 @@ int _mpi_reduce_for_dyntask(int *sendbuf, int *recvbuf)
if(world_rank != parent && numchildren == 0) {
parent_rank = (parent) % TASKS;
TRACE_ERR("_mpi_reduce_for_dyntask - send to parent_rank=%d parent_task_id=%d\n", parent_rank, pg_world->vct[parent_rank].taskid);
MPIC_Send_ft(sendbuf, sizeof(int), MPI_BYTE, parent_rank, tag, comm_ptr->handle, &errflag);
MPIC_Send(sendbuf, sizeof(int), MPI_BYTE, parent_rank, tag, comm_ptr->handle, &errflag);
}
if(world_rank == 0) {
......
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