haha! problem with call to get_remote_mailbox...code was using communicator rank

instead of process index!

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 4f5c96e..012cc39 100644 (file)
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -48,6 +48,7 @@ static MPI_Request build_request(void *buf, int count,
 
   request = xbt_new(s_smpi_mpi_request_t, 1);
   request->buf = buf;
+  // FIXME: this will have to be changed to support non-contiguous datatypes
   request->size = smpi_datatype_size(datatype) * count;
   request->src = src;
   request->dst = dst;
@@ -92,10 +93,13 @@ void smpi_mpi_start(MPI_Request request)
   if(request->flags & RECV) {
     print_request("New recv", request);
     mailbox = smpi_process_mailbox();
+    // FIXME: SIMIX does not yet support don-contiguous datatypes
     request->action = SIMIX_req_comm_irecv(mailbox, request->buf, &request->size, &match_recv, request);
   } else {
     print_request("New send", request);
-    mailbox = smpi_process_remote_mailbox(request->dst);
+    mailbox = smpi_process_remote_mailbox(
+        smpi_group_index(smpi_comm_group(request->comm), request->dst));
+    // FIXME: SIMIX does not yet support don-contiguous datatypes
     request->action = SIMIX_req_comm_isend(mailbox, request->size, -1.0,
                                            request->buf, request->size, &match_send, request, 0);
 #ifdef HAVE_TRACING
@@ -210,6 +214,8 @@ static void finish_wait(MPI_Request * request, MPI_Status * status)
     status->MPI_SOURCE = req->src;
     status->MPI_TAG = req->tag;
     status->MPI_ERROR = MPI_SUCCESS;
+    // FIXME: really this should just contain the count of receive-type blocks,
+    // right?
     status->count = req->size;
   }
   print_request("Finishing", req);
@@ -251,9 +257,10 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index,
       }
     }
     if(size > 0) {
-      *index = SIMIX_req_comm_testany(comms);
-      *index = map[*index];
-      if(*index != MPI_UNDEFINED) {
+      i = SIMIX_req_comm_testany(comms);
+      // FIXME: MPI_UNDEFINED or does SIMIX have a return code?
+      if(i != MPI_UNDEFINED) {
+        *index = map[i];
         smpi_mpi_wait(&requests[*index], status);
         flag = 1;
       }
@@ -294,9 +301,12 @@ int smpi_mpi_waitany(int count, MPI_Request requests[],
       }
     }
     if(size > 0) {
-      index = SIMIX_req_comm_waitany(comms);
-      index = map[index];
-      finish_wait(&requests[index], status);
+      i = SIMIX_req_comm_waitany(comms);
+      // FIXME: MPI_UNDEFINED or does SIMIX have a return code?
+      if (i != MPI_UNDEFINED) {
+        index = map[i];
+        finish_wait(&requests[index], status);
+      }
     }
     xbt_free(map);
     xbt_dynar_free(&comms);
@@ -360,7 +370,8 @@ void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
                      int root, MPI_Comm comm)
 {
   int system_tag = 666;
-  int rank, size, src, index, sendsize, recvsize;
+  int rank, size, src, index;
+  MPI_Aint lb = 0, recvext = 0;
   MPI_Request *requests;
 
   rank = smpi_comm_rank(comm);
@@ -369,20 +380,19 @@ void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
     // Send buffer to root
     smpi_mpi_send(sendbuf, sendcount, sendtype, root, system_tag, comm);
   } else {
-    sendsize = smpi_datatype_size(sendtype);
-    recvsize = smpi_datatype_size(recvtype);
+    // FIXME: check for errors
+    smpi_datatype_extent(recvtype, &lb, &recvext);
     // Local copy from root
-    memcpy(&((char *) recvbuf)[root * recvcount * recvsize], sendbuf,
-           sendcount * sendsize * sizeof(char));
+    smpi_datatype_copy(sendbuf, sendcount, sendtype, 
+        recvbuf + root * recvcount * recvext, recvcount, recvtype);
     // Receive buffers from senders
     requests = xbt_new(MPI_Request, size - 1);
     index = 0;
     for(src = 0; src < size; src++) {
       if(src != root) {
-        requests[index] = smpi_irecv_init(&((char *) recvbuf)
-                                          [src * recvcount * recvsize],
-                                          recvcount, recvtype, src,
-                                          system_tag, comm);
+        requests[index] = smpi_irecv_init(recvbuf + src * recvcount * recvext, 
+                                          recvcount, recvtype, 
+                                          src, system_tag, comm);
         index++;
       }
     }
@@ -398,7 +408,8 @@ 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, recvsize;
+  int rank, size, src, index;
+  MPI_Aint lb = 0, recvext = 0;
   MPI_Request *requests;
 
   rank = smpi_comm_rank(comm);
@@ -407,20 +418,20 @@ void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
     // Send buffer to root
     smpi_mpi_send(sendbuf, sendcount, sendtype, root, system_tag, comm);
   } else {
-    sendsize = smpi_datatype_size(sendtype);
-    recvsize = smpi_datatype_size(recvtype);
+    // FIXME: check for errors
+    smpi_datatype_extent(recvtype, &lb, &recvext);
     // Local copy from root
-    memcpy(&((char *) recvbuf)[displs[root] * recvsize], sendbuf,
-           sendcount * sendsize * sizeof(char));
+    smpi_datatype_copy(sendbuf, sendcount, sendtype, 
+                       recvbuf + displs[root] * recvext, 
+                       recvcounts[root], recvtype);
     // Receive buffers from senders
     requests = xbt_new(MPI_Request, size - 1);
     index = 0;
     for(src = 0; src < size; src++) {
       if(src != root) {
         requests[index] =
-            smpi_irecv_init(&((char *) recvbuf)[displs[src] * recvsize],
-                            recvcounts[src], recvtype, src, system_tag,
-                            comm);
+            smpi_irecv_init(recvbuf + displs[src] * recvext, recvcounts[src], 
+                            recvtype, src, system_tag, comm);
         index++;
       }
     }
@@ -437,16 +448,17 @@ void smpi_mpi_allgather(void *sendbuf, int sendcount,
                         MPI_Comm comm)
 {
   int system_tag = 666;
-  int rank, size, other, index, sendsize, recvsize;
+  int rank, size, other, index;
+  MPI_Aint lb = 0, recvext = 0;
   MPI_Request *requests;
 
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
-  sendsize = smpi_datatype_size(sendtype);
-  recvsize = smpi_datatype_size(recvtype);
+  // FIXME: check for errors
+  smpi_datatype_extent(recvtype, &lb, &recvext);
   // Local copy from self
-  memcpy(&((char *) recvbuf)[rank * recvcount * recvsize], sendbuf,
-         sendcount * sendsize * sizeof(char));
+  smpi_datatype_copy(sendbuf, sendcount, sendtype, 
+                     recvbuf + rank * recvcount * recvext, recvcount, recvtype);
   // Send/Recv buffers to/from others;
   requests = xbt_new(MPI_Request, 2 * (size - 1));
   index = 0;
@@ -456,9 +468,8 @@ void smpi_mpi_allgather(void *sendbuf, int sendcount,
           smpi_isend_init(sendbuf, sendcount, sendtype, other, system_tag,
                           comm);
       index++;
-      requests[index] = smpi_irecv_init(&((char *) recvbuf)
-                                        [other * recvcount * recvsize],
-                                        recvcount, recvtype, other,
+      requests[index] = smpi_irecv_init(recvbuf + other * recvcount * recvext, 
+                                        recvcount, recvtype, other, 
                                         system_tag, comm);
       index++;
     }
@@ -475,16 +486,18 @@ void smpi_mpi_allgatherv(void *sendbuf, int sendcount,
                          MPI_Datatype recvtype, MPI_Comm comm)
 {
   int system_tag = 666;
-  int rank, size, other, index, sendsize, recvsize;
+  int rank, size, other, index;
+  MPI_Aint lb = 0, recvext = 0;
   MPI_Request *requests;
 
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
-  sendsize = smpi_datatype_size(sendtype);
-  recvsize = smpi_datatype_size(recvtype);
+  // FIXME: check for errors
+  smpi_datatype_extent(recvtype, &lb, &recvext);
   // Local copy from self
-  memcpy(&((char *) recvbuf)[displs[rank] * recvsize], sendbuf,
-         sendcount * sendsize * sizeof(char));
+  smpi_datatype_copy(sendbuf, sendcount, sendtype, 
+                     recvbuf + displs[rank] * recvext, 
+                     recvcounts[rank], recvtype);
   // Send buffers to others;
   requests = xbt_new(MPI_Request, 2 * (size - 1));
   index = 0;
@@ -495,9 +508,8 @@ void smpi_mpi_allgatherv(void *sendbuf, int sendcount,
                           comm);
       index++;
       requests[index] =
-          smpi_irecv_init(&((char *) recvbuf)[displs[other] * recvsize],
-                          recvcounts[other], recvtype, other, system_tag,
-                          comm);
+          smpi_irecv_init(recvbuf + displs[other] * recvext, recvcounts[other],
+                          recvtype, other, system_tag, comm);
       index++;
     }
   }
@@ -512,7 +524,8 @@ void smpi_mpi_scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype,
                       int root, MPI_Comm comm)
 {
   int system_tag = 666;
-  int rank, size, dst, index, sendsize, recvsize;
+  int rank, size, dst, index;
+  MPI_Aint lb = 0, sendext = 0;
   MPI_Request *requests;
 
   rank = smpi_comm_rank(comm);
@@ -522,18 +535,17 @@ void smpi_mpi_scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype,
     smpi_mpi_recv(recvbuf, recvcount, recvtype, root, system_tag, comm,
                   MPI_STATUS_IGNORE);
   } else {
-    sendsize = smpi_datatype_size(sendtype);
-    recvsize = smpi_datatype_size(recvtype);
+    // FIXME: check for errors
+    smpi_datatype_extent(sendtype, &lb, &sendext);
     // Local copy from root
-    memcpy(recvbuf, &((char *) sendbuf)[root * sendcount * sendsize],
-           recvcount * recvsize * sizeof(char));
+    smpi_datatype_copy(sendbuf + root * sendcount * sendext,
+      sendcount, sendtype, recvbuf, recvcount, recvtype);
     // Send buffers to receivers
     requests = xbt_new(MPI_Request, size - 1);
     index = 0;
     for(dst = 0; dst < size; dst++) {
       if(dst != root) {
-        requests[index] = smpi_isend_init(&((char *) sendbuf)
-                                          [dst * sendcount * sendsize],
+        requests[index] = smpi_isend_init(sendbuf + dst * sendcount * sendext, 
                                           sendcount, sendtype, dst,
                                           system_tag, comm);
         index++;
@@ -551,7 +563,8 @@ void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs,
                        MPI_Datatype recvtype, int root, MPI_Comm comm)
 {
   int system_tag = 666;
-  int rank, size, dst, index, sendsize, recvsize;
+  int rank, size, dst, index;
+  MPI_Aint lb = 0, sendext = 0;
   MPI_Request *requests;
 
   rank = smpi_comm_rank(comm);
@@ -561,20 +574,19 @@ void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs,
     smpi_mpi_recv(recvbuf, recvcount, recvtype, root, system_tag, comm,
                   MPI_STATUS_IGNORE);
   } else {
-    sendsize = smpi_datatype_size(sendtype);
-    recvsize = smpi_datatype_size(recvtype);
+    // FIXME: check for errors
+    smpi_datatype_extent(sendtype, &lb, &sendext);
     // Local copy from root
-    memcpy(recvbuf, &((char *) sendbuf)[displs[root] * sendsize],
-           recvcount * recvsize * sizeof(char));
+    smpi_datatype_copy(sendbuf + displs[root] * sendext, sendcounts[root], 
+                       sendtype, recvbuf, recvcount, recvtype);
     // Send buffers to receivers
     requests = xbt_new(MPI_Request, size - 1);
     index = 0;
     for(dst = 0; dst < size; dst++) {
       if(dst != root) {
         requests[index] =
-            smpi_isend_init(&((char *) sendbuf)[displs[dst] * sendsize],
-                            sendcounts[dst], sendtype, dst, system_tag,
-                            comm);
+            smpi_isend_init(sendbuf + displs[dst] * sendext, sendcounts[dst], 
+                            sendtype, dst, system_tag, comm);
         index++;
       }
     }
@@ -590,7 +602,8 @@ void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count,
                      MPI_Comm comm)
 {
   int system_tag = 666;
-  int rank, size, src, index, datasize;
+  int rank, size, src, index;
+  MPI_Aint lb = 0, dataext = 0;
   MPI_Request *requests;
   void **tmpbufs;
 
@@ -600,9 +613,10 @@ void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count,
     // Send buffer to root
     smpi_mpi_send(sendbuf, count, datatype, root, system_tag, comm);
   } else {
-    datasize = smpi_datatype_size(datatype);
+    // FIXME: check for errors
+    smpi_datatype_extent(datatype, &lb, &dataext);
     // Local copy from root
-    memcpy(recvbuf, sendbuf, count * datasize * sizeof(char));
+    smpi_datatype_copy(sendbuf, count, datatype, recvbuf, count, datatype);
     // Receive buffers from senders
     //TODO: make a MPI_barrier here ?
     requests = xbt_new(MPI_Request, size - 1);
@@ -610,7 +624,9 @@ void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count,
     index = 0;
     for(src = 0; src < size; src++) {
       if(src != root) {
-        tmpbufs[index] = xbt_malloc(count * datasize);
+        // FIXME: possibly overkill we we have contiguous/noncontiguous data
+        //  mapping...
+        tmpbufs[index] = xbt_malloc(count * dataext);
         requests[index] =
             smpi_irecv_init(tmpbufs[index], count, datatype, src,
                             system_tag, comm);
@@ -639,73 +655,34 @@ void smpi_mpi_allreduce(void *sendbuf, void *recvbuf, int count,
 {
   smpi_mpi_reduce(sendbuf, recvbuf, count, datatype, op, 0, comm);
   smpi_mpi_bcast(recvbuf, count, datatype, 0, comm);
-
-/*
-FIXME: buggy implementation
-
-  int system_tag = 666;
-  int rank, size, other, index, datasize;
-  MPI_Request* requests;
-  void** tmpbufs;
-
-  rank = smpi_comm_rank(comm);
-  size = smpi_comm_size(comm);
-  datasize = smpi_datatype_size(datatype);
-  // Local copy from self
-  memcpy(recvbuf, sendbuf, count * datasize * sizeof(char));
-  // Send/Recv buffers to/from others;
-  //TODO: make a MPI_barrier here ?
-  requests = xbt_new(MPI_Request, 2 * (size - 1));
-  tmpbufs = xbt_new(void*, size - 1);
-  index = 0;
-  for(other = 0; other < size; other++) {
-    if(other != rank) {
-      tmpbufs[index / 2] = xbt_malloc(count * datasize);
-      requests[index] = smpi_mpi_isend(sendbuf, count, datatype, other, system_tag, comm);
-      requests[index + 1] = smpi_mpi_irecv(tmpbufs[index / 2], count, datatype, other, system_tag, comm);
-      index += 2;
-    }
-  }
-  // Wait for completion of all comms.
-  for(other = 0; other < 2 * (size - 1); other++) {
-    index = smpi_mpi_waitany(size - 1, requests, MPI_STATUS_IGNORE);
-    if(index == MPI_UNDEFINED) {
-      break;
-    }
-    if((index & 1) == 1) {
-      // Request is odd: it's a irecv
-      smpi_op_apply(op, tmpbufs[index / 2], recvbuf, &count, &datatype);
-    }
-  }
-  for(index = 0; index < size - 1; index++) {
-    xbt_free(tmpbufs[index]);
-  }
-  xbt_free(tmpbufs);
-  xbt_free(requests);
-*/
 }
 
 void smpi_mpi_scan(void *sendbuf, void *recvbuf, int count,
                    MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
 {
   int system_tag = 666;
-  int rank, size, other, index, datasize;
-  int total;
+  int rank, size, other, index;
+  MPI_Aint lb = 0, dataext = 0;
   MPI_Request *requests;
   void **tmpbufs;
 
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
-  datasize = smpi_datatype_size(datatype);
+
+  // FIXME: check for errors
+  smpi_datatype_extent(datatype, &lb, &dataext);
+
   // Local copy from self
-  memcpy(recvbuf, sendbuf, count * datasize * sizeof(char));
+  smpi_datatype_copy(sendbuf, count, datatype, recvbuf, count, datatype);
+
   // Send/Recv buffers to/from others;
-  total = rank + (size - (rank + 1));
-  requests = xbt_new(MPI_Request, total);
+  requests = xbt_new(MPI_Request, size - 1);
   tmpbufs = xbt_new(void *, rank);
   index = 0;
   for(other = 0; other < rank; other++) {
-    tmpbufs[index] = xbt_malloc(count * datasize);
+    // FIXME: possibly overkill we we have contiguous/noncontiguous data 
+    // mapping...
+    tmpbufs[index] = xbt_malloc(count * dataext);
     requests[index] =
         smpi_irecv_init(tmpbufs[index], count, datatype, other, system_tag,
                         comm);
@@ -718,7 +695,7 @@ void smpi_mpi_scan(void *sendbuf, void *recvbuf, int count,
   }
   // Wait for completion of all comms.
   smpi_mpi_startall(size - 1, requests);
-  for(other = 0; other < total; other++) {
+  for(other = 0; other < size - 1; other++) {
     index = smpi_mpi_waitany(size - 1, requests, MPI_STATUS_IGNORE);
     if(index == MPI_UNDEFINED) {
       break;

diff --git a/src/smpi/smpi_coll.c b/src/smpi/smpi_coll.c
index 4f33738..024856d 100644 (file)
--- a/src/smpi/smpi_coll.c
+++ b/src/smpi/smpi_coll.c
@@ -268,24 +268,20 @@ int smpi_coll_tuned_alltoall_basic_linear(void *sendbuf, int sendcount,
 {
   int system_tag = 888;
   int i, rank, size, err, count;
-  MPI_Aint lb;
-  MPI_Aint sendinc = 0;
-  MPI_Aint recvinc = 0;
+  MPI_Aint lb = 0, sendext = 0, recvext = 0;
   MPI_Request *requests;
 
   /* Initialize. */
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
   XBT_DEBUG("<%d> algorithm alltoall_basic_linear() called.", rank);
-  err = smpi_datatype_extent(sendtype, &lb, &sendinc);
-  err = smpi_datatype_extent(recvtype, &lb, &recvinc);
-  sendinc *= sendcount;
-  recvinc *= recvcount;
+  err = smpi_datatype_extent(sendtype, &lb, &sendext);
+  err = smpi_datatype_extent(recvtype, &lb, &recvext);
   /* simple optimization */
-  err =
-      smpi_datatype_copy(&((char *) sendbuf)[rank * sendinc], sendcount,
-                         sendtype, &((char *) recvbuf)[rank * recvinc],
-                         recvcount, recvtype);
+  err = smpi_datatype_copy(sendbuf + rank * sendcount * sendext, sendcount, 
+                           sendtype, 
+                           recvbuf + rank * recvcount * recvext, recvcount, 
+                           recvtype);
   if (err == MPI_SUCCESS && size > 1) {
     /* Initiate all send/recv to/from others. */
     requests = xbt_new(MPI_Request, 2 * (size - 1));
@@ -293,7 +289,7 @@ int smpi_coll_tuned_alltoall_basic_linear(void *sendbuf, int sendcount,
     count = 0;
     for (i = (rank + 1) % size; i != rank; i = (i + 1) % size) {
       requests[count] =
-          smpi_irecv_init(&((char *) recvbuf)[i * recvinc], recvcount,
+          smpi_irecv_init(recvbuf + i * recvcount * recvext, recvcount, 
                           recvtype, i, system_tag, comm);
       count++;
     }
@@ -302,10 +298,9 @@ int smpi_coll_tuned_alltoall_basic_linear(void *sendbuf, int sendcount,
      *     when messages actually arrive in the order in which they were posted.
      * TODO: check the previous assertion
      */
-    for (i = (rank + size - 1) % size; i != rank;
-         i = (i + size - 1) % size) {
+    for (i = (rank + size - 1) % size; i != rank; i = (i + size - 1) % size) {
       requests[count] =
-          smpi_isend_init(&((char *) sendbuf)[i * sendinc], sendcount,
+          smpi_isend_init(sendbuf + i * sendcount * sendext, sendcount,
                           sendtype, i, system_tag, comm);
       count++;
     }
@@ -364,23 +359,21 @@ int smpi_coll_basic_alltoallv(void *sendbuf, int *sendcounts,
 {
   int system_tag = 889;
   int i, rank, size, err, count;
-  MPI_Aint lb;
-  MPI_Aint sendextent = 0;
-  MPI_Aint recvextent = 0;
+  MPI_Aint lb = 0, sendext = 0, recvext = 0;
   MPI_Request *requests;
 
   /* Initialize. */
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
   XBT_DEBUG("<%d> algorithm basic_alltoallv() called.", rank);
-  err = smpi_datatype_extent(sendtype, &lb, &sendextent);
-  err = smpi_datatype_extent(recvtype, &lb, &recvextent);
+  err = smpi_datatype_extent(sendtype, &lb, &sendext);
+  err = smpi_datatype_extent(recvtype, &lb, &recvext);
   /* Local copy from self */
   err =
-      smpi_datatype_copy(&((char *) sendbuf)[senddisps[rank] * sendextent],
-                         sendcounts[rank], sendtype,
-                         &((char *) recvbuf)[recvdisps[rank] * recvextent],
-                         recvcounts[rank], recvtype);
+      smpi_datatype_copy(sendbuf + senddisps[rank] * sendext, sendcounts[rank], 
+                         sendtype,
+                         recvbuf + recvdisps[rank] * recvext, recvcounts[rank],
+                         recvtype);
   if (err == MPI_SUCCESS && size > 1) {
     /* Initiate all send/recv to/from others. */
     requests = xbt_new(MPI_Request, 2 * (size - 1));
@@ -394,8 +387,8 @@ int smpi_coll_basic_alltoallv(void *sendbuf, int *sendcounts,
         continue;
       }
       requests[count] =
-          smpi_irecv_init(&((char *) recvbuf)[recvdisps[i] * recvextent],
-                          recvcounts[i], recvtype, i, system_tag, comm);
+          smpi_irecv_init(recvbuf + recvdisps[i] * recvext, recvcounts[i], 
+                          recvtype, i, system_tag, comm);
       count++;
     }
     /* Now create all sends  */
@@ -407,8 +400,8 @@ int smpi_coll_basic_alltoallv(void *sendbuf, int *sendcounts,
         continue;
       }
       requests[count] =
-          smpi_isend_init(&((char *) sendbuf)[senddisps[i] * sendextent],
-                          sendcounts[i], sendtype, i, system_tag, comm);
+          smpi_isend_init(sendbuf + senddisps[i] * sendext, sendcounts[i], 
+                          sendtype, i, system_tag, comm);
       count++;
     }
     /* Wait for them all. */