if (group == NULL) {
retval = MPI_ERR_ARG;
} else {
+ if(*group!= smpi_comm_group(MPI_COMM_WORLD))// do not free the group of the comm_world
smpi_group_destroy(*group);
*group = MPI_GROUP_NULL;
retval = MPI_SUCCESS;
if (i >= n) {
index = smpi_group_index(group, rank);
smpi_group_set_mapping(*newgroup, index, rank);
- rank++;
+
}
+ rank++;
}
}
smpi_group_use(*newgroup);
smpi_group_set_mapping(*newgroup, index, newrank);
}
}
+ newrank++; //added to avoid looping, need to be checked ..
}
}
}
retval = MPI_ERR_ARG;
} else if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
+ } else if (dst == MPI_PROC_NULL) {
+ retval = MPI_SUCCESS;
} else {
*request = smpi_mpi_send_init(buf, count, datatype, dst, tag, comm);
retval = MPI_SUCCESS;
retval = MPI_ERR_ARG;
} else if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
+ } else if (src == MPI_PROC_NULL) {
+ retval = MPI_SUCCESS;
} else {
*request = smpi_mpi_recv_init(buf, count, datatype, src, tag, comm);
retval = MPI_SUCCESS;
int retval;
smpi_bench_end();
- if (request == NULL) {
+ if (request == NULL || *request == MPI_REQUEST_NULL) {
retval = MPI_ERR_ARG;
} else {
smpi_mpi_start(*request);
int retval;
smpi_bench_end();
- if (request == NULL) {
+ if (request == MPI_REQUEST_NULL) {
retval = MPI_ERR_ARG;
} else {
smpi_mpi_request_free(request);
int retval;
smpi_bench_end();
-#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
- int src_traced = smpi_group_rank(smpi_comm_group(comm), src);
- TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__);
-#endif
+
if (request == NULL) {
retval = MPI_ERR_ARG;
} else if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
+ } else if (src == MPI_PROC_NULL) {
+ *request = MPI_REQUEST_NULL;
+ retval = MPI_SUCCESS;
+ } else if (src!=MPI_ANY_SOURCE && (src >= smpi_group_size(smpi_comm_group(comm)) || src <0)){
+ retval = MPI_ERR_COMM;
+ } else if (count < 0) {
+ retval = MPI_ERR_COUNT;
+ } else if (buf==NULL && count > 0) {
+ retval = MPI_ERR_COUNT;
+ } else if (datatype == MPI_DATATYPE_NULL){
+ retval = MPI_ERR_TYPE;
+ } else if(tag<0 && tag != MPI_ANY_TAG){
+ retval = MPI_ERR_TAG;
} else {
+
+#ifdef HAVE_TRACING
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int src_traced = smpi_group_index(smpi_comm_group(comm), src);
+ TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__);
+#endif
+
*request = smpi_mpi_irecv(buf, count, datatype, src, tag, comm);
retval = MPI_SUCCESS;
- }
+
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__);
(*request)->recv = 1;
#endif
+ }
+
smpi_bench_begin();
return retval;
}
int retval;
smpi_bench_end();
-#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
- TRACE_smpi_computing_out(rank);
- int dst_traced = smpi_group_rank(smpi_comm_group(comm), dst);
- TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__);
- TRACE_smpi_send(rank, rank, dst_traced);
-#endif
if (request == NULL) {
retval = MPI_ERR_ARG;
} else if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
+ } else if (dst == MPI_PROC_NULL) {
+ *request = MPI_REQUEST_NULL;
+ retval = MPI_SUCCESS;
+ } else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0){
+ retval = MPI_ERR_COMM;
+ } else if (count < 0) {
+ retval = MPI_ERR_COUNT;
+ } else if (buf==NULL && count > 0) {
+ retval = MPI_ERR_COUNT;
+ } else if (datatype == MPI_DATATYPE_NULL){
+ retval = MPI_ERR_TYPE;
+ } else if(tag<0 && tag != MPI_ANY_TAG){
+ retval = MPI_ERR_TAG;
} else {
+
+#ifdef HAVE_TRACING
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ TRACE_smpi_computing_out(rank);
+ int dst_traced = smpi_group_index(smpi_comm_group(comm), dst);
+ TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__);
+ TRACE_smpi_send(rank, rank, dst_traced);
+#endif
+
*request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm);
retval = MPI_SUCCESS;
- }
+
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__);
(*request)->send = 1;
TRACE_smpi_computing_in(rank);
#endif
+ }
+
smpi_bench_begin();
return retval;
}
int retval;
smpi_bench_end();
+
+ if (comm == MPI_COMM_NULL) {
+ retval = MPI_ERR_COMM;
+ } else if (src == MPI_PROC_NULL) {
+ smpi_empty_status(status);
+ status->MPI_SOURCE = MPI_PROC_NULL;
+ retval = MPI_SUCCESS;
+ } else if (src!=MPI_ANY_SOURCE && (src >= smpi_group_size(smpi_comm_group(comm)) || src <0)){
+ retval = MPI_ERR_COMM;
+ } else if (count < 0) {
+ retval = MPI_ERR_COUNT;
+ } else if (buf==NULL && count > 0) {
+ retval = MPI_ERR_COUNT;
+ } else if (datatype == MPI_DATATYPE_NULL){
+ retval = MPI_ERR_TYPE;
+ } else if(tag<0 && tag != MPI_ANY_TAG){
+ retval = MPI_ERR_TAG;
+ } else {
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
- int src_traced = smpi_group_rank(smpi_comm_group(comm), src);
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int src_traced = smpi_group_index(smpi_comm_group(comm), src);
TRACE_smpi_computing_out(rank);
TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__);
#endif
- if (comm == MPI_COMM_NULL) {
- retval = MPI_ERR_COMM;
- } else {
+
smpi_mpi_recv(buf, count, datatype, src, tag, comm, status);
retval = MPI_SUCCESS;
- }
+
#ifdef HAVE_TRACING
//the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE)
- if(status!=MPI_STATUS_IGNORE)src_traced = smpi_group_rank(smpi_comm_group(comm), status->MPI_SOURCE);
+ if(status!=MPI_STATUS_IGNORE)src_traced = smpi_group_index(smpi_comm_group(comm), status->MPI_SOURCE);
TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__);
TRACE_smpi_recv(rank, src_traced, rank);
TRACE_smpi_computing_in(rank);
#endif
+ }
+
smpi_bench_begin();
return retval;
}
int retval;
smpi_bench_end();
+
+ if (comm == MPI_COMM_NULL) {
+ retval = MPI_ERR_COMM;
+ } else if (dst == MPI_PROC_NULL) {
+ retval = MPI_SUCCESS;
+ } else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0){
+ retval = MPI_ERR_COMM;
+ } else if (count < 0) {
+ retval = MPI_ERR_COUNT;
+ } else if (buf==NULL && count > 0) {
+ retval = MPI_ERR_COUNT;
+ } else if (datatype == MPI_DATATYPE_NULL){
+ retval = MPI_ERR_TYPE;
+ } else if(tag<0 && tag != MPI_ANY_TAG){
+ retval = MPI_ERR_TAG;
+ } else {
+
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
- int dst_traced = smpi_group_rank(smpi_comm_group(comm), dst);
+ int dst_traced = smpi_group_index(smpi_comm_group(comm), dst);
TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__);
TRACE_smpi_send(rank, rank, dst_traced);
#endif
- if (comm == MPI_COMM_NULL) {
- retval = MPI_ERR_COMM;
- } else {
+
smpi_mpi_send(buf, count, datatype, dst, tag, comm);
retval = MPI_SUCCESS;
- }
+
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__);
TRACE_smpi_computing_in(rank);
#endif
+ }
+
smpi_bench_begin();
return retval;
}
int retval;
smpi_bench_end();
-#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
- TRACE_smpi_computing_out(rank);
- int dst_traced = smpi_group_rank(smpi_comm_group(comm), dst);
- int src_traced = smpi_group_rank(smpi_comm_group(comm), src);
- TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__);
- TRACE_smpi_send(rank, rank, dst_traced);
- TRACE_smpi_send(rank, src_traced, rank);
-#endif
+
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
} else if (sendtype == MPI_DATATYPE_NULL
|| recvtype == MPI_DATATYPE_NULL) {
retval = MPI_ERR_TYPE;
+ } else if (src == MPI_PROC_NULL || dst == MPI_PROC_NULL) {
+ smpi_empty_status(status);
+ status->MPI_SOURCE = MPI_PROC_NULL;
+ retval = MPI_SUCCESS;
+ }else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0 ||
+ (src!=MPI_ANY_SOURCE && (src >= smpi_group_size(smpi_comm_group(comm)) || src <0))){
+ retval = MPI_ERR_COMM;
+ } else if (sendcount < 0 || recvcount<0) {
+ retval = MPI_ERR_COUNT;
+ } else if ((sendbuf==NULL && sendcount > 0)||(recvbuf==NULL && recvcount>0)) {
+ retval = MPI_ERR_COUNT;
+ } else if((sendtag<0 && sendtag != MPI_ANY_TAG)||(recvtag<0 && recvtag != MPI_ANY_TAG)){
+ retval = MPI_ERR_TAG;
} else {
+
+#ifdef HAVE_TRACING
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ TRACE_smpi_computing_out(rank);
+ int dst_traced = smpi_group_index(smpi_comm_group(comm), dst);
+ int src_traced = smpi_group_index(smpi_comm_group(comm), src);
+ TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__);
+ TRACE_smpi_send(rank, rank, dst_traced);
+ TRACE_smpi_send(rank, src_traced, rank);
+#endif
+
+
smpi_mpi_sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf,
recvcount, recvtype, src, recvtag, comm, status);
retval = MPI_SUCCESS;
- }
+
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, src_traced, dst_traced, __FUNCTION__);
TRACE_smpi_recv(rank, rank, dst_traced);
TRACE_smpi_recv(rank, src_traced, rank);
TRACE_smpi_computing_in(rank);
-
#endif
+
+ }
+
smpi_bench_begin();
return retval;
}
MPI_Comm comm, MPI_Status * status)
{
//TODO: suboptimal implementation
- void *recvbuf;
- int retval, size;
+ // void *recvbuf;
+ int retval;
- size = smpi_datatype_size(datatype) * count;
- recvbuf = xbt_new(char, size);
+// size = smpi_datatype_size(datatype) * count;
+// recvbuf = xbt_new(char, size);
retval =
- MPI_Sendrecv(buf, count, datatype, dst, sendtag, recvbuf, count,
+ MPI_Sendrecv(buf, count, datatype, dst, sendtag, buf, count,
datatype, src, recvtag, comm, status);
- memcpy(buf, recvbuf, size * sizeof(char));
- xbt_free(recvbuf);
+/*memcpy(buf, recvbuf, size * sizeof(char));
+ xbt_free(recvbuf);*/
return retval;
}
int retval;
smpi_bench_end();
- if (request == NULL || flag == NULL) {
+ if (request == MPI_REQUEST_NULL || flag == NULL) {
retval = MPI_ERR_ARG;
} else if (*request == MPI_REQUEST_NULL) {
+ *flag= TRUE;
retval = MPI_ERR_REQUEST;
} else {
*flag = smpi_mpi_test(request, status);
smpi_bench_end();
if (status == NULL) {
- retval = MPI_ERR_ARG;
- }else if (comm == MPI_COMM_NULL) {
- retval = MPI_ERR_COMM;
+ retval = MPI_ERR_ARG;
+ } else if (comm == MPI_COMM_NULL) {
+ retval = MPI_ERR_COMM;
+ } else if (source == MPI_PROC_NULL) {
+ smpi_empty_status(status);
+ status->MPI_SOURCE = MPI_PROC_NULL;
+ retval = MPI_SUCCESS;
} else {
- smpi_mpi_probe(source, tag, comm, status);
- retval = MPI_SUCCESS;
+ smpi_mpi_probe(source, tag, comm, status);
+ retval = MPI_SUCCESS;
}
smpi_bench_begin();
return retval;
smpi_bench_end();
if (flag == NULL) {
- retval = MPI_ERR_ARG;
- }else if (status == NULL) {
- retval = MPI_ERR_ARG;
- }else if (comm == MPI_COMM_NULL) {
- retval = MPI_ERR_COMM;
+ retval = MPI_ERR_ARG;
+ } else if (status == NULL) {
+ retval = MPI_ERR_ARG;
+ } else if (comm == MPI_COMM_NULL) {
+ retval = MPI_ERR_COMM;
+ } else if (source == MPI_PROC_NULL) {
+ smpi_empty_status(status);
+ status->MPI_SOURCE = MPI_PROC_NULL;
+ retval = MPI_SUCCESS;
} else {
- smpi_mpi_iprobe(source, tag, comm, flag, status);
- retval = MPI_SUCCESS;
+ smpi_mpi_iprobe(source, tag, comm, flag, status);
+ retval = MPI_SUCCESS;
}
smpi_bench_begin();
return retval;
int retval;
smpi_bench_end();
+
+ if (request == NULL) {
+ retval = MPI_ERR_ARG;
+ } else if (*request == MPI_REQUEST_NULL) {
+ retval = MPI_ERR_REQUEST;
+ } else {
+
#ifdef HAVE_TRACING
int rank = request && (*request)->comm != MPI_COMM_NULL
- ? smpi_comm_rank((*request)->comm)
+ ? smpi_process_index()
: -1;
TRACE_smpi_computing_out(rank);
MPI_Group group = smpi_comm_group((*request)->comm);
- int src_traced = smpi_group_rank(group, (*request)->src);
- int dst_traced = smpi_group_rank(group, (*request)->dst);
+ int src_traced = smpi_group_index(group, (*request)->src);
+ int dst_traced = smpi_group_index(group, (*request)->dst);
int is_wait_for_receive = (*request)->recv;
TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__);
#endif
- if (request == NULL) {
- retval = MPI_ERR_ARG;
- } else if (*request == MPI_REQUEST_NULL) {
- retval = MPI_ERR_REQUEST;
- } else {
+
smpi_mpi_wait(request, status);
retval = MPI_SUCCESS;
- }
+
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, src_traced, dst_traced, __FUNCTION__);
if (is_wait_for_receive) {
TRACE_smpi_recv(rank, src_traced, dst_traced);
}
TRACE_smpi_computing_in(rank);
-
#endif
+
+ }
+
smpi_bench_begin();
return retval;
}
xbt_free(t);
}
}
- int rank_traced = smpi_comm_rank(MPI_COMM_WORLD);
+ int rank_traced = smpi_process_index();
TRACE_smpi_computing_out(rank_traced);
TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__);
retval = MPI_SUCCESS;
}
#ifdef HAVE_TRACING
- int src_traced, dst_traced, is_wait_for_receive;
- xbt_dynar_get_cpy(srcs, *index, &src_traced);
- xbt_dynar_get_cpy(dsts, *index, &dst_traced);
- xbt_dynar_get_cpy(recvs, *index, &is_wait_for_receive);
- if (is_wait_for_receive) {
- TRACE_smpi_recv(rank_traced, src_traced, dst_traced);
+ if(*index!=MPI_UNDEFINED){
+ int src_traced, dst_traced, is_wait_for_receive;
+ xbt_dynar_get_cpy(srcs, *index, &src_traced);
+ xbt_dynar_get_cpy(dsts, *index, &dst_traced);
+ xbt_dynar_get_cpy(recvs, *index, &is_wait_for_receive);
+ if (is_wait_for_receive) {
+ TRACE_smpi_recv(rank_traced, src_traced, dst_traced);
+ }
+ TRACE_smpi_ptp_out(rank_traced, src_traced, dst_traced, __FUNCTION__);
+ //clean-up of dynars
+ xbt_dynar_free(&srcs);
+ xbt_dynar_free(&dsts);
+ xbt_dynar_free(&recvs);
}
- TRACE_smpi_ptp_out(rank_traced, src_traced, dst_traced, __FUNCTION__);
- //clean-up of dynars
- xbt_dynar_free(&srcs);
- xbt_dynar_free(&dsts);
- xbt_dynar_free(&recvs);
TRACE_smpi_computing_in(rank_traced);
+
#endif
smpi_bench_begin();
return retval;
xbt_dynar_t dsts = xbt_dynar_new(sizeof(int), NULL);
xbt_dynar_t recvs = xbt_dynar_new(sizeof(int), NULL);
for (i = 0; i < count; i++) {
- MPI_Request req = requests[i]; //all req should be valid in Waitall
- int *asrc = xbt_new(int, 1);
- int *adst = xbt_new(int, 1);
- int *arecv = xbt_new(int, 1);
- *asrc = req->src;
- *adst = req->dst;
- *arecv = req->recv;
- xbt_dynar_insert_at(srcs, i, asrc);
- xbt_dynar_insert_at(dsts, i, adst);
- xbt_dynar_insert_at(recvs, i, arecv);
- xbt_free(asrc);
- xbt_free(adst);
- xbt_free(arecv);
- }
- int rank_traced = smpi_comm_rank (MPI_COMM_WORLD);
+ MPI_Request req = requests[i];
+ if(req){
+ int *asrc = xbt_new(int, 1);
+ int *adst = xbt_new(int, 1);
+ int *arecv = xbt_new(int, 1);
+ *asrc = req->src;
+ *adst = req->dst;
+ *arecv = req->recv;
+ xbt_dynar_insert_at(srcs, i, asrc);
+ xbt_dynar_insert_at(dsts, i, adst);
+ xbt_dynar_insert_at(recvs, i, arecv);
+ xbt_free(asrc);
+ xbt_free(adst);
+ xbt_free(arecv);
+ }else {
+ int *t = xbt_new(int, 1);
+ xbt_dynar_insert_at(srcs, i, t);
+ xbt_dynar_insert_at(dsts, i, t);
+ xbt_dynar_insert_at(recvs, i, t);
+ xbt_free(t);
+ }
+ }
+ int rank_traced = smpi_process_index();
TRACE_smpi_computing_out(rank_traced);
TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__);
#endif
- smpi_mpi_waitall(count, requests, status);
+ int retval = smpi_mpi_waitall(count, requests, status);
#ifdef HAVE_TRACING
for (i = 0; i < count; i++) {
int src_traced, dst_traced, is_wait_for_receive;
TRACE_smpi_computing_in(rank_traced);
#endif
smpi_bench_begin();
- return MPI_SUCCESS;
+ return retval;
}
int PMPI_Waitsome(int incount, MPI_Request requests[], int *outcount,
return retval;
}
+int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount,
+ int* indices, MPI_Status status[])
+{
+ int retval;
+
+ smpi_bench_end();
+ if (outcount == NULL || indices == NULL) {
+ retval = MPI_ERR_ARG;
+ } else {
+ *outcount = smpi_mpi_testsome(incount, requests, indices, status);
+ retval = MPI_SUCCESS;
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
+
int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm)
{
int retval;
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
- int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int root_traced = smpi_group_index(smpi_comm_group(comm), root);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
- int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int root_traced = smpi_group_index(smpi_comm_group(comm), root);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
- int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int root_traced = smpi_group_index(smpi_comm_group(comm), root);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
- int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int root_traced = smpi_group_index(smpi_comm_group(comm), root);
+
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
- int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int root_traced = smpi_group_index(smpi_comm_group(comm), root);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
- int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int root_traced = smpi_group_index(smpi_comm_group(comm), root);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
{
int retval, i, size, count;
int *displs;
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
smpi_bench_end();
#ifdef HAVE_TRACING
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
smpi_bench_end();
strncpy(name, SIMIX_host_get_name(SIMIX_host_self()),
- MPI_MAX_PROCESSOR_NAME - 1);
+ strlen(SIMIX_host_get_name(SIMIX_host_self())) < MPI_MAX_PROCESSOR_NAME - 1 ?
+ strlen(SIMIX_host_get_name(SIMIX_host_self())) +1 :
+ MPI_MAX_PROCESSOR_NAME - 1 );
*resultlen =
strlen(name) >
MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name);
smpi_bench_end();
if (old_type == MPI_DATATYPE_NULL) {
retval = MPI_ERR_TYPE;
- } else if (count<=0){
+ } else if (count<0){
retval = MPI_ERR_COUNT;
} else {
retval = smpi_datatype_contiguous(count, old_type, new_type);
smpi_bench_end();
if (old_type == MPI_DATATYPE_NULL) {
retval = MPI_ERR_TYPE;
- } else if (count<=0 || blocklen<=0){
+ } else if (count<0 || blocklen<0){
retval = MPI_ERR_COUNT;
} else {
retval = smpi_datatype_vector(count, blocklen, stride, old_type, new_type);
smpi_bench_end();
if (old_type == MPI_DATATYPE_NULL) {
retval = MPI_ERR_TYPE;
- } else if (count<=0 || blocklen<=0){
+ } else if (count<0 || blocklen<0){
retval = MPI_ERR_COUNT;
} else {
retval = smpi_datatype_hvector(count, blocklen, stride, old_type, new_type);
smpi_bench_end();
if (old_type == MPI_DATATYPE_NULL) {
retval = MPI_ERR_TYPE;
- } else if (count<=0){
+ } else if (count<0){
retval = MPI_ERR_COUNT;
} else {
retval = smpi_datatype_indexed(count, blocklens, indices, old_type, new_type);
smpi_bench_end();
if (old_type == MPI_DATATYPE_NULL) {
retval = MPI_ERR_TYPE;
- } else if (count<=0){
+ } else if (count<0){
retval = MPI_ERR_COUNT;
} else {
retval = smpi_datatype_hindexed(count, blocklens, indices, old_type, new_type);
int retval;
smpi_bench_end();
- if (count<=0){
+ if (count<0){
retval = MPI_ERR_COUNT;
} else {
retval = smpi_datatype_struct(count, blocklens, indices, old_types, new_type);
smpi_bench_begin();
return retval;}
+int PMPI_Error_class(int errorcode, int* errorclass) {
+ // assume smpi uses only standard mpi error codes
+ *errorclass=errorcode;
+ return MPI_SUCCESS;
+}
/* The following calls are not yet implemented and will fail at runtime. */
/* Once implemented, please move them above this notice. */
return not_yet_implemented();
}
-int PMPI_Error_class(int errorcode, int* errorclass) {
- return not_yet_implemented();
-}
-
int PMPI_Errhandler_create(MPI_Handler_function* function, MPI_Errhandler* errhandler) {
return not_yet_implemented();
}
return not_yet_implemented();
}
-int PMPI_Testsome(int incount, MPI_Request* requests, int* outcount, int* indices, MPI_Status* statuses) {
+int PMPI_Comm_test_inter(MPI_Comm comm, int* flag) {
return not_yet_implemented();
}
-int PMPI_Comm_test_inter(MPI_Comm comm, int* flag) {
+int PMPI_Comm_get_attr (MPI_Comm comm, int comm_keyval, void *attribute_val, int *flag)
+{
+ return not_yet_implemented();
+}
+
+int PMPI_Pcontrol(const int level )
+{
return not_yet_implemented();
}