Update collectives selection logic to allow for multiple components to be
used at nce (up to one unique collective module per collective function). Matches r15795:15921 of the tmp/bwb-coll-select branch This commit was SVN r15924. The following SVN revisions from the original message are invalid or inconsistent and therefore were not cross-referenced: r15795 r15921
Этот коммит содержится в:
Brian Barrett
@ -28,104 +28,6 @@
|
||||
#include "coll_basic.h"
|
||||
|
||||
|
||||
/*
|
||||
* Linear set of collective algorithms
|
||||
*/
|
||||
static const mca_coll_base_module_1_0_0_t intra_linear = {
|
||||
|
||||
/* Initialization / finalization functions */
|
||||
|
||||
mca_coll_basic_module_init,
|
||||
mca_coll_basic_module_finalize,
|
||||
|
||||
/* Collective function pointers */
|
||||
|
||||
mca_coll_basic_allgather_intra,
|
||||
mca_coll_basic_allgatherv_intra,
|
||||
mca_coll_basic_allreduce_intra,
|
||||
mca_coll_basic_alltoall_intra,
|
||||
mca_coll_basic_alltoallv_intra,
|
||||
mca_coll_basic_alltoallw_intra,
|
||||
mca_coll_basic_barrier_intra_lin,
|
||||
mca_coll_basic_bcast_lin_intra,
|
||||
mca_coll_basic_exscan_intra,
|
||||
mca_coll_basic_gather_intra,
|
||||
mca_coll_basic_gatherv_intra,
|
||||
mca_coll_basic_reduce_lin_intra,
|
||||
mca_coll_basic_reduce_scatter_intra,
|
||||
mca_coll_basic_scan_intra,
|
||||
mca_coll_basic_scatter_intra,
|
||||
mca_coll_basic_scatterv_intra,
|
||||
mca_coll_basic_ft_event
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Lograthmic set of collective algorithms. Note that not all
|
||||
* collectives have lograthmic algorithms. For example, scan will use
|
||||
* the same algorithm as in the linear set.
|
||||
*/
|
||||
static const mca_coll_base_module_1_0_0_t intra_log = {
|
||||
|
||||
/* Initialization / finalization functions */
|
||||
|
||||
mca_coll_basic_module_init,
|
||||
mca_coll_basic_module_finalize,
|
||||
|
||||
/* Collective function pointers */
|
||||
|
||||
mca_coll_basic_allgather_intra,
|
||||
mca_coll_basic_allgatherv_intra,
|
||||
mca_coll_basic_allreduce_intra,
|
||||
mca_coll_basic_alltoall_intra,
|
||||
mca_coll_basic_alltoallv_intra,
|
||||
mca_coll_basic_alltoallw_intra,
|
||||
mca_coll_basic_barrier_intra_log,
|
||||
mca_coll_basic_bcast_log_intra,
|
||||
mca_coll_basic_exscan_intra,
|
||||
mca_coll_basic_gather_intra,
|
||||
mca_coll_basic_gatherv_intra,
|
||||
mca_coll_basic_reduce_log_intra,
|
||||
mca_coll_basic_reduce_scatter_intra,
|
||||
mca_coll_basic_scan_intra,
|
||||
mca_coll_basic_scatter_intra,
|
||||
mca_coll_basic_scatterv_intra,
|
||||
mca_coll_basic_ft_event
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Linear set of collective algorithms for intercommunicators
|
||||
*/
|
||||
static const mca_coll_base_module_1_0_0_t inter_linear = {
|
||||
|
||||
/* Initialization / finalization functions */
|
||||
|
||||
mca_coll_basic_module_init,
|
||||
mca_coll_basic_module_finalize,
|
||||
|
||||
/* Collective function pointers */
|
||||
|
||||
mca_coll_basic_allgather_inter,
|
||||
mca_coll_basic_allgatherv_inter,
|
||||
mca_coll_basic_allreduce_inter,
|
||||
mca_coll_basic_alltoall_inter,
|
||||
mca_coll_basic_alltoallv_inter,
|
||||
mca_coll_basic_alltoallw_inter,
|
||||
mca_coll_basic_barrier_inter_lin,
|
||||
mca_coll_basic_bcast_lin_inter,
|
||||
NULL,
|
||||
mca_coll_basic_gather_inter,
|
||||
mca_coll_basic_gatherv_inter,
|
||||
mca_coll_basic_reduce_lin_inter,
|
||||
mca_coll_basic_reduce_scatter_inter,
|
||||
NULL,
|
||||
mca_coll_basic_scatter_inter,
|
||||
mca_coll_basic_scatterv_inter,
|
||||
mca_coll_basic_ft_event
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Initial query function that is invoked during MPI_INIT, allowing
|
||||
* this component to disqualify itself if it doesn't support the
|
||||
@ -146,37 +48,17 @@ mca_coll_basic_init_query(bool enable_progress_threads,
|
||||
* Look at the communicator and decide which set of functions and
|
||||
* priority we want to return.
|
||||
*/
|
||||
const mca_coll_base_module_1_0_0_t *
|
||||
mca_coll_basic_comm_query(struct ompi_communicator_t *comm, int *priority,
|
||||
struct mca_coll_base_comm_t **data)
|
||||
{
|
||||
*priority = mca_coll_basic_priority;
|
||||
|
||||
/* Choose whether to use [intra|inter], and [linear|log]-based
|
||||
* algorithms. */
|
||||
|
||||
if (OMPI_COMM_IS_INTER(comm)) {
|
||||
return &inter_linear;
|
||||
} else {
|
||||
if (ompi_comm_size(comm) <= mca_coll_basic_crossover) {
|
||||
return &intra_linear;
|
||||
} else {
|
||||
return &intra_log;
|
||||
}
|
||||
}
|
||||
|
||||
/* Never reach here */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Init module on the communicator
|
||||
*/
|
||||
const struct mca_coll_base_module_1_0_0_t *
|
||||
mca_coll_basic_module_init(struct ompi_communicator_t *comm)
|
||||
mca_coll_base_module_1_1_0_t *
|
||||
mca_coll_basic_comm_query(struct ompi_communicator_t *comm,
|
||||
int *priority)
|
||||
{
|
||||
int size;
|
||||
struct mca_coll_base_comm_t *data;
|
||||
mca_coll_basic_module_t *basic_module;
|
||||
|
||||
basic_module = OBJ_NEW(mca_coll_basic_module_t);
|
||||
if (NULL == basic_module) return NULL;
|
||||
|
||||
*priority = mca_coll_basic_priority;
|
||||
|
||||
/* Allocate the data that hangs off the communicator */
|
||||
|
||||
@ -185,48 +67,86 @@ mca_coll_basic_module_init(struct ompi_communicator_t *comm)
|
||||
} else {
|
||||
size = ompi_comm_size(comm);
|
||||
}
|
||||
data = (struct mca_coll_base_comm_t*)malloc(sizeof(struct mca_coll_base_comm_t) +
|
||||
(sizeof(ompi_request_t *) * size * 2));
|
||||
basic_module->mccb_num_reqs = size * 2;
|
||||
basic_module->mccb_reqs = (ompi_request_t**)
|
||||
malloc(sizeof(ompi_request_t *) * basic_module->mccb_num_reqs);
|
||||
|
||||
if (NULL == data) {
|
||||
return NULL;
|
||||
/* Choose whether to use [intra|inter], and [linear|log]-based
|
||||
* algorithms. */
|
||||
basic_module->super.coll_module_enable = mca_coll_basic_module_enable;
|
||||
basic_module->super.ft_event = mca_coll_basic_ft_event;
|
||||
|
||||
if (OMPI_COMM_IS_INTER(comm)) {
|
||||
basic_module->super.coll_allgather = mca_coll_basic_allgather_inter;
|
||||
basic_module->super.coll_allgatherv = mca_coll_basic_allgatherv_inter;
|
||||
basic_module->super.coll_allreduce = mca_coll_basic_allreduce_inter;
|
||||
basic_module->super.coll_alltoall = mca_coll_basic_alltoall_inter;
|
||||
basic_module->super.coll_alltoallv = mca_coll_basic_alltoallv_inter;
|
||||
basic_module->super.coll_alltoallw = mca_coll_basic_alltoallw_inter;
|
||||
basic_module->super.coll_barrier = mca_coll_basic_barrier_inter_lin;
|
||||
basic_module->super.coll_bcast = mca_coll_basic_bcast_lin_inter;
|
||||
basic_module->super.coll_exscan = NULL;
|
||||
basic_module->super.coll_gather = mca_coll_basic_gather_inter;
|
||||
basic_module->super.coll_gatherv = mca_coll_basic_gatherv_inter;
|
||||
basic_module->super.coll_reduce = mca_coll_basic_reduce_lin_inter;
|
||||
basic_module->super.coll_reduce_scatter = mca_coll_basic_reduce_scatter_inter;
|
||||
basic_module->super.coll_scan = NULL;
|
||||
basic_module->super.coll_scatter = mca_coll_basic_scatter_inter;
|
||||
basic_module->super.coll_scatterv = mca_coll_basic_scatterv_inter;
|
||||
} else if (ompi_comm_size(comm) <= mca_coll_basic_crossover) {
|
||||
basic_module->super.coll_allgather = mca_coll_basic_allgather_intra;
|
||||
basic_module->super.coll_allgatherv = mca_coll_basic_allgatherv_intra;
|
||||
basic_module->super.coll_allreduce = mca_coll_basic_allreduce_intra;
|
||||
basic_module->super.coll_alltoall = mca_coll_basic_alltoall_intra;
|
||||
basic_module->super.coll_alltoallv = mca_coll_basic_alltoallv_intra;
|
||||
basic_module->super.coll_alltoallw = mca_coll_basic_alltoallw_intra;
|
||||
basic_module->super.coll_barrier = mca_coll_basic_barrier_intra_lin;
|
||||
basic_module->super.coll_bcast = mca_coll_basic_bcast_lin_intra;
|
||||
basic_module->super.coll_exscan = mca_coll_basic_exscan_intra;
|
||||
basic_module->super.coll_gather = mca_coll_basic_gather_intra;
|
||||
basic_module->super.coll_gatherv = mca_coll_basic_gatherv_intra;
|
||||
basic_module->super.coll_reduce = mca_coll_basic_reduce_lin_intra;
|
||||
basic_module->super.coll_reduce_scatter = mca_coll_basic_reduce_scatter_intra;
|
||||
basic_module->super.coll_scan = mca_coll_basic_scan_intra;
|
||||
basic_module->super.coll_scatter = mca_coll_basic_scatter_intra;
|
||||
basic_module->super.coll_scatterv = mca_coll_basic_scatterv_intra;
|
||||
} else {
|
||||
basic_module->super.coll_allgather = mca_coll_basic_allgather_intra;
|
||||
basic_module->super.coll_allgatherv = mca_coll_basic_allgatherv_intra;
|
||||
basic_module->super.coll_allreduce = mca_coll_basic_allreduce_intra;
|
||||
basic_module->super.coll_alltoall = mca_coll_basic_alltoall_intra;
|
||||
basic_module->super.coll_alltoallv = mca_coll_basic_alltoallv_intra;
|
||||
basic_module->super.coll_alltoallw = mca_coll_basic_alltoallw_intra;
|
||||
basic_module->super.coll_barrier = mca_coll_basic_barrier_intra_log;
|
||||
basic_module->super.coll_bcast = mca_coll_basic_bcast_log_intra;
|
||||
basic_module->super.coll_exscan = mca_coll_basic_exscan_intra;
|
||||
basic_module->super.coll_gather = mca_coll_basic_gather_intra;
|
||||
basic_module->super.coll_gatherv = mca_coll_basic_gatherv_intra;
|
||||
basic_module->super.coll_reduce = mca_coll_basic_reduce_log_intra;
|
||||
basic_module->super.coll_reduce_scatter = mca_coll_basic_reduce_scatter_intra;
|
||||
basic_module->super.coll_scan = mca_coll_basic_scan_intra;
|
||||
basic_module->super.coll_scatter = mca_coll_basic_scatter_intra;
|
||||
basic_module->super.coll_scatterv = mca_coll_basic_scatterv_intra;
|
||||
}
|
||||
data->mccb_reqs = (ompi_request_t **) (data + 1);
|
||||
data->mccb_num_reqs = size * 2;
|
||||
|
||||
/* All done */
|
||||
|
||||
comm->c_coll_basic_data = data;
|
||||
return comm->c_coll_basic_module;
|
||||
return &(basic_module->super);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Finalize module on the communicator
|
||||
* Init module on the communicator
|
||||
*/
|
||||
int
|
||||
mca_coll_basic_module_finalize(struct ompi_communicator_t *comm)
|
||||
mca_coll_basic_module_enable(mca_coll_base_module_1_1_0_t *module,
|
||||
struct ompi_communicator_t *comm)
|
||||
{
|
||||
if (NULL == comm->c_coll_basic_module) {
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
#if OMPI_ENABLE_DEBUG
|
||||
/* Reset the reqs to NULL/0 -- they'll be freed as part of freeing
|
||||
* the generel c_coll_basic_data */
|
||||
|
||||
comm->c_coll_basic_data->mccb_reqs = NULL;
|
||||
comm->c_coll_basic_data->mccb_num_reqs = 0;
|
||||
#endif
|
||||
|
||||
/* All done */
|
||||
|
||||
free(comm->c_coll_basic_data);
|
||||
comm->c_coll_basic_data = NULL;
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
int mca_coll_basic_ft_event(int state) {
|
||||
|
||||
int
|
||||
mca_coll_basic_ft_event(int state) {
|
||||
if(OPAL_CRS_CHECKPOINT == state) {
|
||||
;
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user