X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6ce3162b34f0a964b8844368b9d86df4f1cf89b..03216b99d0e66e1778d9b99b11c3207c87900aad:/src/smpi/smpi_mpi.c

diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c
index b21ccbf4f8..f18a5c1048 100644
--- a/src/smpi/smpi_mpi.c
+++ b/src/smpi/smpi_mpi.c
@@ -1,153 +1,461 @@
 #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;
+  smpi_process_init(argc,argv);
+  smpi_bench_begin();
+  return MPI_SUCCESS;
 }
 
-int MPI_Finalize()
+int SMPI_MPI_Finalize()
 {
-	smpi_bench_end();
-	smpi_mpi_finalize();
-	return MPI_SUCCESS;
+  smpi_bench_end();
+  smpi_process_finalize();
+  return MPI_SUCCESS;
 }
 
 // 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)
+// hosts in the communicator (TODO)
+int SMPI_MPI_Abort(MPI_Comm comm, int errorcode)
+{
+  smpi_exit(errorcode);
+  return 0;
+}
+
+int SMPI_MPI_Comm_size(MPI_Comm comm, int *size)
+{
+  int retval = MPI_SUCCESS;
+
+  smpi_bench_end();
+
+  if (NULL == comm) {
+    retval = MPI_ERR_COMM;
+  } else if (NULL == size) {
+    retval = MPI_ERR_ARG;
+  } else {
+    *size = comm->size;
+  }
+
+  smpi_bench_begin();
+
+  return retval;
+}
+
+int SMPI_MPI_Comm_rank(MPI_Comm comm, int *rank)
+{
+  int retval = MPI_SUCCESS;
+
+  smpi_bench_end();
+
+  if (NULL == comm) {
+    retval = MPI_ERR_COMM;
+  } else if (NULL == rank) {
+    retval = MPI_ERR_ARG;
+  } else {
+    *rank = smpi_mpi_comm_rank(comm);
+  }
+
+  smpi_bench_begin();
+
+  return retval;
+}
+
+int SMPI_MPI_Type_size(MPI_Datatype datatype, size_t * size)
 {
-	smpi_exit(errorcode);
+  int retval = MPI_SUCCESS;
+
+  smpi_bench_end();
+
+  if (NULL == datatype) {
+    retval = MPI_ERR_TYPE;
+  } else if (NULL == size) {
+    retval = MPI_ERR_ARG;
+  } else {
+    *size = datatype->size;
+  }
 
-	return 0;
+  smpi_bench_begin();
+
+  return retval;
 }
 
-int MPI_Comm_size(MPI_Comm comm, int *size)
+int SMPI_MPI_Barrier(MPI_Comm comm)
 {
-	int retval = MPI_SUCCESS;
+  int retval = MPI_SUCCESS;
 
-	smpi_bench_end();
+  smpi_bench_end();
 
-	if (NULL == comm) {
-		retval = MPI_ERR_COMM;
-	} else if (NULL == size) {
-		retval = MPI_ERR_ARG;
-	} else {
-		*size = comm->size;
-	}
+  if (NULL == comm) {
+    retval = MPI_ERR_COMM;
+  } else {
+    retval = smpi_mpi_barrier(comm);
+  }
 
-	smpi_bench_begin();
+  smpi_bench_begin();
 
-	return retval;
+  return retval;
 }
 
-int MPI_Comm_rank(MPI_Comm comm, int *rank)
+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 retval = MPI_SUCCESS;
 
-	smpi_bench_end();
+  smpi_bench_end();
 
-	if (NULL == comm) {
-		retval = MPI_ERR_COMM;
-	} else if (NULL == rank) {
-		retval = MPI_ERR_ARG;
-	} else {
-		*rank = smpi_comm_rank(comm, SIMIX_host_self());
-	}
+  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();
+  smpi_bench_begin();
 
-	return retval;
+  return retval;
 }
 
-int MPI_Type_size(MPI_Datatype datatype, size_t *size)
+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 retval = MPI_SUCCESS;
+  smpi_mpi_request_t request;
 
-	smpi_bench_end();
+  smpi_bench_end();
 
-	if (NULL == datatype) {
-		retval = MPI_ERR_TYPE;
-	} else if (NULL == size) {
-		retval = MPI_ERR_ARG;
-	} else {
-		*size = datatype->size;
-	}
+  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) {
+      retval = smpi_mpi_wait(request, status);
+    }
+    xbt_mallocator_release(smpi_global->request_mallocator, request);
+  }
 
-	smpi_bench_begin();
+  smpi_bench_begin();
 
-	return retval;
+  return retval;
 }
 
-int MPI_Barrier(MPI_Comm comm)
+int SMPI_MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst,
+                   int tag, MPI_Comm comm, MPI_Request * request)
 {
-	smpi_bench_end();
-	smpi_barrier(comm);
-	smpi_bench_begin();
-	return MPI_SUCCESS;
+  int retval = MPI_SUCCESS;
+
+  smpi_bench_end();
+
+  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();
+
+  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_Send(void *buf, int count, MPI_Datatype datatype, int dst,
+                  int tag, MPI_Comm comm)
 {
-	int retval = MPI_SUCCESS;
-	int dst;
-	smpi_bench_end();
-	dst = smpi_mpi_comm_rank_self(comm);
-	retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, request);
-	if (NULL != *request) {
-		smpi_irecv(*request);
-	}
-	smpi_bench_begin();
-	return retval;
+  int retval = MPI_SUCCESS;
+  smpi_mpi_request_t request;
+
+  smpi_bench_end();
+
+  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) {
+      smpi_mpi_wait(request, MPI_STATUS_IGNORE);
+    }
+    xbt_mallocator_release(smpi_global->request_mallocator, request);
+  }
+
+  smpi_bench_begin();
+
+  return retval;
 }
 
-int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status)
+/**
+ * MPI_Wait and friends
+ **/
+int SMPI_MPI_Wait(MPI_Request * request, 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);
-	if (NULL != request) {
-		smpi_irecv(request);
-		smpi_wait(request, status);
-		// FIXME: mallocator
-		//xbt_free(request);
-	}
-	smpi_bench_begin();
-	return retval;
+  return smpi_mpi_wait(*request, status);
 }
 
-int MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request *request)
+int SMPI_MPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) {
+	return smpi_mpi_waitall(count, requests,status);
+}
+int SMPI_MPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status status[]) {
+	return smpi_mpi_waitany(count, requests, index,status);
+}
+/**
+ * MPI_Bcast
+ **/
+int SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root,
+                   MPI_Comm comm)
 {
-	int retval = MPI_SUCCESS;
-	int src;
-	smpi_bench_end();
-	src = smpi_mpi_comm_rank_self(comm);
-	retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, request);
-	if (NULL != *request) {
-		smpi_isend(*request);
-	}
-	smpi_bench_begin();
-	return retval;
+
+  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;
+}
+
+/**
+ * debugging helper function
+ **/
+void print_buffer_int( void *buf, int len, const char *msg) ;
+void print_buffer_int( void *buf, int len, const char *msg) {
+	  int tmp, *v;
+	  printf("**%s: ",msg);
+	  for (tmp=0;tmp<len;tmp++) {
+		    v = buf;
+		    printf("[%d]", v[tmp] );
+	  }
+	  printf("\n");
+}
+
+
+/**
+ * MPI_Reduce
+ **/
+
+int SMPI_MPI_Reduce( void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
+   		         MPI_Op op, int root, MPI_Comm comm )
+{
+  int retval = MPI_SUCCESS;
+  int rank;
+  int size;
+  int i;
+  int tag=0;
+  smpi_mpi_request_t *tabrequest;
+  smpi_mpi_request_t request;
+
+
+  smpi_bench_end();
+
+  rank = smpi_mpi_comm_rank(comm);
+  size = comm->size;
+
+  //printf("-->rank %d. Entering ....\n",rank);
+  //print_buffer_int( sendbuf, count, "sendbuf");
+
+  if (rank != root) { // if i am not ROOT, simply send my buffer to root
+	    retval = smpi_create_request(sendbuf, count, datatype, rank, root, tag , comm, &request);
+	    smpi_mpi_isend(request);
+	    smpi_mpi_wait(request, MPI_STATUS_IGNORE);
+	    xbt_mallocator_release(smpi_global->request_mallocator, request);
+
+  } else {
+	    // i am the ROOT: wait for all buffers by creating one request by sender
+	    tabrequest = xbt_malloc((size-1)*sizeof(smpi_mpi_request_t));
+
+          void **tmpbufs = xbt_malloc((size-1)*sizeof(void *));
+	    for (i=0; i<size-1; i++) {
+		  // we need 1 buffer per request to store intermediate receptions
+	        tmpbufs[i] = xbt_malloc(count*datatype->size); 
+	    }
+	    memcpy(recvbuf,sendbuf,count*datatype->size*sizeof(char)); // initiliaze recv buf with my own snd buf 
+
+	    // i can not use: 'request->forward = size-1;' (which would progagate size-1 receive reqs)
+	    // since we should op values as soon as one receiving request matches.
+	    for (i=0; i<comm->size-1; i++) {
+			// reminder: for smpi_create_request() the src is always the process sending.
+			retval = smpi_create_request(tmpbufs[i], count, datatype, 
+					    MPI_ANY_SOURCE, root,
+					    tag, comm, &(tabrequest[i]));
+			if (NULL != tabrequest[i] && MPI_SUCCESS == retval) {
+				  if (MPI_SUCCESS == retval) {
+					    smpi_mpi_irecv(tabrequest[i]);
+				  }
+			}
+	    }
+	    // now, wait for completion of all irecv's.
+	    for (i=0; i<comm->size-1; i++) {
+			int index = MPI_UNDEFINED;
+			smpi_mpi_waitany(comm->size-1, tabrequest, &index, MPI_STATUS_IGNORE);
+
+			//print_buffer_int( recvbuf, count, "rcvbuf");
+			//printf("MPI_Waitany() unblocked: root received (completes req[index=%d]): ",index);
+			//print_buffer_int( tmpbufs[index], count, "tmpbufs[index]");
+
+			// arg 2 is modified 
+			op->func (tmpbufs[index],recvbuf,&count,&datatype);
+
+			// print_buffer_int( recvbuf, count, "recvbuf after func");
+			//xbt_mallocator_release(smpi_global->request_mallocator, tabrequest[i]);
+			//xbt_free( tmpbufs[index]);
+	    }
+	    xbt_free(tabrequest);
+	    xbt_free(tmpbufs);
+  }
+
+  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;
+}
+
+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_process_index();
+  rank = comm->index_to_rank_map[index];
+
+  // default output
+  comm_out = NULL;
+
+  // root node does most of the real work
+  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 count;
+    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 (MPI_UNDEFINED == colormap[i]) {
+        continue;
+      }
+      // make a list of nodes with current color and sort by keys
+      count = 0;
+      for (j = i; j < comm->size; j++) {
+        if (colormap[i] == colormap[j]) {
+          colormap[j] = MPI_UNDEFINED;
+          rankkeymap[count * 2] = j;
+          rankkeymap[count * 2 + 1] = keymap[j];
+          count++;
+        }
+      }
+      qsort(rankkeymap, count, sizeof(int) * 2, &smpi_compare_rankkeys);
+
+      // new communicator
+      tempcomm = xbt_new(s_smpi_mpi_communicator_t, 1);
+      tempcomm->barrier_count = 0;
+      tempcomm->size = count;
+      tempcomm->barrier_mutex = SIMIX_mutex_init();
+      tempcomm->barrier_cond = SIMIX_cond_init();
+      tempcomm->rank_to_index_map = xbt_new(int, count);
+      tempcomm->index_to_rank_map = xbt_new(int, smpi_global->process_count);
+      for (j = 0; j < smpi_global->process_count; j++) {
+        tempcomm->index_to_rank_map[j] = -1;
+      }
+      for (j = 0; j < count; 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 < count; 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);
+    if (MPI_UNDEFINED != color) {
+      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;
 }
 
-int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)
+double SMPI_MPI_Wtime( void )
 {
-	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);
-	if (NULL != request) {
-		smpi_isend(request);
-		smpi_wait(request, MPI_STATUS_IGNORE);
-		// FIXME: mallocator
-		//xbt_free(request)
-	}
-	smpi_bench_begin();
-	return retval;
+	  return ( SIMIX_get_clock() );
 }