X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e10bd21dc31e83417de6984b8790e7a147aaa7b5..059afc351bbd60776422b07a243b4b48a03aab3c:/src/smpi/colls/smpi_mvapich2_selector.cpp diff --git a/src/smpi/colls/smpi_mvapich2_selector.cpp b/src/smpi/colls/smpi_mvapich2_selector.cpp index 9ecb998b2b..bc6c2c596d 100644 --- a/src/smpi/colls/smpi_mvapich2_selector.cpp +++ b/src/smpi/colls/smpi_mvapich2_selector.cpp @@ -14,7 +14,7 @@ namespace simgrid{ namespace smpi{ -int Coll_alltoall_mvapich2::alltoall( void *sendbuf, int sendcount, +int Coll_alltoall_mvapich2::alltoall( const void *sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, @@ -25,7 +25,6 @@ int Coll_alltoall_mvapich2::alltoall( void *sendbuf, int sendcount, init_mv2_alltoall_tables_stampede(); int sendtype_size, recvtype_size, comm_size; - char * tmp_buf = NULL; int mpi_errno=MPI_SUCCESS; int range = 0; int range_threshold = 0; @@ -63,16 +62,11 @@ int Coll_alltoall_mvapich2::alltoall( void *sendbuf, int sendcount, mv2_alltoall_thresholds_table[conf_index][range].in_place_algo_table[range_threshold].min ||nbytes > mv2_alltoall_thresholds_table[conf_index][range].in_place_algo_table[range_threshold].max ) { - tmp_buf = (char *)smpi_get_tmp_sendbuffer( comm_size * recvcount * recvtype_size ); - Datatype::copy((char *)recvbuf, - comm_size*recvcount, recvtype, - (char *)tmp_buf, - comm_size*recvcount, recvtype); + unsigned char* tmp_buf = smpi_get_tmp_sendbuffer(comm_size * recvcount * recvtype_size); + Datatype::copy(recvbuf, comm_size * recvcount, recvtype, tmp_buf, comm_size * recvcount, recvtype); - mpi_errno = MV2_Alltoall_function(tmp_buf, recvcount, recvtype, - recvbuf, recvcount, recvtype, - comm ); - smpi_free_tmp_buffer(tmp_buf); + mpi_errno = MV2_Alltoall_function(tmp_buf, recvcount, recvtype, recvbuf, recvcount, recvtype, comm); + smpi_free_tmp_buffer(tmp_buf); } else { mpi_errno = MPIR_Alltoall_inplace_MV2(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, @@ -84,7 +78,7 @@ int Coll_alltoall_mvapich2::alltoall( void *sendbuf, int sendcount, return (mpi_errno); } -int Coll_allgather_mvapich2::allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, +int Coll_allgather_mvapich2::allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) { @@ -185,7 +179,7 @@ int Coll_allgather_mvapich2::allgather(void *sendbuf, int sendcount, MPI_Datatyp return mpi_errno; } -int Coll_gather_mvapich2::gather(void *sendbuf, +int Coll_gather_mvapich2::gather(const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, @@ -201,18 +195,15 @@ int Coll_gather_mvapich2::gather(void *sendbuf, int range_threshold = 0; int range_intra_threshold = 0; long nbytes = 0; - int comm_size = 0; - int recvtype_size, sendtype_size; - int rank = -1; - comm_size = comm->size(); - rank = comm->rank(); + int comm_size = comm->size(); + int rank = comm->rank(); if (rank == root) { - recvtype_size=recvtype->size(); - nbytes = recvcnt * recvtype_size; + int recvtype_size = recvtype->size(); + nbytes = recvcnt * recvtype_size; } else { - sendtype_size=sendtype->size(); - nbytes = sendcnt * sendtype_size; + int sendtype_size = sendtype->size(); + nbytes = sendcnt * sendtype_size; } /* Search for the corresponding system size inside the tuning table */ @@ -262,8 +253,8 @@ int Coll_gather_mvapich2::gather(void *sendbuf, return mpi_errno; } -int Coll_allgatherv_mvapich2::allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int *recvcounts, int *displs, +int Coll_allgatherv_mvapich2::allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPI_Comm comm ) { int mpi_errno = MPI_SUCCESS; @@ -324,7 +315,7 @@ int Coll_allgatherv_mvapich2::allgatherv(void *sendbuf, int sendcount, MPI_Datat -int Coll_allreduce_mvapich2::allreduce(void *sendbuf, +int Coll_allreduce_mvapich2::allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, @@ -356,8 +347,7 @@ int Coll_allreduce_mvapich2::allreduce(void *sendbuf, nbytes = count * sendtype_size; datatype->extent(&true_lb, &true_extent); - //MPI_Op *op_ptr; - //is_commutative = op->is_commutative(); + is_commutative = op->is_commutative(); { int range = 0, range_threshold = 0, range_threshold_intra = 0; @@ -444,9 +434,9 @@ int Coll_allreduce_mvapich2::allreduce(void *sendbuf, } -int Coll_alltoallv_mvapich2::alltoallv(void *sbuf, int *scounts, int *sdisps, +int Coll_alltoallv_mvapich2::alltoallv(const void *sbuf, const int *scounts, const int *sdisps, MPI_Datatype sdtype, - void *rbuf, int *rcounts, int *rdisps, + void *rbuf, const int *rcounts, const int *rdisps, MPI_Datatype rdtype, MPI_Comm comm ) @@ -483,10 +473,10 @@ int Coll_bcast_mvapich2::bcast(void *buffer, int range = 0; int range_threshold = 0; int range_threshold_intra = 0; - int is_homogeneous, is_contig; + // int is_homogeneous, is_contig; MPI_Aint type_size; //, position; - void *tmp_buf = NULL; + // unsigned char *tmp_buf = NULL; MPI_Comm shmem_comm; //MPID_Datatype *dtp; @@ -500,7 +490,7 @@ int Coll_bcast_mvapich2::bcast(void *buffer, comm_size = comm->size(); //rank = comm->rank(); - is_contig=1; + //is_contig=1; /* if (HANDLE_GET_KIND(datatype) == HANDLE_KIND_BUILTIN)*/ /* is_contig = 1;*/ /* else {*/ @@ -508,7 +498,7 @@ int Coll_bcast_mvapich2::bcast(void *buffer, /* is_contig = dtp->is_contig;*/ /* }*/ - is_homogeneous = 1; + // is_homogeneous = 1; /* MPI_Type_size() might not give the accurate size of the packed * datatype for heterogeneous systems (because of padding, encoding, @@ -596,48 +586,48 @@ int Coll_bcast_mvapich2::bcast(void *buffer, mv2_bcast_thresholds_table[range].is_two_level_bcast[range_threshold]; #endif if (two_level_bcast == 1) { - if (not is_contig || not is_homogeneous) { - tmp_buf = (void*)smpi_get_tmp_sendbuffer(nbytes); - - /* position = 0;*/ - /* if (rank == root) {*/ - /* mpi_errno =*/ - /* MPIR_Pack_impl(buffer, count, datatype, tmp_buf, nbytes, &position);*/ - /* if (mpi_errno)*/ - /* MPIU_ERR_POP(mpi_errno);*/ - /* }*/ - } + // if (not is_contig || not is_homogeneous) { +// tmp_buf = smpi_get_tmp_sendbuffer(nbytes); + +/* position = 0;*/ +/* if (rank == root) {*/ +/* mpi_errno =*/ +/* MPIR_Pack_impl(buffer, count, datatype, tmp_buf, nbytes, &position);*/ +/* if (mpi_errno)*/ +/* MPIU_ERR_POP(mpi_errno);*/ +/* }*/ +// } #ifdef CHANNEL_MRAIL_GEN2 if ((mv2_enable_zcpy_bcast == 1) && (&MPIR_Pipelined_Bcast_Zcpy_MV2 == MV2_Bcast_function)) { - if (not is_contig || not is_homogeneous) { - mpi_errno = MPIR_Pipelined_Bcast_Zcpy_MV2(tmp_buf, nbytes, MPI_BYTE, root, comm); - } else { + // if (not is_contig || not is_homogeneous) { + // mpi_errno = MPIR_Pipelined_Bcast_Zcpy_MV2(tmp_buf, nbytes, MPI_BYTE, root, comm); + // } else { mpi_errno = MPIR_Pipelined_Bcast_Zcpy_MV2(buffer, count, datatype, root, comm); - } + // } } else #endif /* defined(CHANNEL_MRAIL_GEN2) */ { shmem_comm = comm->get_intra_comm(); - if (not is_contig || not is_homogeneous) { - MPIR_Bcast_tune_inter_node_helper_MV2(tmp_buf, nbytes, MPI_BYTE, root, comm); - } else { + // if (not is_contig || not is_homogeneous) { + // MPIR_Bcast_tune_inter_node_helper_MV2(tmp_buf, nbytes, MPI_BYTE, root, comm); + // } else { MPIR_Bcast_tune_inter_node_helper_MV2(buffer, count, datatype, root, comm); - } + // } /* We are now done with the inter-node phase */ root = INTRA_NODE_ROOT; - if (not is_contig || not is_homogeneous) { - mpi_errno = MV2_Bcast_intra_node_function(tmp_buf, nbytes, MPI_BYTE, root, shmem_comm); - } else { + // if (not is_contig || not is_homogeneous) { + // mpi_errno = MV2_Bcast_intra_node_function(tmp_buf, nbytes, MPI_BYTE, root, shmem_comm); + // } else { mpi_errno = MV2_Bcast_intra_node_function(buffer, count, datatype, root, shmem_comm); - } + // } } /* if (not is_contig || not is_homogeneous) {*/ /* if (rank != root) {*/ @@ -666,7 +656,7 @@ int Coll_bcast_mvapich2::bcast(void *buffer, -int Coll_reduce_mvapich2::reduce( void *sendbuf, +int Coll_reduce_mvapich2::reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, @@ -784,7 +774,7 @@ int Coll_reduce_mvapich2::reduce( void *sendbuf, } -int Coll_reduce_scatter_mvapich2::reduce_scatter(void *sendbuf, void *recvbuf, int *recvcnts, +int Coll_reduce_scatter_mvapich2::reduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { @@ -859,7 +849,7 @@ int Coll_reduce_scatter_mvapich2::reduce_scatter(void *sendbuf, void *recvbuf, i -int Coll_scatter_mvapich2::scatter(void *sendbuf, +int Coll_scatter_mvapich2::scatter(const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, @@ -898,12 +888,12 @@ int Coll_scatter_mvapich2::scatter(void *sendbuf, if (comm->is_uniform()) { shmem_comm = comm->get_intra_comm(); - int local_size = shmem_comm->size(); - int i = 0; if (mv2_scatter_table_ppn_conf[0] == -1) { // Indicating user defined tuning conf_index = 0; }else{ + int local_size = shmem_comm->size(); + int i = 0; do { if (local_size == mv2_scatter_table_ppn_conf[i]) { conf_index = i;