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

diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c
index 485374468e..f18a5c1048 100644
--- a/src/smpi/smpi_mpi.c
+++ b/src/smpi/smpi_mpi.c
@@ -5,7 +5,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi, smpi,
 
 int SMPI_MPI_Init(int *argc, char ***argv)
 {
-  smpi_process_init();
+  smpi_process_init(argc,argv);
   smpi_bench_begin();
   return MPI_SUCCESS;
 }
@@ -181,11 +181,23 @@ int SMPI_MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst,
   return retval;
 }
 
+/**
+ * MPI_Wait and friends
+ **/
 int SMPI_MPI_Wait(MPI_Request * request, MPI_Status * status)
 {
   return smpi_mpi_wait(*request, status);
 }
 
+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)
 {
@@ -217,12 +229,106 @@ int SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root,
   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;
+	  int *x = (int *) a;
+	  int *y = (int *) b;
 
   if (x[1] < y[1])
     return -1;
@@ -252,7 +358,7 @@ int SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key,
 
   // FIXME: need to test parameters
 
-  index = smpi_host_index();
+  index = smpi_process_index();
   rank = comm->index_to_rank_map[index];
 
   // default output
@@ -305,8 +411,8 @@ int SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key,
       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->host_count);
-      for (j = 0; j < smpi_global->host_count; j++) {
+      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++) {
@@ -348,3 +454,8 @@ int SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key,
 
   return retval;
 }
+
+double SMPI_MPI_Wtime( void )
+{
+	  return ( SIMIX_get_clock() );
+}