X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a16415ffeee5802d0ed9ea0bf25910eace0aa832..0afab0e550e09d35a4aaaae802c7f2ea17d2b860:/src/smpi/smpi_base.c diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c index a00a4e0f4e..1387109e0e 100644 --- a/src/smpi/smpi_base.c +++ b/src/smpi/smpi_base.c @@ -2,7 +2,7 @@ * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" #include "xbt/time.h" @@ -11,18 +11,19 @@ #include #include "surf/surf.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, - "Logging specific to SMPI (base)"); + +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)"); + static int match_recv(void* a, void* b, smx_action_t ignored) { MPI_Request ref = (MPI_Request)a; MPI_Request req = (MPI_Request)b; XBT_DEBUG("Trying to match a recv of src %d against %d, tag %d against %d",ref->src,req->src, ref->tag, req->tag); - xbt_assert(ref, "Cannot match recv against null reference"); - xbt_assert(req, "Cannot match recv against null request"); - return (ref->src == MPI_ANY_SOURCE || req->src == ref->src) - && (ref->tag == MPI_ANY_TAG || req->tag == ref->tag); + xbt_assert(ref, "Cannot match recv against null reference"); + xbt_assert(req, "Cannot match recv against null request"); + return (ref->src == MPI_ANY_SOURCE || req->src == ref->src) + && (ref->tag == MPI_ANY_TAG || req->tag == ref->tag); } static int match_send(void* a, void* b,smx_action_t ignored) { @@ -41,9 +42,27 @@ static MPI_Request build_request(void *buf, int count, { MPI_Request request; + void *old_buf; + request = xbt_new(s_smpi_mpi_request_t, 1); + + s_smpi_subtype_t *subtype = datatype->substruct; + + if(datatype->has_subtype == 1){ + // This part handles the problem of non-contignous memory + old_buf = buf; + buf = malloc(count*smpi_datatype_size(datatype)); + if (flags & SEND) { + subtype->serialize(old_buf, buf, count, datatype->substruct); + } + } + request->buf = buf; - // FIXME: this will have to be changed to support non-contiguous datatypes + // This part handles the problem of non-contignous memory (for the + // unserialisation at the reception) + request->old_buf = old_buf; + request->old_type = datatype; + request->size = smpi_datatype_size(datatype) * count; request->src = src; request->dst = dst; @@ -77,12 +96,12 @@ void smpi_action_trace_run(char *path) if (path) { action_fp = fopen(path, "r"); xbt_assert(action_fp != NULL, "Cannot open %s: %s", path, - strerror(errno)); + strerror(errno)); } if (!xbt_dict_is_empty(action_queues)) { XBT_WARN - ("Not all actions got consumed. If the simulation ended successfully (without deadlock), you may want to add new processes to your deployment file."); + ("Not all actions got consumed. If the simulation ended successfully (without deadlock), you may want to add new processes to your deployment file."); xbt_dict_foreach(action_queues, cursor, name, todo) { @@ -107,8 +126,8 @@ MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, - comm, PERSISTENT | SEND); + build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + comm, PERSISTENT | SEND); return request; } @@ -117,8 +136,8 @@ MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, src, smpi_comm_rank(comm), tag, - comm, PERSISTENT | RECV); + build_request(buf, count, datatype, src, smpi_comm_rank(comm), tag, + comm, PERSISTENT | RECV); return request; } @@ -129,13 +148,13 @@ void smpi_mpi_start(MPI_Request request) int detached = 0; xbt_assert(!request->action, - "Cannot (re)start a non-finished communication"); + "Cannot (re)start a non-finished communication"); if(request->flags & RECV) { print_request("New recv", request); if (request->size < xbt_cfg_get_int(_surf_cfg_set, "smpi/async_small_thres")) - mailbox = smpi_process_mailbox_small(); + mailbox = smpi_process_mailbox_small(); else - mailbox = smpi_process_mailbox(); + mailbox = smpi_process_mailbox(); // FIXME: SIMIX does not yet support non-contiguous datatypes request->action = simcall_comm_irecv(mailbox, request->buf, &request->size, &match_recv, request); @@ -143,11 +162,11 @@ void smpi_mpi_start(MPI_Request request) print_request("New send", request); if (request->size < xbt_cfg_get_int(_surf_cfg_set, "smpi/async_small_thres")) { // eager mode mailbox = smpi_process_remote_mailbox_small( - smpi_group_index(smpi_comm_group(request->comm), request->dst)); + smpi_group_index(smpi_comm_group(request->comm), request->dst)); }else{ XBT_DEBUG("Send request %p is not in the permanent receive mailbox (buf: %p)",request,request->buf); mailbox = smpi_process_remote_mailbox( - smpi_group_index(smpi_comm_group(request->comm), request->dst)); + smpi_group_index(smpi_comm_group(request->comm), request->dst)); } if (request->size < 64*1024 ) { //(FIXME: this limit should be configurable) void *oldbuf = request->buf; @@ -158,28 +177,28 @@ void smpi_mpi_start(MPI_Request request) XBT_DEBUG("Send request %p is detached; buf %p copied into %p",request,oldbuf,request->buf); } - request->action = + request->action = simcall_comm_isend(mailbox, request->size, -1.0, - request->buf, request->size, - &match_send, - &smpi_mpi_request_free_voidp, // how to free the userdata if a detached send fails - request, - // detach if msg size < eager/rdv switch limit - detached); - - #ifdef HAVE_TRACING - /* FIXME: detached sends are not traceable (request->action == NULL) */ - if (request->action) - simcall_set_category(request->action, TRACE_internal_smpi_get_category()); - #endif + request->buf, request->size, + &match_send, + &smpi_mpi_request_free_voidp, // how to free the userdata if a detached send fails + request, + // detach if msg size < eager/rdv switch limit + detached); - } +#ifdef HAVE_TRACING + /* FIXME: detached sends are not traceable (request->action == NULL) */ + if (request->action) + simcall_set_category(request->action, TRACE_internal_smpi_get_category()); +#endif + + } } void smpi_mpi_startall(int count, MPI_Request * requests) { - int i; + int i; for(i = 0; i < count; i++) { smpi_mpi_start(requests[i]); @@ -196,8 +215,8 @@ MPI_Request smpi_isend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, - comm, NON_PERSISTENT | SEND); + build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + comm, NON_PERSISTENT | SEND); return request; } @@ -206,7 +225,7 @@ MPI_Request smpi_mpi_isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = - smpi_isend_init(buf, count, datatype, dst, tag, comm); + smpi_isend_init(buf, count, datatype, dst, tag, comm); smpi_mpi_start(request); return request; @@ -216,9 +235,8 @@ MPI_Request smpi_irecv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, src, smpi_comm_rank(comm), tag, - comm, NON_PERSISTENT | RECV); - + build_request(buf, count, datatype, src, smpi_comm_rank(comm), tag, + comm, NON_PERSISTENT | RECV); return request; } @@ -226,7 +244,7 @@ MPI_Request smpi_mpi_irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { MPI_Request request = - smpi_irecv_init(buf, count, datatype, src, tag, comm); + smpi_irecv_init(buf, count, datatype, src, tag, comm); smpi_mpi_start(request); return request; @@ -236,7 +254,6 @@ void smpi_mpi_recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status * status) { MPI_Request request; - request = smpi_mpi_irecv(buf, count, datatype, src, tag, comm); smpi_mpi_wait(&request, status); } @@ -246,9 +263,10 @@ void smpi_mpi_recv(void *buf, int count, MPI_Datatype datatype, int src, void smpi_mpi_send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - MPI_Request request; - request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm); - smpi_mpi_wait(&request, MPI_STATUS_IGNORE); + MPI_Request request; + + request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm); + smpi_mpi_wait(&request, MPI_STATUS_IGNORE); } void smpi_mpi_sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, @@ -260,9 +278,9 @@ void smpi_mpi_sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, MPI_Status stats[2]; requests[0] = - smpi_isend_init(sendbuf, sendcount, sendtype, dst, sendtag, comm); + smpi_isend_init(sendbuf, sendcount, sendtype, dst, sendtag, comm); requests[1] = - smpi_irecv_init(recvbuf, recvcount, recvtype, src, recvtag, comm); + smpi_irecv_init(recvbuf, recvcount, recvtype, src, recvtag, comm); smpi_mpi_startall(2, requests); smpi_mpi_waitall(2, requests, stats); if(status != MPI_STATUS_IGNORE) { @@ -281,7 +299,7 @@ static void finish_wait(MPI_Request * request, MPI_Status * status) MPI_Request req = *request; // if we have a sender, we should use its data, and not the data from the receive if((req->action)&& - (req->src==MPI_ANY_SOURCE || req->tag== MPI_ANY_TAG)) + (req->src==MPI_ANY_SOURCE || req->tag== MPI_ANY_TAG)) req = (MPI_Request)SIMIX_comm_get_src_data((*request)->action); if(status != MPI_STATUS_IGNORE) { @@ -295,6 +313,19 @@ static void finish_wait(MPI_Request * request, MPI_Status * status) req = *request; print_request("Finishing", req); + MPI_Datatype datatype = req->old_type; + if(datatype->has_subtype == 1){ + // This part handles the problem of non-contignous memory + // the unserialization at the reception + s_smpi_subtype_t *subtype = datatype->substruct; + if(req->flags & RECV) { + subtype->unserialize(req->buf, req->old_buf, req->size/smpi_datatype_size(datatype) , datatype->substruct); + } + //FIXME: I am not sure that if the send is detached we have to free + //the sender buffer thus I do it only for the reciever + if(req->flags & RECV) free(req->buf); + } + if(req->flags & NON_PERSISTENT) { smpi_mpi_request_free(request); } else { @@ -304,6 +335,7 @@ static void finish_wait(MPI_Request * request, MPI_Status * status) int smpi_mpi_test(MPI_Request * request, MPI_Status * status) { int flag; + //assume that request is not MPI_REQUEST_NULL (filtered in PMPI_Test or smpi_mpi_testall before) if ((*request)->action == NULL) flag = 1; @@ -596,15 +628,15 @@ void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, // FIXME: check for errors smpi_datatype_extent(recvtype, &lb, &recvext); // Local copy from root - smpi_datatype_copy(sendbuf, sendcount, sendtype, - (char *)recvbuf + root * recvcount * recvext, recvcount, recvtype); + smpi_datatype_copy(sendbuf, sendcount, sendtype, + (char *)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 * recvext, - recvcount, recvtype, + requests[index] = smpi_irecv_init((char *)recvbuf + src * recvcount * recvext, + recvcount, recvtype, src, system_tag, comm); index++; } @@ -634,8 +666,8 @@ void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, // FIXME: check for errors smpi_datatype_extent(recvtype, &lb, &recvext); // Local copy from root - smpi_datatype_copy(sendbuf, sendcount, sendtype, - (char *)recvbuf + displs[root] * recvext, + smpi_datatype_copy(sendbuf, sendcount, sendtype, + (char *)recvbuf + displs[root] * recvext, recvcounts[root], recvtype); // Receive buffers from senders requests = xbt_new(MPI_Request, size - 1); @@ -643,8 +675,8 @@ 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] * recvext, - recvcounts[src], recvtype, src, system_tag, comm); + smpi_irecv_init((char *)recvbuf + displs[src] * recvext, + recvcounts[src], recvtype, src, system_tag, comm); index++; } } @@ -670,8 +702,8 @@ void smpi_mpi_allgather(void *sendbuf, int sendcount, // FIXME: check for errors smpi_datatype_extent(recvtype, &lb, &recvext); // Local copy from self - smpi_datatype_copy(sendbuf, sendcount, sendtype, - (char *)recvbuf + rank * recvcount * recvext, recvcount, + smpi_datatype_copy(sendbuf, sendcount, sendtype, + (char *)recvbuf + rank * recvcount * recvext, recvcount, recvtype); // Send/Recv buffers to/from others; requests = xbt_new(MPI_Request, 2 * (size - 1)); @@ -679,11 +711,11 @@ void smpi_mpi_allgather(void *sendbuf, int sendcount, for(other = 0; other < size; other++) { if(other != rank) { requests[index] = - smpi_isend_init(sendbuf, sendcount, sendtype, other, system_tag, - comm); + smpi_isend_init(sendbuf, sendcount, sendtype, other, system_tag, + comm); index++; - requests[index] = smpi_irecv_init((char *)recvbuf + other * recvcount * recvext, - recvcount, recvtype, other, + requests[index] = smpi_irecv_init((char *)recvbuf + other * recvcount * recvext, + recvcount, recvtype, other, system_tag, comm); index++; } @@ -709,8 +741,8 @@ void smpi_mpi_allgatherv(void *sendbuf, int sendcount, // FIXME: check for errors smpi_datatype_extent(recvtype, &lb, &recvext); // Local copy from self - smpi_datatype_copy(sendbuf, sendcount, sendtype, - (char *)recvbuf + displs[rank] * recvext, + smpi_datatype_copy(sendbuf, sendcount, sendtype, + (char *)recvbuf + displs[rank] * recvext, recvcounts[rank], recvtype); // Send buffers to others; requests = xbt_new(MPI_Request, 2 * (size - 1)); @@ -718,12 +750,12 @@ void smpi_mpi_allgatherv(void *sendbuf, int sendcount, for(other = 0; other < size; other++) { if(other != rank) { requests[index] = - smpi_isend_init(sendbuf, sendcount, sendtype, other, system_tag, - comm); + smpi_isend_init(sendbuf, sendcount, sendtype, other, system_tag, + comm); index++; requests[index] = - smpi_irecv_init((char *)recvbuf + displs[other] * recvext, recvcounts[other], - recvtype, other, system_tag, comm); + smpi_irecv_init((char *)recvbuf + displs[other] * recvext, recvcounts[other], + recvtype, other, system_tag, comm); index++; } } @@ -753,13 +785,13 @@ void smpi_mpi_scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, smpi_datatype_extent(sendtype, &lb, &sendext); // Local copy from root smpi_datatype_copy((char *)sendbuf + root * sendcount * sendext, - sendcount, sendtype, recvbuf, recvcount, recvtype); + 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 * sendext, + requests[index] = smpi_isend_init((char *)sendbuf + dst * sendcount * sendext, sendcount, sendtype, dst, system_tag, comm); index++; @@ -791,7 +823,7 @@ void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs, // FIXME: check for errors smpi_datatype_extent(sendtype, &lb, &sendext); // Local copy from root - smpi_datatype_copy((char *)sendbuf + displs[root] * sendext, sendcounts[root], + smpi_datatype_copy((char *)sendbuf + displs[root] * sendext, sendcounts[root], sendtype, recvbuf, recvcount, recvtype); // Send buffers to receivers requests = xbt_new(MPI_Request, size - 1); @@ -799,8 +831,8 @@ 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] * sendext, sendcounts[dst], - sendtype, dst, system_tag, comm); + smpi_isend_init((char *)sendbuf + displs[dst] * sendext, sendcounts[dst], + sendtype, dst, system_tag, comm); index++; } } @@ -843,8 +875,8 @@ void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count, // mapping... tmpbufs[index] = xbt_malloc(count * dataext); requests[index] = - smpi_irecv_init(tmpbufs[index], count, datatype, src, - system_tag, comm); + smpi_irecv_init(tmpbufs[index], count, datatype, src, + system_tag, comm); index++; } } @@ -897,17 +929,17 @@ void smpi_mpi_scan(void *sendbuf, void *recvbuf, int count, tmpbufs = xbt_new(void *, rank); index = 0; for(other = 0; other < rank; other++) { - // FIXME: possibly overkill we we have contiguous/noncontiguous data + // 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); + smpi_irecv_init(tmpbufs[index], count, datatype, other, system_tag, + comm); index++; } for(other = rank + 1; other < size; other++) { requests[index] = - smpi_isend_init(sendbuf, count, datatype, other, system_tag, comm); + smpi_isend_init(sendbuf, count, datatype, other, system_tag, comm); index++; } // Wait for completion of all comms.