+ MPI_Sendrecv()

[simgrid.git] / src / smpi / smpi_base.c

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index e5af68d..6c7952e 100644 (file)
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -44,7 +44,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 +66,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 +110,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 +149,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];
@@ -211,7 +245,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 +263,7 @@ int smpi_mpi_barrier(smpi_mpi_communicator_t comm)
 
   return MPI_SUCCESS;
 }
+*/
 
 int smpi_mpi_isend(smpi_mpi_request_t request)
 {
@@ -332,9 +368,13 @@ int smpi_mpi_waitany(int count, smpi_mpi_request_t * requests, int *index,
   }
   /* First check if one of them is already done */
   for (cpt = 0; cpt < count; cpt++) {
+#ifdef DEBUG_STEPH
           printf("...exam req[%d] of msg from [%d]\n",cpt,requests[cpt]->src);
+#endif
     if (requests[cpt]->completed && !requests[cpt]->consumed) { /* got ya */
+#ifdef DEBUG_STEPH
           printf("...found match req[%d] of msg from [%d]\n",cpt,requests[cpt]->src);
+#endif
       *index = cpt;
       goto found_request;
     }
@@ -348,7 +388,9 @@ 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 */
+#ifdef DEBUG_STEPH
               printf("... blocked waiting a msg %d->%d, tag=%d\n",requests[cpt]->src,requests[cpt]->dst,requests[cpt]->tag);
+#endif
         while (!requests[cpt]->completed)
           SIMIX_cond_wait(requests[cpt]->cond, requests[cpt]->mutex);
 
@@ -367,8 +409,8 @@ found_request:
   requests[*index]->consumed = 1;
 #ifdef DEBUG_STEPH
       print_req( requests[cpt] );
-#endif
           printf("...accessing *req[%d]->consumed\n",cpt);
+#endif
   if (NULL != status) {
     status->MPI_SOURCE = requests[*index]->src;
     status->MPI_TAG = requests[*index]->tag;