A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add mpi allgatherv pair ring
[simgrid.git]
/
src
/
smpi
/
smpi_pmpi.c
diff --git
a/src/smpi/smpi_pmpi.c
b/src/smpi/smpi_pmpi.c
index 0422b98b767936fa3bfb19a8ca026f992e7832c6..3d91b730137672802251124ec68654a92e516960 100644
(file)
--- a/
src/smpi/smpi_pmpi.c
+++ b/
src/smpi/smpi_pmpi.c
@@
-28,7
+28,10
@@
int PMPI_Init(int *argc, char ***argv)
{
smpi_process_init(argc, argv);
#ifdef HAVE_TRACING
- TRACE_smpi_init(smpi_process_index());
+ int rank = smpi_process_index();
+ TRACE_smpi_init(rank);
+
+ TRACE_smpi_computing_init(rank);
#endif
smpi_bench_begin();
return MPI_SUCCESS;
@@
-36,8
+39,11
@@
int PMPI_Init(int *argc, char ***argv)
int PMPI_Finalize(void)
{
+ smpi_process_finalize();
smpi_bench_end();
#ifdef HAVE_TRACING
+ int rank = smpi_process_index();
+ TRACE_smpi_computing_out(rank);
TRACE_smpi_finalize(smpi_process_index());
#endif
smpi_process_destroy();
@@
-86,8
+92,12
@@
int PMPI_Abort(MPI_Comm comm, int errorcode)
{
smpi_bench_end();
smpi_process_destroy();
+#ifdef HAVE_TRACING
+ int rank = smpi_process_index();
+ TRACE_smpi_computing_out(rank);
+#endif
// FIXME: should kill all processes in comm instead
-
SIMIX_req
_process_kill(SIMIX_process_self());
+
simcall
_process_kill(SIMIX_process_self());
return MPI_SUCCESS;
}
@@
-100,6
+110,11
@@
double PMPI_Wtime(void)
smpi_bench_begin();
return time;
}
+extern double sg_maxmin_precision;
+double PMPI_Wtick(void)
+{
+ return sg_maxmin_precision;
+}
int PMPI_Address(void *location, MPI_Aint * address)
{
@@
-110,6
+125,7
@@
int PMPI_Address(void *location, MPI_Aint * address)
retval = MPI_ERR_ARG;
} else {
*address = (MPI_Aint) location;
+ retval = MPI_SUCCESS;
}
smpi_bench_begin();
return retval;
@@
-123,8
+139,8
@@
int PMPI_Type_free(MPI_Datatype * datatype)
if (!datatype) {
retval = MPI_ERR_ARG;
} else {
- // FIXME: always fail for now
- retval = MPI_
ERR_TYPE
;
+ smpi_datatype_free(datatype);
+ retval = MPI_
SUCCESS
;
}
smpi_bench_begin();
return retval;
@@
-166,7
+182,6
@@
int PMPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent
int PMPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent)
{
int retval;
- MPI_Aint dummy;
smpi_bench_end();
if (datatype == MPI_DATATYPE_NULL) {
@@
-174,7
+189,8
@@
int PMPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent)
} else if (extent == NULL) {
retval = MPI_ERR_ARG;
} else {
- retval = smpi_datatype_extent(datatype, &dummy, extent);
+ *extent = smpi_datatype_get_extent(datatype);
+ retval = MPI_SUCCESS;
}
smpi_bench_begin();
return retval;
@@
-255,6
+271,7
@@
int PMPI_Group_free(MPI_Group * group)
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;
@@
-377,7
+394,7
@@
int PMPI_Group_union(MPI_Group group1, MPI_Group group2,
int PMPI_Group_intersection(MPI_Group group1, MPI_Group group2,
MPI_Group * newgroup)
{
- int retval, i, proc1, proc2, size
, size2
;
+ int retval, i, proc1, proc2, size;
smpi_bench_end();
if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
@@
-385,9
+402,8
@@
int PMPI_Group_intersection(MPI_Group group1, MPI_Group group2,
} else if (newgroup == NULL) {
retval = MPI_ERR_ARG;
} else {
- size = smpi_group_size(group1);
- size2 = smpi_group_size(group2);
- for (i = 0; i < size2; i++) {
+ size = smpi_group_size(group2);
+ for (i = 0; i < size; i++) {
proc2 = smpi_group_index(group2, i);
proc1 = smpi_group_rank(group1, proc2);
if (proc1 == MPI_UNDEFINED) {
@@
-398,12
+414,13
@@
int PMPI_Group_intersection(MPI_Group group1, MPI_Group group2,
*newgroup = MPI_GROUP_EMPTY;
} else {
*newgroup = smpi_group_new(size);
- size2 = smpi_group_size(group1);
- for (i = 0; i < size2; i++) {
- proc1 = smpi_group_index(group1, i);
- proc2 = smpi_group_rank(group2, proc1);
- if (proc2 != MPI_UNDEFINED) {
- smpi_group_set_mapping(*newgroup, proc1, i);
+ int j=0;
+ for (i = 0; i < smpi_group_size(group2); i++) {
+ proc2 = smpi_group_index(group2, i);
+ proc1 = smpi_group_rank(group1, proc2);
+ if (proc1 != MPI_UNDEFINED) {
+ smpi_group_set_mapping(*newgroup, proc2, j);
+ j++;
}
}
}
@@
-481,7
+498,7
@@
int PMPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup)
int PMPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup)
{
- int retval, i,
size, rank
, index;
+ int retval, i,
j, newsize, oldsize
, index;
smpi_bench_end();
if (group == MPI_GROUP_NULL) {
@@
-494,21
+511,26
@@
int PMPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup)
} else if (n == smpi_group_size(group)) {
*newgroup = MPI_GROUP_EMPTY;
} else {
- size = smpi_group_size(group) - n;
- *newgroup = smpi_group_new(size);
- rank = 0;
- while (rank < size) {
- for (i = 0; i < n; i++) {
- if (ranks[i] == rank) {
- break;
- }
- }
- if (i >= n) {
- index = smpi_group_index(group, rank);
- smpi_group_set_mapping(*newgroup, index, rank);
- rank++;
+ oldsize=smpi_group_size(group);
+ newsize = oldsize - n;
+ *newgroup = smpi_group_new(newsize);
+
+ int* to_exclude=xbt_new(int, smpi_group_size(group));
+ for(i=0; i<oldsize; i++)
+ to_exclude[i]=0;
+ for(i=0; i<n; i++)
+ to_exclude[ranks[i]]=1;
+
+ j=0;
+ for(i=0; i<oldsize; i++){
+ if(to_exclude[i]==0){
+ index = smpi_group_index(group, i);
+ smpi_group_set_mapping(*newgroup, index, j);
+ j++;
}
}
+
+ xbt_free(to_exclude);
}
smpi_group_use(*newgroup);
retval = MPI_SUCCESS;
@@
-605,6
+627,7
@@
int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3],
smpi_group_set_mapping(*newgroup, index, newrank);
}
}
+ newrank++; //added to avoid looping, need to be checked ..
}
}
}
@@
-763,6
+786,25
@@
int PMPI_Comm_free(MPI_Comm * comm)
return retval;
}
+int PMPI_Comm_disconnect(MPI_Comm * comm)
+{
+ /* TODO: wait until all communication in comm are done */
+ int retval;
+
+ smpi_bench_end();
+ if (comm == NULL) {
+ retval = MPI_ERR_ARG;
+ } else if (*comm == MPI_COMM_NULL) {
+ retval = MPI_ERR_COMM;
+ } else {
+ smpi_comm_destroy(*comm);
+ *comm = MPI_COMM_NULL;
+ retval = MPI_SUCCESS;
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
int PMPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out)
{
int retval;
@@
-790,6
+832,8
@@
int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst,
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;
@@
-808,6
+852,8
@@
int PMPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int src,
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;
@@
-816,12
+862,30
@@
int PMPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int src,
return retval;
}
+int PMPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) {
+ int retval;
+
+ smpi_bench_end();
+ if (request == NULL) {
+ 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_ssend_init(buf, count, datatype, dst, tag, comm);
+ retval = MPI_SUCCESS;
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
int PMPI_Start(MPI_Request * request)
{
int retval;
smpi_bench_end();
- if (request == NULL) {
+ if (request == NULL
|| *request == MPI_REQUEST_NULL
) {
retval = MPI_ERR_ARG;
} else {
smpi_mpi_start(*request);
@@
-851,9
+915,10
@@
int PMPI_Request_free(MPI_Request * request)
int retval;
smpi_bench_end();
- if (
request ==
NULL) {
+ if (
*request == MPI_REQUEST_
NULL) {
retval = MPI_ERR_ARG;
} else {
+ if((*request)->flags & PERSISTENT)(*request)->refcount--;
smpi_mpi_request_free(request);
retval = MPI_SUCCESS;
}
@@
-867,51
+932,134
@@
int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src,
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 PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst,
int tag, MPI_Comm comm, MPI_Request * request)
{
int retval;
smpi_bench_end();
+ 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_comm_rank(comm) : -1;
- int dst_traced = smpi_group_rank(smpi_comm_group(comm), dst);
+ 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 PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) {
+ int retval;
+
+ smpi_bench_end();
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 {
- *request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm);
+
+#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_issend(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;
}
@@
-922,21
+1070,43
@@
int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag,
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 (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_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
+
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_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;
}
@@
-947,25
+1117,88
@@
int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag,
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 dst_traced = smpi_group_rank(smpi_comm_group(comm), dst);
+ 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
- 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 PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) {
+ 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_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
+
+ smpi_mpi_ssend(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 PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
int dst, int sendtag, void *recvbuf, int recvcount,
MPI_Datatype recvtype, int src, int recvtag,
@@
-974,29
+1207,51
@@
int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
int retval;
smpi_bench_end();
-#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
- 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;
}
@@
-1007,15
+1262,23
@@
int PMPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
{
//TODO: suboptimal implementation
void *recvbuf;
- int retval, size;
+ int retval;
+ if (datatype == MPI_DATATYPE_NULL) {
+ retval = MPI_ERR_TYPE;
+ } else if (count < 0) {
+ retval = MPI_ERR_COUNT;
+ } else {
+ int size = smpi_datatype_get_extent(datatype) * count;
+ recvbuf = xbt_new(char, size);
+ retval =
+ MPI_Sendrecv(buf, count, datatype, dst, sendtag, recvbuf, count,
+ datatype, src, recvtag, comm, status);
+ if(retval==MPI_SUCCESS){
+ smpi_datatype_copy(recvbuf, count, datatype, buf, count, datatype);
+ }
+ xbt_free(recvbuf);
- size = smpi_datatype_size(datatype) * count;
- recvbuf = xbt_new(char, size);
- retval =
- MPI_Sendrecv(buf, count, datatype, dst, sendtag, recvbuf, count,
- datatype, src, recvtag, comm, status);
- memcpy(buf, recvbuf, size * sizeof(char));
- xbt_free(recvbuf);
+ }
return retval;
}
@@
-1024,9
+1287,10
@@
int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status)
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);
@@
-1052,35
+1316,102
@@
int PMPI_Testany(int count, MPI_Request requests[], int *index, int *flag,
return retval;
}
+int PMPI_Testall(int count, MPI_Request* requests, int* flag, MPI_Status* statuses)
+{
+ int retval;
+
+ smpi_bench_end();
+ if (flag == NULL) {
+ retval = MPI_ERR_ARG;
+ } else {
+ *flag = smpi_mpi_testall(count, requests, statuses);
+ retval = MPI_SUCCESS;
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
+int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) {
+ int retval;
+ smpi_bench_end();
+
+ 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_probe(source, tag, comm, status);
+ retval = MPI_SUCCESS;
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
+
+int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status) {
+ int 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;
+ } 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_bench_begin();
+ return retval;
+}
+
int PMPI_Wait(MPI_Request * request, MPI_Status * status)
{
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;
}
@@
-1093,30
+1424,22
@@
int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta
#ifdef HAVE_TRACING
//save requests information for tracing
int i;
-
xbt_dynar_t srcs = xbt_dynar_new(sizeof(int), xbt_free
);
-
xbt_dynar_t dsts = xbt_dynar_new(sizeof(int), xbt_free
);
-
xbt_dynar_t recvs = xbt_dynar_new(sizeof(int), xbt_free
);
+
int *srcs = xbt_new(int, count
);
+
int *dsts = xbt_new(int, count
);
+
int *recvs = xbt_new(int, count
);
for (i = 0; i < count; i++) {
MPI_Request req = requests[i]; //already received requests are no longer valid
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);
- } 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);
+ srcs[i] = req->src;
+ dsts[i] = req->dst;
+ recvs[i] = req->recv;
}
}
- 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__);
+
#endif
if (index == NULL) {
retval = MPI_ERR_ARG;
@@
-1125,18
+1448,19
@@
int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta
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 = srcs[*index];
+ int dst_traced = dsts[*index];
+ int is_wait_for_receive = recvs[*index];
+ 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__);
+ xbt_free(srcs);
+ xbt_free(dsts);
+ xbt_free(recvs);
}
- TRACE_smpi_ptp_out(rank_traced, src_traced, dst_traced, __FUNCTION__);
- //clean-up of dynars
- xbt_free(srcs);
- xbt_free(dsts);
- xbt_free(recvs);
+ TRACE_smpi_computing_in(rank_traced);
#endif
smpi_bench_begin();
return retval;
@@
-1149,43
+1473,42
@@
int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[])
#ifdef HAVE_TRACING
//save information from requests
int i;
- xbt_dynar_t srcs = xbt_dynar_new(sizeof(int), xbt_free);
- xbt_dynar_t dsts = xbt_dynar_new(sizeof(int), xbt_free);
- xbt_dynar_t recvs = xbt_dynar_new(sizeof(int), xbt_free);
+ int *srcs = xbt_new(int, count);
+ int *dsts = xbt_new(int, count);
+ int *recvs = xbt_new(int, count);
+ int valid_count = 0;
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);
- }
- int rank_traced = smpi_comm_rank (MPI_COMM_WORLD);
+ MPI_Request req = requests[i];
+ if(req!=MPI_REQUEST_NULL){
+ srcs[valid_count] = req->src;
+ dsts[valid_count] = req->dst;
+ recvs[valid_count] = req->recv;
+ valid_count++;
+ }
+ }
+ 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;
- xbt_dynar_get_cpy(srcs, i, &src_traced);
- xbt_dynar_get_cpy(dsts, i, &dst_traced);
- xbt_dynar_get_cpy(recvs, i, &is_wait_for_receive);
+ for (i = 0; i < valid_count; i++) {
+ int src_traced = srcs[i];
+ int dst_traced = dsts[i];
+ int is_wait_for_receive = recvs[i];
if (is_wait_for_receive) {
TRACE_smpi_recv(rank_traced, src_traced, dst_traced);
}
}
TRACE_smpi_ptp_out(rank_traced, -1, -1, __FUNCTION__);
- //clean-up of dynars
xbt_free(srcs);
xbt_free(dsts);
xbt_free(recvs);
+ 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,
@@
-1204,24
+1527,43
@@
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 root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ TRACE_smpi_computing_out(rank);
+ 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) {
retval = MPI_ERR_COMM;
} else {
-
smpi_mpi_bcast
(buf, count, datatype, root, comm);
+
mpi_coll_bcast_fun
(buf, count, datatype, root, comm);
retval = MPI_SUCCESS;
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1233,7
+1575,8
@@
int PMPI_Barrier(MPI_Comm comm)
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
if (comm == MPI_COMM_NULL) {
@@
-1244,6
+1587,7
@@
int PMPI_Barrier(MPI_Comm comm)
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1257,8
+1601,9
@@
int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
- int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ TRACE_smpi_computing_out(rank);
+ 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) {
@@
-1273,6
+1618,7
@@
int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1286,8
+1632,9
@@
int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
- int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ TRACE_smpi_computing_out(rank);
+ 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) {
@@
-1304,6
+1651,7
@@
int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1317,7
+1665,8
@@
int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
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
if (comm == MPI_COMM_NULL) {
@@
-1326,8
+1675,8
@@
int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
|| recvtype == MPI_DATATYPE_NULL) {
retval = MPI_ERR_TYPE;
} else {
-
smpi_mpi_allgather
(sendbuf, sendcount, sendtype, recvbuf, recvcount,
- recvtype, comm);
+
mpi_coll_allgather_fun
(sendbuf, sendcount, sendtype, recvbuf, recvcount,
+
recvtype, comm);
retval = MPI_SUCCESS;
}
#ifdef HAVE_TRACING
@@
-1345,7
+1694,8
@@
int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
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
if (comm == MPI_COMM_NULL) {
@@
-1356,12
+1706,13
@@
int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
} else if (recvcounts == NULL || displs == NULL) {
retval = MPI_ERR_ARG;
} else {
-
smpi_mpi_allgatherv
(sendbuf, sendcount, sendtype, recvbuf, recvcounts,
+
mpi_coll_allgatherv_fun
(sendbuf, sendcount, sendtype, recvbuf, recvcounts,
displs, recvtype, comm);
retval = MPI_SUCCESS;
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1375,8
+1726,10
@@
int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype,
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
- int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ TRACE_smpi_computing_out(rank);
+ 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) {
@@
-1391,6
+1744,7
@@
int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype,
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1404,8
+1758,9
@@
int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs,
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
- int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ TRACE_smpi_computing_out(rank);
+ 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) {
@@
-1422,6
+1777,7
@@
int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs,
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1434,8
+1790,9
@@
int PMPI_Reduce(void *sendbuf, void *recvbuf, int count,
smpi_bench_end();
#ifdef HAVE_TRACING
- int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
- int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+ int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ TRACE_smpi_computing_out(rank);
+ 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) {
@@
-1443,11
+1800,12
@@
int PMPI_Reduce(void *sendbuf, void *recvbuf, int count,
} else if (datatype == MPI_DATATYPE_NULL || op == MPI_OP_NULL) {
retval = MPI_ERR_ARG;
} else {
-
smpi_mpi_reduce
(sendbuf, recvbuf, count, datatype, op, root, comm);
+
mpi_coll_reduce_fun
(sendbuf, recvbuf, count, datatype, op, root, comm);
retval = MPI_SUCCESS;
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1460,7
+1818,8
@@
int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count,
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
if (comm == MPI_COMM_NULL) {
@@
-1470,11
+1829,12
@@
int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count,
} else if (op == MPI_OP_NULL) {
retval = MPI_ERR_OP;
} else {
-
smpi_mpi_allreduce
(sendbuf, recvbuf, count, datatype, op, comm);
+
mpi_coll_allreduce_fun
(sendbuf, recvbuf, count, datatype, op, comm);
retval = MPI_SUCCESS;
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1487,7
+1847,8
@@
int PMPI_Scan(void *sendbuf, void *recvbuf, int count,
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
if (comm == MPI_COMM_NULL) {
@@
-1502,6
+1863,7
@@
int PMPI_Scan(void *sendbuf, void *recvbuf, int count,
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1512,10
+1874,11
@@
int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts,
{
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
+ TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
@@
-1536,7
+1899,7
@@
int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts,
count += recvcounts[i];
displs[i] = 0;
}
-
smpi_mpi_reduce
(sendbuf, recvbuf, count, datatype, op, 0, comm);
+
mpi_coll_reduce_fun
(sendbuf, recvbuf, count, datatype, op, 0, comm);
smpi_mpi_scatterv(recvbuf, recvcounts, displs, datatype, recvbuf,
recvcounts[rank], datatype, 0, comm);
xbt_free(displs);
@@
-1544,6
+1907,7
@@
int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts,
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1553,11
+1917,12
@@
int PMPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
MPI_Comm comm)
{
- int retval
, size, sendsize
;
+ 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);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
@@
-1566,27
+1931,11
@@
int PMPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype sendtype,
|| recvtype == MPI_DATATYPE_NULL) {
retval = MPI_ERR_TYPE;
} else {
- size = smpi_comm_size(comm);
- sendsize = smpi_datatype_size(sendtype) * sendcount;
- if (sendsize < 200 && size > 12) {
- retval =
- smpi_coll_tuned_alltoall_bruck(sendbuf, sendcount, sendtype,
- recvbuf, recvcount, recvtype,
- comm);
- } else if (sendsize < 3000) {
- retval =
- smpi_coll_tuned_alltoall_basic_linear(sendbuf, sendcount,
- sendtype, recvbuf,
- recvcount, recvtype, comm);
- } else {
- retval =
- smpi_coll_tuned_alltoall_pairwise(sendbuf, sendcount, sendtype,
- recvbuf, recvcount, recvtype,
- comm);
- }
+ retval = mpi_coll_alltoall_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm);
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1600,7
+1949,8
@@
int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps,
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
if (comm == MPI_COMM_NULL) {
@@
-1613,12
+1963,13
@@
int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps,
retval = MPI_ERR_ARG;
} else {
retval =
-
smpi_coll_basic_alltoallv
(sendbuf, sendcounts, senddisps, sendtype,
+
mpi_coll_alltoallv_fun
(sendbuf, sendcounts, senddisps, sendtype,
recvbuf, recvcounts, recvdisps, recvtype,
comm);
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
@@
-1631,7
+1982,9
@@
int PMPI_Get_processor_name(char *name, int *resultlen)
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);
@@
-1664,12
+2017,128
@@
int PMPI_Get_count(MPI_Status * status, MPI_Datatype datatype, int *count)
return retval;
}
+int PMPI_Type_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new_type) {
+ int retval;
+
+ smpi_bench_end();
+ if (old_type == MPI_DATATYPE_NULL) {
+ retval = MPI_ERR_TYPE;
+ } else if (count<0){
+ retval = MPI_ERR_COUNT;
+ } else {
+ retval = smpi_datatype_contiguous(count, old_type, new_type);
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
+int PMPI_Type_commit(MPI_Datatype* datatype) {
+ int retval;
+
+ smpi_bench_end();
+ if (datatype == MPI_DATATYPE_NULL) {
+ retval = MPI_ERR_TYPE;
+ } else {
+ smpi_datatype_commit(datatype);
+ retval = MPI_SUCCESS;
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
+
+int PMPI_Type_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* new_type) {
+ int retval;
+
+ smpi_bench_end();
+ if (old_type == MPI_DATATYPE_NULL) {
+ retval = MPI_ERR_TYPE;
+ } else if (count<0 || blocklen<0){
+ retval = MPI_ERR_COUNT;
+ } else {
+ retval = smpi_datatype_vector(count, blocklen, stride, old_type, new_type);
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
+int PMPI_Type_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type) {
+ int retval;
+
+ smpi_bench_end();
+ if (old_type == MPI_DATATYPE_NULL) {
+ retval = MPI_ERR_TYPE;
+ } else if (count<0 || blocklen<0){
+ retval = MPI_ERR_COUNT;
+ } else {
+ retval = smpi_datatype_hvector(count, blocklen, stride, old_type, new_type);
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
+
+int PMPI_Type_indexed(int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* new_type) {
+ int retval;
+
+ smpi_bench_end();
+ if (old_type == MPI_DATATYPE_NULL) {
+ retval = MPI_ERR_TYPE;
+ } else if (count<0){
+ retval = MPI_ERR_COUNT;
+ } else {
+ retval = smpi_datatype_indexed(count, blocklens, indices, old_type, new_type);
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
+int PMPI_Type_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type) {
+ int retval;
+
+ smpi_bench_end();
+ if (old_type == MPI_DATATYPE_NULL) {
+ retval = MPI_ERR_TYPE;
+ } else if (count<0){
+ retval = MPI_ERR_COUNT;
+ } else {
+ retval = smpi_datatype_hindexed(count, blocklens, indices, old_type, new_type);
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
+
+int PMPI_Type_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* new_type) {
+ int retval;
+
+ smpi_bench_end();
+ 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;
+}
+
+
+int PMPI_Initialized(int* flag) {
+ *flag=(smpi_process_data()!=NULL);
+ return MPI_SUCCESS;
+}
+
/* The following calls are not yet implemented and will fail at runtime. */
/* Once implemented, please move them above this notice. */
static int not_yet_implemented(void) {
-
xbt_die
("Not yet implemented");
- return MPI_
ERR_OTHER
;
+
XBT_WARN
("Not yet implemented");
+ return MPI_
SUCCESS
;
}
int PMPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm, int* size) {
@@
-1736,10
+2205,6
@@
int PMPI_Topo_test(MPI_Comm comm, int* top_type) {
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();
}
@@
-1760,9
+2225,6
@@
int PMPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) {
return not_yet_implemented();
}
-int PMPI_Type_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* newtype) {
- return not_yet_implemented();
-}
int PMPI_Cancel(MPI_Request* request) {
return not_yet_implemented();
@@
-1776,49
+2238,25
@@
int PMPI_Buffer_detach(void* buffer, int* size) {
return not_yet_implemented();
}
-int PMPI_Testsome(int incount, MPI_Request* requests, int* outcount, int* indices, MPI_Status* statuses) {
- return not_yet_implemented();
-}
-
int PMPI_Comm_test_inter(MPI_Comm comm, int* flag) {
return not_yet_implemented();
}
-int PMPI_Unpack(void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm) {
- return not_yet_implemented();
-}
-
-int PMPI_Type_commit(MPI_Datatype* datatype) {
- return not_yet_implemented();
-}
-
-int PMPI_Type_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* newtype) {
- return not_yet_implemented();
-}
-
-int PMPI_Type_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* newtype) {
+int PMPI_Comm_get_attr (MPI_Comm comm, int comm_keyval, void *attribute_val, int *flag)
+{
return not_yet_implemented();
}
-int PMPI_Type_indexed(int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* newtype) {
+int PMPI_Pcontrol(const int level )
+{
return not_yet_implemented();
}
-int PMPI_
Type_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* newtype
) {
+int PMPI_
Unpack(void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm
) {
return not_yet_implemented();
}
-int PMPI_Type_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* newtype) {
- return not_yet_implemented();
-}
-int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) {
- return not_yet_implemented();
-}
-
-int PMPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) {
- return not_yet_implemented();
-}
int PMPI_Intercomm_create(MPI_Comm local_comm, int local_leader, MPI_Comm peer_comm, int remote_leader, int tag, MPI_Comm* comm_out) {
return not_yet_implemented();
@@
-1848,14
+2286,6
@@
int PMPI_Comm_remote_size(MPI_Comm comm, int* size) {
return not_yet_implemented();
}
-int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) {
- return not_yet_implemented();
-}
-
-int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) {
- return not_yet_implemented();
-}
-
int PMPI_Attr_delete(MPI_Comm comm, int keyval) {
return not_yet_implemented();
}
@@
-1896,10
+2326,6
@@
int PMPI_Pack(void* inbuf, int incount, MPI_Datatype type, void* outbuf, int out
return not_yet_implemented();
}
-int PMPI_Testall(int count, MPI_Request* requests, int* flag, MPI_Status* statuses) {
- return not_yet_implemented();
-}
-
int PMPI_Get_elements(MPI_Status* status, MPI_Datatype datatype, int* elements) {
return not_yet_implemented();
}
@@
-1908,10
+2334,32
@@
int PMPI_Dims_create(int nnodes, int ndims, int* dims) {
return not_yet_implemented();
}
-int PMPI_
Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status)
{
+int PMPI_
Win_fence( int assert, MPI_Win win)
{
return not_yet_implemented();
}
-int PMPI_
Initialized(int* flag)
{
+int PMPI_
Win_free( MPI_Win* win)
{
return not_yet_implemented();
}
+
+int PMPI_Win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, MPI_Win *win){
+ return not_yet_implemented();
+}
+
+int PMPI_Info_create( MPI_Info *info){
+ return not_yet_implemented();
+}
+
+int PMPI_Info_set( MPI_Info *info, char *key, char *value){
+ return not_yet_implemented();
+}
+
+int PMPI_Info_free( MPI_Info *info){
+ return not_yet_implemented();
+}
+
+int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank,
+ MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Win win){
+ return not_yet_implemented();
+}
+