remove the file io_ompio_coll_offset. These routines were the predecessors of
the routines in io_ompio_coll_array. No need to keep both versions around. This commit was SVN r26766.
Этот коммит содержится в:
Edgar Gabriel
родитель
8ae22cacc1
Коммит
d18dad7109
@ -9,7 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008-2011 University of Houston. All rights reserved.
|
||||
# Copyright (c) 2008-2012 University of Houston. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -45,7 +45,6 @@ sources = \
|
||||
io_ompio.c \
|
||||
io_ompio_component.c \
|
||||
io_ompio_module.c \
|
||||
io_ompio_coll_offset.c \
|
||||
io_ompio_coll_array.c \
|
||||
io_ompio_file_set_view.c \
|
||||
io_ompio_file_open.c \
|
||||
|
||||
@ -311,65 +311,6 @@ OMPI_DECLSPEC int ompi_io_ompio_scatter_data (mca_io_ompio_file_t *fh,
|
||||
size_t stripe_size);
|
||||
|
||||
|
||||
/*
|
||||
* Modified versions of Collective operations
|
||||
* Based on root offsets
|
||||
*/
|
||||
OMPI_DECLSPEC int ompi_io_ompio_gatherv (void *sbuf,
|
||||
int scount,
|
||||
ompi_datatype_t *sdtype,
|
||||
void *rbuf,
|
||||
int *rcounts,
|
||||
int *disps,
|
||||
ompi_datatype_t *rdtype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
ompi_communicator_t *comm);
|
||||
OMPI_DECLSPEC int ompi_io_ompio_scatterv (void *sbuf,
|
||||
int *scounts,
|
||||
int *disps,
|
||||
ompi_datatype_t *sdtype,
|
||||
void *rbuf,
|
||||
int rcount,
|
||||
ompi_datatype_t *rdtype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
ompi_communicator_t *comm);
|
||||
OMPI_DECLSPEC int ompi_io_ompio_allgather (void *sbuf,
|
||||
int scount,
|
||||
ompi_datatype_t *sdtype,
|
||||
void *rbuf,
|
||||
int rcount,
|
||||
ompi_datatype_t *rdtype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
ompi_communicator_t *comm);
|
||||
OMPI_DECLSPEC int ompi_io_ompio_allgatherv (void *sbuf,
|
||||
int scount,
|
||||
ompi_datatype_t *sdtype,
|
||||
void *rbuf,
|
||||
int *rcounts,
|
||||
int *disps,
|
||||
ompi_datatype_t *rdtype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
ompi_communicator_t *comm);
|
||||
OMPI_DECLSPEC int ompi_io_ompio_gather (void *sbuf,
|
||||
int scount,
|
||||
ompi_datatype_t *sdtype,
|
||||
void *rbuf,
|
||||
int rcount,
|
||||
ompi_datatype_t *rdtype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
ompi_communicator_t *comm);
|
||||
OMPI_DECLSPEC int ompi_io_ompio_bcast (void *buff,
|
||||
int count,
|
||||
ompi_datatype_t *datatype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
ompi_communicator_t *comm);
|
||||
|
||||
/*
|
||||
* Modified versions of Collective operations
|
||||
* Based on an array of procs in group
|
||||
|
||||
@ -1,430 +0,0 @@
|
||||
/* -*- Mode: C; c-basic-offset:4 ; -*- */
|
||||
/*
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2007 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2008-2011 University of Houston. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
*
|
||||
* $HEADER$
|
||||
*/
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#include "ompi/runtime/params.h"
|
||||
#include "ompi/communicator/communicator.h"
|
||||
#include "ompi/mca/pml/pml.h"
|
||||
#include "opal/datatype/opal_datatype.h"
|
||||
#include "ompi/datatype/ompi_datatype.h"
|
||||
#include "ompi/request/request.h"
|
||||
|
||||
#include <math.h>
|
||||
#include "io_ompio.h"
|
||||
|
||||
|
||||
int ompi_io_ompio_allgatherv (void *sbuf,
|
||||
int scount,
|
||||
ompi_datatype_t *sdtype,
|
||||
void *rbuf,
|
||||
int *rcounts,
|
||||
int *disps,
|
||||
ompi_datatype_t *rdtype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
ompi_communicator_t *comm)
|
||||
{
|
||||
int err = OMPI_SUCCESS;
|
||||
OPAL_PTRDIFF_TYPE extent, lb;
|
||||
int i, rank;
|
||||
char *send_buf = NULL;
|
||||
struct ompi_datatype_t *newtype, *send_type;
|
||||
|
||||
rank = ompi_comm_rank (comm);
|
||||
|
||||
if (MPI_IN_PLACE == sbuf) {
|
||||
err = opal_datatype_get_extent (&rdtype->super, &lb, &extent);
|
||||
if (OMPI_SUCCESS != err) {
|
||||
return OMPI_ERROR;
|
||||
}
|
||||
send_type = rdtype;
|
||||
send_buf = (char*)rbuf;
|
||||
for (i = 0; i < rank%root_offset; ++i) {
|
||||
send_buf += (rcounts[i] * extent);
|
||||
}
|
||||
}
|
||||
else {
|
||||
send_buf = (char*)sbuf;
|
||||
send_type = sdtype;
|
||||
}
|
||||
|
||||
err = ompi_io_ompio_gatherv (send_buf,
|
||||
rcounts[rank%root_offset],
|
||||
send_type,
|
||||
rbuf,
|
||||
rcounts,
|
||||
disps,
|
||||
rdtype,
|
||||
root_offset,
|
||||
procs_per_group,
|
||||
comm);
|
||||
if (OMPI_SUCCESS != err) {
|
||||
return err;
|
||||
}
|
||||
|
||||
err = ompi_datatype_create_indexed (procs_per_group,
|
||||
rcounts,
|
||||
disps,
|
||||
rdtype,
|
||||
&newtype);
|
||||
if (MPI_SUCCESS != err) {
|
||||
return err;
|
||||
}
|
||||
err = ompi_datatype_commit (&newtype);
|
||||
if(MPI_SUCCESS != err) {
|
||||
return err;
|
||||
}
|
||||
|
||||
ompi_io_ompio_bcast (rbuf,
|
||||
1,
|
||||
newtype,
|
||||
root_offset,
|
||||
procs_per_group,
|
||||
comm);
|
||||
|
||||
ompi_datatype_destroy (&newtype);
|
||||
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
int ompi_io_ompio_gatherv (void *sbuf,
|
||||
int scount,
|
||||
ompi_datatype_t *sdtype,
|
||||
void *rbuf,
|
||||
int *rcounts,
|
||||
int *disps,
|
||||
ompi_datatype_t *rdtype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
struct ompi_communicator_t *comm)
|
||||
{
|
||||
int i, rank;
|
||||
int err = OMPI_SUCCESS;
|
||||
char *ptmp;
|
||||
OPAL_PTRDIFF_TYPE extent, lb;
|
||||
|
||||
rank = ompi_comm_rank (comm);
|
||||
|
||||
if (OMPIO_ROOT != rank%root_offset) {
|
||||
if (scount > 0) {
|
||||
return MCA_PML_CALL(send(sbuf,
|
||||
scount,
|
||||
sdtype,
|
||||
(rank/root_offset)*root_offset,
|
||||
OMPIO_TAG_GATHERV,
|
||||
MCA_PML_BASE_SEND_STANDARD,
|
||||
comm));
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
/* writer processes, loop receiving data from proceses
|
||||
belonging to each corresponding root */
|
||||
|
||||
err = opal_datatype_get_extent (&rdtype->super, &lb, &extent);
|
||||
if (OMPI_SUCCESS != err) {
|
||||
return OMPI_ERROR;
|
||||
}
|
||||
|
||||
for (i=rank ; i<procs_per_group+rank ; ++i) {
|
||||
ptmp = ((char *) rbuf) + (extent * disps[i%root_offset]);
|
||||
|
||||
if (i == rank) {
|
||||
if (MPI_IN_PLACE != sbuf &&
|
||||
(0 < scount) &&
|
||||
(0 < rcounts[i%root_offset])) {
|
||||
err = ompi_datatype_sndrcv (sbuf,
|
||||
scount,
|
||||
sdtype,
|
||||
ptmp,
|
||||
rcounts[i%root_offset],
|
||||
rdtype);
|
||||
}
|
||||
}
|
||||
else {
|
||||
/* Only receive if there is something to receive */
|
||||
if (rcounts[i%root_offset] > 0) {
|
||||
err = MCA_PML_CALL(recv(ptmp,
|
||||
rcounts[i%root_offset],
|
||||
rdtype,
|
||||
i,
|
||||
OMPIO_TAG_GATHERV,
|
||||
comm,
|
||||
MPI_STATUS_IGNORE));
|
||||
}
|
||||
}
|
||||
|
||||
if (OMPI_SUCCESS != err) {
|
||||
return err;
|
||||
}
|
||||
}
|
||||
/* All done */
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
int ompi_io_ompio_scatterv (void *sbuf,
|
||||
int *scounts,
|
||||
int *disps,
|
||||
ompi_datatype_t *sdtype,
|
||||
void *rbuf,
|
||||
int rcount,
|
||||
ompi_datatype_t *rdtype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
struct ompi_communicator_t *comm)
|
||||
{
|
||||
int i, rank;
|
||||
int err = OMPI_SUCCESS;
|
||||
char *ptmp;
|
||||
OPAL_PTRDIFF_TYPE extent, lb;
|
||||
|
||||
rank = ompi_comm_rank (comm);
|
||||
|
||||
if (OMPIO_ROOT != rank%root_offset) {
|
||||
if (rcount > 0) {
|
||||
err = MCA_PML_CALL(recv(rbuf,
|
||||
rcount,
|
||||
rdtype,
|
||||
(rank/root_offset)*root_offset,
|
||||
OMPIO_TAG_SCATTERV,
|
||||
comm,
|
||||
MPI_STATUS_IGNORE));
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
/* writer processes, loop receiving data from proceses
|
||||
belonging to each corresponding root */
|
||||
|
||||
err = opal_datatype_get_extent (&sdtype->super, &lb, &extent);
|
||||
if (OMPI_SUCCESS != err) {
|
||||
return OMPI_ERROR;
|
||||
}
|
||||
|
||||
for (i=rank ; i<procs_per_group+rank ; ++i) {
|
||||
ptmp = ((char *) sbuf) + (extent * disps[i%root_offset]);
|
||||
|
||||
if (i == rank) {
|
||||
if (MPI_IN_PLACE != sbuf &&
|
||||
(0 < scounts[i%root_offset]) &&
|
||||
(0 < rcount)) {
|
||||
err = ompi_datatype_sndrcv (ptmp,
|
||||
scounts[i%root_offset],
|
||||
sdtype,
|
||||
rbuf,
|
||||
rcount,
|
||||
rdtype);
|
||||
}
|
||||
}
|
||||
else {
|
||||
/* Only receive if there is something to receive */
|
||||
if (scounts[i%root_offset] > 0) {
|
||||
err = MCA_PML_CALL(send(ptmp,
|
||||
scounts[i%root_offset],
|
||||
sdtype,
|
||||
i,
|
||||
OMPIO_TAG_SCATTERV,
|
||||
MCA_PML_BASE_SEND_STANDARD,
|
||||
comm));
|
||||
}
|
||||
}
|
||||
if (OMPI_SUCCESS != err) {
|
||||
return err;
|
||||
}
|
||||
}
|
||||
/* All done */
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
int ompi_io_ompio_allgather (void *sbuf,
|
||||
int scount,
|
||||
ompi_datatype_t *sdtype,
|
||||
void *rbuf,
|
||||
int rcount,
|
||||
ompi_datatype_t *rdtype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
ompi_communicator_t *comm)
|
||||
{
|
||||
int err = OMPI_SUCCESS;
|
||||
int rank;
|
||||
OPAL_PTRDIFF_TYPE extent, lb;
|
||||
|
||||
rank = ompi_comm_rank (comm);
|
||||
|
||||
if (((void *) 1) == sbuf && 0 != rank) {
|
||||
err = opal_datatype_get_extent (&rdtype->super, &lb, &extent);
|
||||
if (OMPI_SUCCESS != err) {
|
||||
return OMPI_ERROR;
|
||||
}
|
||||
sbuf = ((char*) rbuf) + (rank * extent * rcount);
|
||||
sdtype = rdtype;
|
||||
scount = rcount;
|
||||
}
|
||||
|
||||
/* Gather and broadcast. */
|
||||
err = ompi_io_ompio_gather (sbuf,
|
||||
scount,
|
||||
sdtype,
|
||||
rbuf,
|
||||
rcount,
|
||||
rdtype,
|
||||
root_offset,
|
||||
procs_per_group,
|
||||
comm);
|
||||
|
||||
if (OMPI_SUCCESS == err) {
|
||||
err = ompi_io_ompio_bcast (rbuf,
|
||||
rcount * procs_per_group,
|
||||
rdtype,
|
||||
root_offset,
|
||||
procs_per_group,
|
||||
comm);
|
||||
}
|
||||
/* All done */
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
int ompi_io_ompio_gather (void *sbuf,
|
||||
int scount,
|
||||
ompi_datatype_t *sdtype,
|
||||
void *rbuf,
|
||||
int rcount,
|
||||
ompi_datatype_t *rdtype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
struct ompi_communicator_t *comm)
|
||||
{
|
||||
int i;
|
||||
int rank;
|
||||
char *ptmp;
|
||||
OPAL_PTRDIFF_TYPE incr;
|
||||
OPAL_PTRDIFF_TYPE extent, lb;
|
||||
int err = OMPI_SUCCESS;
|
||||
|
||||
rank = ompi_comm_rank (comm);
|
||||
|
||||
/* Everyone but the writers sends data and returns. */
|
||||
if (OMPIO_ROOT != rank%root_offset) {
|
||||
err = MCA_PML_CALL(send(sbuf,
|
||||
scount,
|
||||
sdtype,
|
||||
(rank/root_offset)*root_offset,
|
||||
OMPIO_TAG_GATHER,
|
||||
MCA_PML_BASE_SEND_STANDARD,
|
||||
comm));
|
||||
return err;
|
||||
}
|
||||
|
||||
/* writers, loop receiving the data. */
|
||||
opal_datatype_get_extent (&rdtype->super, &lb, &extent);
|
||||
incr = extent * rcount;
|
||||
|
||||
for (i = rank, ptmp = (char *) rbuf;
|
||||
i < procs_per_group+rank;
|
||||
++i, ptmp += incr) {
|
||||
if (i == rank) {
|
||||
if (MPI_IN_PLACE != sbuf) {
|
||||
err = ompi_datatype_sndrcv (sbuf,
|
||||
scount,
|
||||
sdtype ,
|
||||
ptmp,
|
||||
rcount,
|
||||
rdtype);
|
||||
}
|
||||
else {
|
||||
err = OMPI_SUCCESS;
|
||||
}
|
||||
}
|
||||
else {
|
||||
err = MCA_PML_CALL(recv(ptmp,
|
||||
rcount,
|
||||
rdtype,
|
||||
i,
|
||||
OMPIO_TAG_GATHER,
|
||||
comm,
|
||||
MPI_STATUS_IGNORE));
|
||||
/*
|
||||
for (k=0 ; k<4 ; k++)
|
||||
printf ("RECV %p %d \n",
|
||||
((struct iovec *)ptmp)[k].iov_base,
|
||||
((struct iovec *)ptmp)[k].iov_len);
|
||||
*/
|
||||
}
|
||||
|
||||
if (OMPI_SUCCESS != err) {
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
/* All done */
|
||||
|
||||
return err;
|
||||
}
|
||||
int ompi_io_ompio_bcast (void *buff,
|
||||
int count,
|
||||
ompi_datatype_t *datatype,
|
||||
int root_offset,
|
||||
int procs_per_group,
|
||||
ompi_communicator_t *comm)
|
||||
{
|
||||
int i, rank;
|
||||
int err = OMPI_SUCCESS;
|
||||
|
||||
rank = ompi_comm_rank (comm);
|
||||
|
||||
/* Non-writers receive the data. */
|
||||
if (OMPIO_ROOT != rank%root_offset) {
|
||||
err = MCA_PML_CALL(recv(buff,
|
||||
count,
|
||||
datatype,
|
||||
(rank/root_offset)*root_offset,
|
||||
OMPIO_TAG_BCAST,
|
||||
comm,
|
||||
MPI_STATUS_IGNORE));
|
||||
return err;
|
||||
}
|
||||
|
||||
/* Writers sends data to all others. */
|
||||
|
||||
for (i=rank ; i<procs_per_group+rank ; ++i) {
|
||||
if (i == rank) {
|
||||
continue;
|
||||
}
|
||||
|
||||
err = MCA_PML_CALL(send(buff,
|
||||
count,
|
||||
datatype,
|
||||
i,
|
||||
OMPIO_TAG_BCAST,
|
||||
MCA_PML_BASE_SEND_STANDARD,
|
||||
comm));
|
||||
if (OMPI_SUCCESS != err) {
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user