]> AND Public Git Repository - simgrid.git/blobdiff - src/smpi/smpi_mpi.c
Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
kill generated files out of the svn, damnit
[simgrid.git] / src / smpi / smpi_mpi.c
index 7d7ccf44c7265edfa3d7c9a15140a06c291b2caf..88a693eb43d826edc05ba07f4b115474afbc9225 100644 (file)
@@ -98,13 +98,15 @@ int SMPI_MPI_Barrier(MPI_Comm comm)
        return retval;
 }
 
-int SMPI_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;
 
        smpi_bench_end();
 
-       retval = smpi_create_request(buf, count, datatype, src, 0, tag, comm, request);
+       retval = smpi_create_request(buf, count, datatype, src, 0, tag, comm,
+        request);
        if (NULL != *request && MPI_SUCCESS == retval) {
                retval = smpi_mpi_irecv(*request);
        }
@@ -114,14 +116,16 @@ int SMPI_MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag
        return retval;
 }
 
-int SMPI_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;
        smpi_mpi_request_t request;
 
        smpi_bench_end();
 
-       retval = smpi_create_request(buf, count, datatype, src, 0, tag, comm, &request);
+       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) {
@@ -135,13 +139,15 @@ int SMPI_MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag,
        return retval;
 }
 
-int SMPI_MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request *request)
+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();
 
-       retval = smpi_create_request(buf, count, datatype, 0, dst, tag, comm, request);
+       retval = smpi_create_request(buf, count, datatype, 0, dst, tag, comm,
+        request);
        if (NULL != *request && MPI_SUCCESS == retval) {
                retval = smpi_mpi_isend(*request);
        }
@@ -151,14 +157,16 @@ int SMPI_MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag
        return retval;
 }
 
-int SMPI_MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)
+int SMPI_MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst,
+    int tag, MPI_Comm comm)
 {
        int retval = MPI_SUCCESS;
        smpi_mpi_request_t request;
 
        smpi_bench_end();
 
-       retval = smpi_create_request(buf, count, datatype, 0, dst, tag, comm, &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) {
@@ -176,7 +184,9 @@ 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 SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root,
+    MPI_Comm comm)
+{
 
        int retval = MPI_SUCCESS;
        int rank;
@@ -187,11 +197,13 @@ int SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Co
        rank = smpi_mpi_comm_rank(comm);
 
        if (rank == root) {
-               retval = smpi_create_request(buf, count, datatype, root, (root + 1) % comm->size, 0, comm, &request);
+               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);
+               retval = smpi_create_request(buf, count, datatype, MPI_ANY_SOURCE, rank,
+            0, comm, &request);
                smpi_mpi_irecv(request);
        }
 
@@ -203,8 +215,23 @@ int SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Co
        return retval;
 }
 
-// FIXME: needs to return null in event of MPI_UNDEFINED color...
-// FIXME: seriously, this isn't pretty
+// used by comm_split to sort ranks based on key values
+int smpi_compare_rankkeys(const void *a, const void *b);
+int smpi_compare_rankkeys(const void *a, const void *b) {
+    int *x = (int *)a;
+    int *y = (int *)b;
+
+    if (x[1] < y[1]) return -1;
+
+    if (x[1] == y[1]) {
+        if (x[0] < y[0]) return -1;
+        if (x[0] == y[0]) return 0;
+        return 1;
+    }
+
+    return 1;
+}
+
 int SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out)
 {
        int retval = MPI_SUCCESS;
@@ -221,81 +248,76 @@ int SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out)
        index = smpi_host_index();
        rank  = comm->index_to_rank_map[index];
 
+    // default output
+    comm_out = NULL;
+
+    // root node does most of the real work
        if (0 == rank) {
-               int *colors = xbt_new(int, comm->size);
-               int *keys   = xbt_new(int, comm->size);
-               int i, j, k;
+               int colormap[comm->size];
+        int keymap[comm->size];
+        int rankkeymap[comm->size * 2];
+               int i, j;
                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 count;
                int indextmp;
 
-               colors[0] = color;
-               keys[0]   = key;
+               colormap[0] = color;
+        keymap[0]   = key;
 
-               // FIXME: not efficient
+               // FIXME: use scatter/gather or similar instead of individual comms
                for (i = 1; i < comm->size; i++) {
-                       retval = smpi_create_request(colorkey, 2, MPI_INT, MPI_ANY_SOURCE, rank, MPI_ANY_TAG, comm, &request);
+                       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];
+                       colormap[status.MPI_SOURCE] = colorkey[0];
+                       keymap[status.MPI_SOURCE]   = colorkey[1];
                        xbt_mallocator_release(smpi_global->request_mallocator, request);
                }
 
                for (i = 0; i < comm->size; i++) {
-                       if (-1 == colors[i]) {
+                       if (MPI_UNDEFINED == colormap[i]) {
                                continue;
                        }
-                       colortmp = colors[i];
-                       keycount = 0;
+
+            // make a list of nodes with current color and sort by keys
+                       count = 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;
-                                       }
+                               if(colormap[i] == colormap[j]) {
+                                       colormap[j] = MPI_UNDEFINED;
+                                       rankkeymap[count * 2]     = j;
+                                       rankkeymap[count * 2 + 1] = keymap[j];
+                                       count++;
                                }
                        }
+            qsort(rankkeymap, count, sizeof(int) * 2,
+                &smpi_compare_rankkeys);
+
+            // new communicator
                        tempcomm                    = xbt_new(s_smpi_mpi_communicator_t, 1);
                        tempcomm->barrier_count     = 0;
-                       tempcomm->size              = keycount;
+                       tempcomm->size              = count;
                        tempcomm->barrier_mutex     = SIMIX_mutex_init();
                        tempcomm->barrier_cond      = SIMIX_cond_init();
-                       tempcomm->rank_to_index_map = xbt_new(int, keycount);
+                       tempcomm->rank_to_index_map = xbt_new(int, count);
                        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]];
+                       for (j = 0; j < count; j++) {
+                               indextmp = comm->rank_to_index_map[rankkeymap[j*2]];
                                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);
+                       for (j = 0; j < count; j++) {
+                               if (rankkeymap[j*2]) {
+                                       retval = smpi_create_request(&j, 1, MPI_INT, 0,
+                        rankkeymap[j*2], 0, comm, &request);
                                        request->data = tempcomm;
                                        smpi_mpi_isend(request);
                                        smpi_mpi_wait(request, &status);
-                                       xbt_mallocator_release(smpi_global->request_mallocator, request);
+                                       xbt_mallocator_release(smpi_global->request_mallocator,
+                        request);
                                } else {
                                        *comm_out = tempcomm;
                                }
@@ -304,14 +326,18 @@ int SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out)
        } else {
                colorkey[0] = color;
                colorkey[1] = key;
-               retval = smpi_create_request(colorkey, 2, MPI_INT, rank, 0, 0, comm, &request);
+               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;
+        if (MPI_UNDEFINED != color) {
+                   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();