From: markls Date: Tue, 18 Sep 2007 10:20:23 +0000 (+0000) Subject: added very crufy hacked together broadcast and split. X-Git-Tag: v3.3~1149 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6fda275bbe43a5821e198bdaedbac2cd28049841 added very crufy hacked together broadcast and split. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4642 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index f10b8c2390..186deeb1ab 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -88,6 +88,7 @@ int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status); int MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request *request); int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm); +int MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm); int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out); // smpi functions diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c index 70f43ff715..8fdb8a12e2 100644 --- a/src/smpi/smpi_mpi.c +++ b/src/smpi/smpi_mpi.c @@ -1,3 +1,5 @@ +// FIXME: remove +#include #include "private.h" int MPI_Init(int *argc, char ***argv) @@ -182,7 +184,43 @@ int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_ return retval; } +// FIXME: overly simplistic +int MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) { + + int retval = MPI_SUCCESS; + int rank; + + smpi_bench_end(); + + rank = smpi_mpi_comm_rank(comm); + + if (rank == root) { + int i; + smpi_mpi_request_t *requests = xbt_new(smpi_mpi_request_t, comm->size - 1); + for (i = 1; i < comm->size; i++) { + retval = smpi_create_request(buf, count, datatype, root, (root + i) % comm->size, 0, comm, requests + i - 1); + smpi_mpi_isend(requests[i - 1]); + } + for (i = 0; i < comm->size - 1; i++) { + smpi_mpi_wait(requests[i], MPI_STATUS_IGNORE); + xbt_mallocator_release(smpi_global->request_mallocator, requests[i]); + } + xbt_free(requests); + } else { + smpi_mpi_request_t request; + retval = smpi_create_request(buf, count, datatype, root, 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 MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out) { int retval = MPI_SUCCESS; @@ -286,7 +324,7 @@ int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out) 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; + *comm_out = request->data; } smpi_bench_begin();