Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
fixed bugs in SMPI_MPI_Comm_split and added back SMPI_MPI_Wait
[simgrid.git] / src / smpi / smpi_mpi.c
index 988f2ee..7d7ccf4 100644 (file)
@@ -1,13 +1,15 @@
 #include "private.h"
 
-int MPI_Init(int *argc, char ***argv)
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi, smpi, "Logging specific to SMPI (mpi)");
+
+int SMPI_MPI_Init(int *argc, char ***argv)
 {
        smpi_mpi_init();
        smpi_bench_begin();
        return MPI_SUCCESS;
 }
 
-int MPI_Finalize()
+int SMPI_MPI_Finalize()
 {
        smpi_bench_end();
        smpi_mpi_finalize();
@@ -16,14 +18,13 @@ int MPI_Finalize()
 
 // right now this just exits the current node, should send abort signal to all
 // hosts in the communicator;
-int MPI_Abort(MPI_Comm comm, int errorcode)
+int SMPI_MPI_Abort(MPI_Comm comm, int errorcode)
 {
        smpi_exit(errorcode);
-
        return 0;
 }
 
-int MPI_Comm_size(MPI_Comm comm, int *size)
+int SMPI_MPI_Comm_size(MPI_Comm comm, int *size)
 {
        int retval = MPI_SUCCESS;
 
@@ -42,7 +43,7 @@ int MPI_Comm_size(MPI_Comm comm, int *size)
        return retval;
 }
 
-int MPI_Comm_rank(MPI_Comm comm, int *rank)
+int SMPI_MPI_Comm_rank(MPI_Comm comm, int *rank)
 {
        int retval = MPI_SUCCESS;
 
@@ -53,7 +54,7 @@ int MPI_Comm_rank(MPI_Comm comm, int *rank)
        } else if (NULL == rank) {
                retval = MPI_ERR_ARG;
        } else {
-               *rank = smpi_mpi_comm_rank(comm, SIMIX_host_self());
+               *rank = smpi_mpi_comm_rank(comm);
        }
 
        smpi_bench_begin();
@@ -61,7 +62,7 @@ int MPI_Comm_rank(MPI_Comm comm, int *rank)
        return retval;
 }
 
-int MPI_Type_size(MPI_Datatype datatype, size_t *size)
+int SMPI_MPI_Type_size(MPI_Datatype datatype, size_t *size)
 {
        int retval = MPI_SUCCESS;
 
@@ -80,74 +81,240 @@ int MPI_Type_size(MPI_Datatype datatype, size_t *size)
        return retval;
 }
 
-int MPI_Barrier(MPI_Comm comm)
+int SMPI_MPI_Barrier(MPI_Comm comm)
 {
+       int retval = MPI_SUCCESS;
+
        smpi_bench_end();
-       smpi_barrier(comm);
+
+       if (NULL == comm) {
+               retval = MPI_ERR_COMM;
+       } else {
+               retval = smpi_mpi_barrier(comm);
+       }
+
        smpi_bench_begin();
-       return MPI_SUCCESS;
+
+       return retval;
 }
 
-int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request *request)
+int SMPI_MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request *request)
 {
        int retval = MPI_SUCCESS;
-       int dst;
+
        smpi_bench_end();
-       dst = smpi_mpi_comm_rank_self(comm);
-       retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, request);
-       if (NULL != *request) {
-               smpi_irecv(*request);
+
+       retval = smpi_create_request(buf, count, datatype, src, 0, tag, comm, request);
+       if (NULL != *request && MPI_SUCCESS == retval) {
+               retval = smpi_mpi_irecv(*request);
        }
+
        smpi_bench_begin();
+
        return retval;
 }
 
-int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status)
+int SMPI_MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status)
 {
        int retval = MPI_SUCCESS;
-       int dst;
-       smpi_mpi_request_t *request;
+       smpi_mpi_request_t request;
+
+       smpi_bench_end();
+
+       retval = smpi_create_request(buf, count, datatype, src, 0, tag, comm, &request);
+       if (NULL != request && MPI_SUCCESS == retval) {
+               retval = smpi_mpi_irecv(request);
+               if (MPI_SUCCESS == retval) {
+                       retval = smpi_mpi_wait(request, status);
+               }
+               xbt_mallocator_release(smpi_global->request_mallocator, request);
+       }
+
+       smpi_bench_begin();
+
+       return retval;
+}
+
+int SMPI_MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request *request)
+{
+       int retval = MPI_SUCCESS;
+
        smpi_bench_end();
-       dst = smpi_mpi_comm_rank_self(comm);
-       retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, &request);
-       if (NULL != request) {
-               smpi_irecv(request);
-               smpi_wait(request, status);
-               // FIXME: mallocator
-               //xbt_free(request);
+
+       retval = smpi_create_request(buf, count, datatype, 0, dst, tag, comm, request);
+       if (NULL != *request && MPI_SUCCESS == retval) {
+               retval = smpi_mpi_isend(*request);
        }
+
        smpi_bench_begin();
+
        return retval;
 }
 
-int MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request *request)
+int SMPI_MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)
 {
        int retval = MPI_SUCCESS;
-       int src;
+       smpi_mpi_request_t request;
+
        smpi_bench_end();
-       src = smpi_mpi_comm_rank_self(comm);
-       retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, request);
-       if (NULL != *request) {
-               smpi_isend(*request);
+
+       retval = smpi_create_request(buf, count, datatype, 0, dst, tag, comm, &request);
+       if (NULL != request && MPI_SUCCESS == retval) {
+               retval = smpi_mpi_isend(request);
+               if (MPI_SUCCESS == retval) {
+                       smpi_mpi_wait(request, MPI_STATUS_IGNORE);
+               }
+               xbt_mallocator_release(smpi_global->request_mallocator, request);
        }
+
        smpi_bench_begin();
+
        return retval;
 }
 
-int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)
+int SMPI_MPI_Wait(MPI_Request *request, MPI_Status *status) {
+       return smpi_mpi_wait(*request, status);
+}
+
+int SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) {
+
+       int retval = MPI_SUCCESS;
+       int rank;
+       smpi_mpi_request_t request;
+
+       smpi_bench_end();
+
+       rank = smpi_mpi_comm_rank(comm);
+
+       if (rank == root) {
+               retval = smpi_create_request(buf, count, datatype, root, (root + 1) % comm->size, 0, comm, &request);
+               request->forward = comm->size - 1;
+               smpi_mpi_isend(request);
+       } else {
+               retval = smpi_create_request(buf, count, datatype, MPI_ANY_SOURCE, rank, 0, comm, &request);
+               smpi_mpi_irecv(request);
+       }
+
+       smpi_mpi_wait(request, MPI_STATUS_IGNORE);
+       xbt_mallocator_release(smpi_global->request_mallocator, request);
+
+       smpi_bench_begin();
+
+       return retval;
+}
+
+// FIXME: needs to return null in event of MPI_UNDEFINED color...
+// FIXME: seriously, this isn't pretty
+int SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out)
 {
        int retval = MPI_SUCCESS;
-       int src;
-       smpi_mpi_request_t *request;
+
+       int index, rank;
+       smpi_mpi_request_t request;
+       int colorkey[2];
+       smpi_mpi_status_t status;
+
        smpi_bench_end();
-       src = smpi_mpi_comm_rank_self(comm);
-       retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, &request);
-       if (NULL != request) {
-               smpi_isend(request);
-               smpi_wait(request, MPI_STATUS_IGNORE);
-               // FIXME: mallocator
-               //xbt_free(request)
+
+       // FIXME: need to test parameters
+
+       index = smpi_host_index();
+       rank  = comm->index_to_rank_map[index];
+
+       if (0 == rank) {
+               int *colors = xbt_new(int, comm->size);
+               int *keys   = xbt_new(int, comm->size);
+               int i, j, k;
+               smpi_mpi_communicator_t tempcomm = NULL;
+               int colortmp;
+               int keycount;
+               int *keystmp  = xbt_new(int, comm->size);
+               int *rankstmp = xbt_new(int, comm->size);
+               int tmpval;
+               int indextmp;
+
+               colors[0] = color;
+               keys[0]   = key;
+
+               // FIXME: not efficient
+               for (i = 1; i < comm->size; i++) {
+                       retval = smpi_create_request(colorkey, 2, MPI_INT, MPI_ANY_SOURCE, rank, MPI_ANY_TAG, comm, &request);
+                       smpi_mpi_irecv(request);
+                       smpi_mpi_wait(request, &status);
+                       colors[status.MPI_SOURCE] = colorkey[0];
+                       keys[status.MPI_SOURCE]   = colorkey[1];
+                       xbt_mallocator_release(smpi_global->request_mallocator, request);
+               }
+
+               for (i = 0; i < comm->size; i++) {
+                       if (-1 == colors[i]) {
+                               continue;
+                       }
+                       colortmp = colors[i];
+                       keycount = 0;
+                       for (j = i; j < comm->size; j++) {
+                               if(colortmp == colors[j]) {
+                                       colors[j] = -1;
+                                       keystmp[keycount] = keys[j];
+                                       rankstmp[keycount] = j;
+                                       keycount++;
+                               }
+                       }
+                       // FIXME: yes, mock me, bubble sort...
+                       for (j = 0; j < keycount; j++) {
+                               for (k = j; k < keycount - 1; k++) {
+                                       if (keystmp[k] > keystmp[k + 1]) {
+                                               tmpval          = keystmp[k];
+                                               keystmp[k]      = keystmp[k + 1];
+                                               keystmp[k + 1]  = tmpval;
+
+                                               tmpval          = rankstmp[k];
+                                               rankstmp[k]     = rankstmp[k + 1];
+                                               rankstmp[k + 1] = tmpval;
+                                       }
+                               }
+                       }
+                       tempcomm                    = xbt_new(s_smpi_mpi_communicator_t, 1);
+                       tempcomm->barrier_count     = 0;
+                       tempcomm->size              = keycount;
+                       tempcomm->barrier_mutex     = SIMIX_mutex_init();
+                       tempcomm->barrier_cond      = SIMIX_cond_init();
+                       tempcomm->rank_to_index_map = xbt_new(int, keycount);
+                       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[j] = -1;
+                       }
+                       for (j = 0; j < keycount; j++) {
+                               indextmp = comm->rank_to_index_map[rankstmp[j]];
+                               tempcomm->rank_to_index_map[j]        = indextmp;
+                               tempcomm->index_to_rank_map[indextmp] = j;
+                       }
+                       for (j = 0; j < keycount; j++) {
+                               if (rankstmp[j]) {
+                                       retval = smpi_create_request(&j, 1, MPI_INT, 0, rankstmp[j], 0, comm, &request);
+                                       request->data = tempcomm;
+                                       smpi_mpi_isend(request);
+                                       smpi_mpi_wait(request, &status);
+                                       xbt_mallocator_release(smpi_global->request_mallocator, request);
+                               } else {
+                                       *comm_out = tempcomm;
+                               }
+                       }
+               }
+       } else {
+               colorkey[0] = color;
+               colorkey[1] = key;
+               retval = smpi_create_request(colorkey, 2, MPI_INT, rank, 0, 0, comm, &request);
+               smpi_mpi_isend(request);
+               smpi_mpi_wait(request, &status);
+               xbt_mallocator_release(smpi_global->request_mallocator, request);
+               retval = smpi_create_request(colorkey, 1, MPI_INT, 0, rank, 0, comm, &request);
+               smpi_mpi_irecv(request);
+               smpi_mpi_wait(request, &status);
+               *comm_out = request->data;
        }
+
        smpi_bench_begin();
+
        return retval;
 }