X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f81d3ea69a2dcf134220eda64e6e2489b911eab..cc44532c7189d5a294220b743fe1a6f89334c4b9:/src/smpi/smpi_mpi.c

diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c
index 201d1bdcec..09a62da4d6 100644
--- a/src/smpi/smpi_mpi.c
+++ b/src/smpi/smpi_mpi.c
@@ -1,13 +1,15 @@
 #include "private.h"
 
-int MPI_Init(int *argc, char ***argv)
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi, smpi, "Logging specific to SMPI (mpi)");
+
+int SMPI_MPI_Init(int *argc, char ***argv)
 {
 	smpi_mpi_init();
 	smpi_bench_begin();
 	return MPI_SUCCESS;
 }
 
-int MPI_Finalize()
+int SMPI_MPI_Finalize()
 {
 	smpi_bench_end();
 	smpi_mpi_finalize();
@@ -16,13 +18,13 @@ int MPI_Finalize()
 
 // right now this just exits the current node, should send abort signal to all
 // hosts in the communicator;
-int MPI_Abort(MPI_Comm comm, int errorcode)
+int SMPI_MPI_Abort(MPI_Comm comm, int errorcode)
 {
 	smpi_exit(errorcode);
 	return 0;
 }
 
-int MPI_Comm_size(MPI_Comm comm, int *size)
+int SMPI_MPI_Comm_size(MPI_Comm comm, int *size)
 {
 	int retval = MPI_SUCCESS;
 
@@ -41,7 +43,7 @@ int MPI_Comm_size(MPI_Comm comm, int *size)
 	return retval;
 }
 
-int MPI_Comm_rank(MPI_Comm comm, int *rank)
+int SMPI_MPI_Comm_rank(MPI_Comm comm, int *rank)
 {
 	int retval = MPI_SUCCESS;
 
@@ -52,7 +54,7 @@ int MPI_Comm_rank(MPI_Comm comm, int *rank)
 	} else if (NULL == rank) {
 		retval = MPI_ERR_ARG;
 	} else {
-		*rank = smpi_mpi_comm_rank_self(comm);
+		*rank = smpi_mpi_comm_rank(comm);
 	}
 
 	smpi_bench_begin();
@@ -60,7 +62,7 @@ int MPI_Comm_rank(MPI_Comm comm, int *rank)
 	return retval;
 }
 
-int MPI_Type_size(MPI_Datatype datatype, size_t *size)
+int SMPI_MPI_Type_size(MPI_Datatype datatype, size_t *size)
 {
 	int retval = MPI_SUCCESS;
 
@@ -79,7 +81,7 @@ int MPI_Type_size(MPI_Datatype datatype, size_t *size)
 	return retval;
 }
 
-int MPI_Barrier(MPI_Comm comm)
+int SMPI_MPI_Barrier(MPI_Comm comm)
 {
 	int retval = MPI_SUCCESS;
 
@@ -96,21 +98,15 @@ int MPI_Barrier(MPI_Comm comm)
 	return retval;
 }
 
-int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request *request)
+int SMPI_MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request *request)
 {
 	int retval = MPI_SUCCESS;
-	int dst;
 
 	smpi_bench_end();
 
-	dst = smpi_mpi_comm_rank_self(comm);
-	if (NULL == request) {
-		retval = MPI_ERR_ARG;
-	} else {
-		retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, request);
-		if (NULL != *request && MPI_SUCCESS == retval) {
-			retval = smpi_mpi_irecv(*request);
-		}
+	retval = smpi_create_request(buf, count, datatype, src, 0, tag, comm, request);
+	if (NULL != *request && MPI_SUCCESS == retval) {
+		retval = smpi_mpi_irecv(*request);
 	}
 
 	smpi_bench_begin();
@@ -118,17 +114,14 @@ int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI
 	return retval;
 }
 
-int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status)
+int SMPI_MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status)
 {
 	int retval = MPI_SUCCESS;
-	int dst;
 	smpi_mpi_request_t request;
 
 	smpi_bench_end();
 
-	dst = smpi_mpi_comm_rank_self(comm);
-	retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, &request);
-
+	retval = smpi_create_request(buf, count, datatype, src, 0, tag, comm, &request);
 	if (NULL != request && MPI_SUCCESS == retval) {
 		retval = smpi_mpi_irecv(request);
 		if (MPI_SUCCESS == retval) {
@@ -142,21 +135,15 @@ int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_
 	return retval;
 }
 
-int MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request *request)
+int SMPI_MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request *request)
 {
 	int retval = MPI_SUCCESS;
-	int src;
 
 	smpi_bench_end();
 
-	src = smpi_mpi_comm_rank_self(comm);
-	if (NULL == request) {
-		retval = MPI_ERR_ARG;
-	} else {
-		retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, request);
-		if (NULL != *request && MPI_SUCCESS == retval) {
-			retval = smpi_mpi_isend(*request);
-		}
+	retval = smpi_create_request(buf, count, datatype, 0, dst, tag, comm, request);
+	if (NULL != *request && MPI_SUCCESS == retval) {
+		retval = smpi_mpi_isend(*request);
 	}
 
 	smpi_bench_begin();
@@ -164,16 +151,14 @@ int MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI
 	return retval;
 }
 
-int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)
+int SMPI_MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)
 {
 	int retval = MPI_SUCCESS;
-	int src;
 	smpi_mpi_request_t request;
 
 	smpi_bench_end();
 
-	src = smpi_mpi_comm_rank_self(comm);
-	retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, &request);
+	retval = smpi_create_request(buf, count, datatype, 0, dst, tag, comm, &request);
 	if (NULL != request && MPI_SUCCESS == retval) {
 		retval = smpi_mpi_isend(request);
 		if (MPI_SUCCESS == retval) {
@@ -186,3 +171,156 @@ int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_
 
 	return retval;
 }
+
+int SMPI_MPI_Wait(MPI_Request *request, MPI_Status *status) {
+	return smpi_mpi_wait(*request, status);
+}
+
+int SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) {
+
+	int retval = MPI_SUCCESS;
+	int rank;
+	smpi_mpi_request_t request;
+
+	smpi_bench_end();
+
+	rank = smpi_mpi_comm_rank(comm);
+
+	if (rank == root) {
+		retval = smpi_create_request(buf, count, datatype, root, (root + 1) % comm->size, 0, comm, &request);
+		request->forward = comm->size - 1;
+		smpi_mpi_isend(request);
+	} else {
+		retval = smpi_create_request(buf, count, datatype, MPI_ANY_SOURCE, rank, 0, comm, &request);
+		smpi_mpi_irecv(request);
+	}
+
+	smpi_mpi_wait(request, MPI_STATUS_IGNORE);
+	xbt_mallocator_release(smpi_global->request_mallocator, request);
+
+	smpi_bench_begin();
+
+	return retval;
+}
+
+// used by comm_split to sort ranks based on key values
+int smpi_compare_rankkeys(const void *a, const void *b);
+int smpi_compare_rankkeys(const void *a, const void *b) {
+    int *x = (int *)a;
+    int *y = (int *)b;
+
+    if (x[1] < y[1]) return -1;
+
+    if (x[1] == y[1]) {
+        if (x[0] < y[0]) return -1;
+        if (x[0] == y[0]) return 0;
+        return 1;
+    }
+
+    return 1;
+}
+
+// FIXME: needs to return null in event of MPI_UNDEFINED color...
+int SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out)
+{
+	int retval = MPI_SUCCESS;
+
+	int index, rank;
+	smpi_mpi_request_t request;
+	int colorkey[2];
+	smpi_mpi_status_t status;
+
+	smpi_bench_end();
+
+	// FIXME: need to test parameters
+
+	index = smpi_host_index();
+	rank  = comm->index_to_rank_map[index];
+
+	if (0 == rank) {
+		int colormap[comm->size];
+        int keymap[comm->size];
+        int rankkeymap[comm->size * 2];
+		int i, j;
+		smpi_mpi_communicator_t tempcomm = NULL;
+		int colortmp;
+		int keycount;
+		int indextmp;
+
+		colormap[0] = color;
+        keymap[0]   = key;
+
+		// FIXME: use scatter/gather or similar instead of individual comms
+		for (i = 1; i < comm->size; i++) {
+			retval = smpi_create_request(colorkey, 2, MPI_INT, MPI_ANY_SOURCE,
+                    rank, MPI_ANY_TAG, comm, &request);
+			smpi_mpi_irecv(request);
+			smpi_mpi_wait(request, &status);
+			colormap[status.MPI_SOURCE] = colorkey[0];
+			keymap[status.MPI_SOURCE]   = colorkey[1];
+			xbt_mallocator_release(smpi_global->request_mallocator, request);
+		}
+
+		for (i = 0; i < comm->size; i++) {
+			if (-1 == colormap[i]) {
+				continue;
+			}
+			colortmp = colormap[i];
+			keycount = 0;
+			for (j = i; j < comm->size; j++) {
+				if(colortmp == colormap[j]) {
+					colormap[j] = -1;
+					rankkeymap[keycount * 2]     = j;
+					rankkeymap[keycount * 2 + 1] = keymap[j];
+					keycount++;
+				}
+			}
+            qsort(rankkeymap, keycount, sizeof(int) * 2, &smpi_compare_rankkeys);
+			tempcomm                    = xbt_new(s_smpi_mpi_communicator_t, 1);
+			tempcomm->barrier_count     = 0;
+			tempcomm->size              = keycount;
+			tempcomm->barrier_mutex     = SIMIX_mutex_init();
+			tempcomm->barrier_cond      = SIMIX_cond_init();
+			tempcomm->rank_to_index_map = xbt_new(int, keycount);
+			tempcomm->index_to_rank_map = xbt_new(int, smpi_global->host_count);
+			for (j = 0; j < smpi_global->host_count; j++) {
+				tempcomm->index_to_rank_map[j] = -1;
+			}
+			for (j = 0; j < keycount; j++) {
+				indextmp = comm->rank_to_index_map[rankkeymap[j*2]];
+				tempcomm->rank_to_index_map[j]        = indextmp;
+				tempcomm->index_to_rank_map[indextmp] = j;
+			}
+			for (j = 0; j < keycount; j++) {
+				if (rankkeymap[j*2]) {
+					retval = smpi_create_request(&j, 1, MPI_INT, 0,
+                        rankkeymap[j*2], 0, comm, &request);
+					request->data = tempcomm;
+					smpi_mpi_isend(request);
+					smpi_mpi_wait(request, &status);
+					xbt_mallocator_release(smpi_global->request_mallocator,
+                        request);
+				} else {
+					*comm_out = tempcomm;
+				}
+			}
+		}
+	} else {
+		colorkey[0] = color;
+		colorkey[1] = key;
+		retval = smpi_create_request(colorkey, 2, MPI_INT, rank, 0, 0, comm,
+            &request);
+		smpi_mpi_isend(request);
+		smpi_mpi_wait(request, &status);
+		xbt_mallocator_release(smpi_global->request_mallocator, request);
+		retval = smpi_create_request(colorkey, 1, MPI_INT, 0, rank, 0, comm,
+            &request);
+		smpi_mpi_irecv(request);
+		smpi_mpi_wait(request, &status);
+		*comm_out = request->data;
+	}
+
+	smpi_bench_begin();
+
+	return retval;
+}