fixed several problems in gather, gatherv, allgather, allgatherv, and scan

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

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 0d5cdd2..4f5c96e 100644 (file)
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -26,8 +26,7 @@ static int match_recv(void* a, void* b) {
 
    xbt_assert(ref, "Cannot match recv against null reference");
    xbt_assert(req, "Cannot match recv against null request");
-   return req->size == ref->size
-          && (ref->src == MPI_ANY_SOURCE || req->src == ref->src)
+   return (ref->src == MPI_ANY_SOURCE || req->src == ref->src)
           && (ref->tag == MPI_ANY_TAG || req->tag == ref->tag);
 }
 
@@ -37,8 +36,7 @@ static int match_send(void* a, void* b) {
 
    xbt_assert(ref, "Cannot match send against null reference");
    xbt_assert(req, "Cannot match send against null request");
-   return req->size == ref->size
-          && (req->src == MPI_ANY_SOURCE || req->src == ref->src)
+   return (req->src == MPI_ANY_SOURCE || req->src == ref->src)
           && (req->tag == MPI_ANY_TAG || req->tag == ref->tag);
 }
 
@@ -400,7 +398,7 @@ void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
                       MPI_Datatype recvtype, int root, MPI_Comm comm)
 {
   int system_tag = 666;
-  int rank, size, src, index, sendsize;
+  int rank, size, src, index, sendsize, recvsize;
   MPI_Request *requests;
 
   rank = smpi_comm_rank(comm);
@@ -410,8 +408,9 @@ void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
     smpi_mpi_send(sendbuf, sendcount, sendtype, root, system_tag, comm);
   } else {
     sendsize = smpi_datatype_size(sendtype);
+    recvsize = smpi_datatype_size(recvtype);
     // Local copy from root
-    memcpy(&((char *) recvbuf)[displs[root]], sendbuf,
+    memcpy(&((char *) recvbuf)[displs[root] * recvsize], sendbuf,
            sendcount * sendsize * sizeof(char));
     // Receive buffers from senders
     requests = xbt_new(MPI_Request, size - 1);
@@ -419,7 +418,7 @@ void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
     for(src = 0; src < size; src++) {
       if(src != root) {
         requests[index] =
-            smpi_irecv_init(&((char *) recvbuf)[displs[src]],
+            smpi_irecv_init(&((char *) recvbuf)[displs[src] * recvsize],
                             recvcounts[src], recvtype, src, system_tag,
                             comm);
         index++;
@@ -484,7 +483,7 @@ void smpi_mpi_allgatherv(void *sendbuf, int sendcount,
   sendsize = smpi_datatype_size(sendtype);
   recvsize = smpi_datatype_size(recvtype);
   // Local copy from self
-  memcpy(&((char *) recvbuf)[displs[rank]], sendbuf,
+  memcpy(&((char *) recvbuf)[displs[rank] * recvsize], sendbuf,
          sendcount * sendsize * sizeof(char));
   // Send buffers to others;
   requests = xbt_new(MPI_Request, 2 * (size - 1));
@@ -496,7 +495,7 @@ void smpi_mpi_allgatherv(void *sendbuf, int sendcount,
                           comm);
       index++;
       requests[index] =
-          smpi_irecv_init(&((char *) recvbuf)[displs[other]],
+          smpi_irecv_init(&((char *) recvbuf)[displs[other] * recvsize],
                           recvcounts[other], recvtype, other, system_tag,
                           comm);
       index++;
@@ -565,7 +564,7 @@ void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs,
     sendsize = smpi_datatype_size(sendtype);
     recvsize = smpi_datatype_size(recvtype);
     // Local copy from root
-    memcpy(recvbuf, &((char *) sendbuf)[displs[root]],
+    memcpy(recvbuf, &((char *) sendbuf)[displs[root] * sendsize],
            recvcount * recvsize * sizeof(char));
     // Send buffers to receivers
     requests = xbt_new(MPI_Request, size - 1);
@@ -573,7 +572,7 @@ void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs,
     for(dst = 0; dst < size; dst++) {
       if(dst != root) {
         requests[index] =
-            smpi_isend_init(&((char *) sendbuf)[displs[dst]],
+            smpi_isend_init(&((char *) sendbuf)[displs[dst] * sendsize],
                             sendcounts[dst], sendtype, dst, system_tag,
                             comm);
         index++;
@@ -729,7 +728,7 @@ void smpi_mpi_scan(void *sendbuf, void *recvbuf, int count,
       smpi_op_apply(op, tmpbufs[index], recvbuf, &count, &datatype);
     }
   }
-  for(index = 0; index < size - 1; index++) {
+  for(index = 0; index < rank; index++) {
     xbt_free(tmpbufs[index]);
   }
   xbt_free(tmpbufs);