X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d30fcaa41c0aabda5afef028a793b9e295a4aadb..3c072dea92bbf0e4df46b1d8d56cd62e68883b33:/src/smpi/smpi_base.c

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index e5af68d34c..f0605ea5eb 100644
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -7,12 +7,15 @@ XBT_LOG_EXTERNAL_CATEGORY(smpi_base);
 XBT_LOG_EXTERNAL_CATEGORY(smpi_bench);
 XBT_LOG_EXTERNAL_CATEGORY(smpi_kernel);
 XBT_LOG_EXTERNAL_CATEGORY(smpi_mpi);
+XBT_LOG_EXTERNAL_CATEGORY(smpi_mpi_dt);
+XBT_LOG_EXTERNAL_CATEGORY(smpi_coll);
 XBT_LOG_EXTERNAL_CATEGORY(smpi_receiver);
 XBT_LOG_EXTERNAL_CATEGORY(smpi_sender);
 XBT_LOG_EXTERNAL_CATEGORY(smpi_util);
 
 smpi_mpi_global_t smpi_mpi_global = NULL;
 
+
 /**
  * Operations of MPI_OP : implemented=land,sum,min,max
  **/
@@ -44,7 +47,7 @@ void smpi_mpi_sum_func(void *a, void *b, int *length,
 void smpi_mpi_sum_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 {
   int i;
-  if (*datatype == smpi_mpi_global->mpi_byte) {
+  if ((*datatype == smpi_mpi_global->mpi_byte) || (*datatype == smpi_mpi_global->mpi_char)) {
     char *x = a, *y = b;
     for (i = 0; i < *length; i++) {
       y[i] = x[i] + y[i];
@@ -66,7 +69,41 @@ void smpi_mpi_sum_func(void *a, void *b, int *length, MPI_Datatype * datatype)
     }
   }
 }
+/**
+ *i multiply two vectors element-wise
+ *
+ * @param a the first vectors
+ * @param b the second vectors
+ * @return the second vector is modified and contains the element-wise products
+ **/
+void smpi_mpi_prod_func(void *a, void *b, int *length,
+                       MPI_Datatype * datatype);
 
+void smpi_mpi_prod_func(void *a, void *b, int *length, MPI_Datatype * datatype)
+{
+  int i;
+  if ((*datatype == smpi_mpi_global->mpi_byte) || (*datatype == smpi_mpi_global->mpi_char)) {
+    char *x = a, *y = b;
+    for (i = 0; i < *length; i++) {
+      y[i] = x[i] * y[i];
+    }
+  } else if (*datatype == smpi_mpi_global->mpi_int) {
+    int *x = a, *y = b;
+    for (i = 0; i < *length; i++) {
+      y[i] = x[i] * y[i];
+    }
+  } else if (*datatype == smpi_mpi_global->mpi_float) {
+    float *x = a, *y = b;
+    for (i = 0; i < *length; i++) {
+      y[i] = x[i] * y[i];
+    }
+  } else if (*datatype == smpi_mpi_global->mpi_double) {
+    double *x = a, *y = b;
+    for (i = 0; i < *length; i++) {
+      y[i] = x[i] * y[i];
+    }
+  }
+}
 /**
  * compute the min of two vectors element-wise
  **/
@@ -76,7 +113,7 @@ void smpi_mpi_min_func(void *a, void *b, int *length,
 void smpi_mpi_min_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 {
   int i;
-  if (*datatype == smpi_mpi_global->mpi_byte) {
+  if ((*datatype == smpi_mpi_global->mpi_byte) || (*datatype == smpi_mpi_global->mpi_char)) {
     char *x = a, *y = b;
     for (i = 0; i < *length; i++) {
       y[i] = x[i] < y[i] ? x[i] : y[i];
@@ -115,7 +152,7 @@ void smpi_mpi_max_func(void *a, void *b, int *length,
 void smpi_mpi_max_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 {
   int i;
-  if (*datatype == smpi_mpi_global->mpi_byte) {
+  if ((*datatype == smpi_mpi_global->mpi_byte) || (*datatype == smpi_mpi_global->mpi_char)) {
     char *x = a, *y = b;
     for (i = 0; i < *length; i++) {
       y[i] = x[i] > y[i] ? x[i] : y[i];
@@ -161,9 +198,9 @@ void smpi_process_init(int *argc, char ***argv)
 
   /* get rank from command line, and remove it from argv */
   pdata->index = atoi((*argv)[1]);
-  DEBUG1("I'm rank %d", pdata->index);
+  DEBUG1("I'm rank <%d>", pdata->index);
   if (*argc > 2) {
-    memmove((*argv)[1], (*argv)[2], sizeof(char *) * (*argc - 2));
+    memmove(&(*argv)[1], &(*argv)[2], sizeof(char *) * (*argc - 2));
     (*argv)[(*argc) - 1] = NULL;
   }
   (*argc)--;
@@ -211,7 +248,8 @@ void smpi_process_finalize()
   xbt_free(pdata);
 }
 
-int smpi_mpi_barrier(smpi_mpi_communicator_t comm)
+
+/*int smpi_mpi_barrier(smpi_mpi_communicator_t comm)
 {
 
   SIMIX_mutex_lock(comm->barrier_mutex);
@@ -228,6 +266,7 @@ int smpi_mpi_barrier(smpi_mpi_communicator_t comm)
 
   return MPI_SUCCESS;
 }
+*/
 
 int smpi_mpi_isend(smpi_mpi_request_t request)
 {
@@ -264,7 +303,7 @@ int smpi_mpi_irecv(smpi_mpi_request_t request)
 
 void  print_req( smpi_mpi_request_t r ); 
 void  print_req( smpi_mpi_request_t r ) {
-        printf("***req %p-> src=%d dst=%d tag=%d completed=0x%x consumed=0x%x\n",r,r->src,r->dst,r->tag,r->completed,r->consumed);
+        fprintf(stderr,"***req %p-> src=%d dst=%d tag=%d completed=0x%x consumed=0x%x\n",r,r->src,r->dst,r->tag,r->completed,r->consumed);
 }
 
 
@@ -278,8 +317,11 @@ int smpi_mpi_wait(smpi_mpi_request_t request, smpi_mpi_status_t * status)
   if (NULL == request) {
     retval = MPI_ERR_INTERN;
   } else {
-    SIMIX_mutex_lock(request->mutex);
 
+  DEBUG3("entered smpi_mpi_wait() for req_src=%d,req_dst=%d,req_tag=%d",
+                  request->src,request->dst,request->tag);
+    SIMIX_mutex_lock(request->mutex);
+//#define DEBUG_STEPH
 #ifdef DEBUG_STEPH
     print_req( request );  //@@
 #endif
@@ -326,15 +368,16 @@ int smpi_mpi_waitany(int count, smpi_mpi_request_t * requests, int *index,
 {
   int cpt;
 
+  DEBUG0("entering smpi_wait_any() ...");
   *index = MPI_UNDEFINED;
   if (NULL == requests) {
     return MPI_ERR_INTERN;
   }
   /* First check if one of them is already done */
   for (cpt = 0; cpt < count; cpt++) {
-          printf("...exam req[%d] of msg from [%d]\n",cpt,requests[cpt]->src);
+          DEBUG2(" exam req[%d] of msg from <%d>",cpt,requests[cpt]->src);
     if (requests[cpt]->completed && !requests[cpt]->consumed) { /* got ya */
-          printf("...found match req[%d] of msg from [%d]\n",cpt,requests[cpt]->src);
+          DEBUG2("smpi_wait_any() found match req[%d] of msg from <%d>",cpt,requests[cpt]->src);
       *index = cpt;
       goto found_request;
     }
@@ -348,7 +391,7 @@ int smpi_mpi_waitany(int count, smpi_mpi_request_t * requests, int *index,
       print_req( requests[cpt] );
 #endif
       if (!requests[cpt]->completed) {  /* this one is not done, wait on it */
-              printf("... blocked waiting a msg %d->%d, tag=%d\n",requests[cpt]->src,requests[cpt]->dst,requests[cpt]->tag);
+              DEBUG3("smpi_waitany() blocked waiting a msg <%d> -> <%d>, tag=%d",requests[cpt]->src,requests[cpt]->dst,requests[cpt]->tag);
         while (!requests[cpt]->completed)
           SIMIX_cond_wait(requests[cpt]->cond, requests[cpt]->mutex);
 
@@ -362,17 +405,17 @@ int smpi_mpi_waitany(int count, smpi_mpi_request_t * requests, int *index,
 
 found_request:
 #ifdef DEBUG_STEPH
-      print_req( requests[cpt] );
+  print_req( requests[cpt] );
 #endif
   requests[*index]->consumed = 1;
 #ifdef DEBUG_STEPH
-      print_req( requests[cpt] );
+  print_req( requests[cpt] );
 #endif
-          printf("...accessing *req[%d]->consumed\n",cpt);
+  DEBUG2("smpi_waitany() request %p unblocked ... mark *req[%d]->consumed",requests[*index],cpt);
   if (NULL != status) {
-    status->MPI_SOURCE = requests[*index]->src;
-    status->MPI_TAG = requests[*index]->tag;
-    status->MPI_ERROR = MPI_SUCCESS;
+          status->MPI_SOURCE = requests[*index]->src;
+          status->MPI_TAG = requests[*index]->tag;
+          status->MPI_ERROR = MPI_SUCCESS;
   }
   return MPI_SUCCESS;