diff --git a/ompi/mca/coll/base/coll_base_comm_select.c b/ompi/mca/coll/base/coll_base_comm_select.c index 1d0d9da232..b853f1ad26 100644 --- a/ompi/mca/coll/base/coll_base_comm_select.c +++ b/ompi/mca/coll/base/coll_base_comm_select.c @@ -53,7 +53,7 @@ struct avail_coll_t { opal_list_item_t super; int ac_priority; - mca_coll_base_module_2_2_0_t *ac_module; + mca_coll_base_module_2_3_0_t *ac_module; const char * ac_component_name; }; typedef struct avail_coll_t avail_coll_t; @@ -66,16 +66,16 @@ static opal_list_t *check_components(opal_list_t * components, ompi_communicator_t * comm); static int check_one_component(ompi_communicator_t * comm, const mca_base_component_t * component, - mca_coll_base_module_2_2_0_t ** module); + mca_coll_base_module_2_3_0_t ** module); static int query(const mca_base_component_t * component, ompi_communicator_t * comm, int *priority, - mca_coll_base_module_2_2_0_t ** module); + mca_coll_base_module_2_3_0_t ** module); static int query_2_0_0(const mca_coll_base_component_2_0_0_t * coll_component, ompi_communicator_t * comm, int *priority, - mca_coll_base_module_2_2_0_t ** module); + mca_coll_base_module_2_3_0_t ** module); /* * Stuff for the OBJ interface @@ -330,7 +330,7 @@ static opal_list_t *check_components(opal_list_t * components, int priority; const mca_base_component_t *component; mca_base_component_list_item_t *cli; - mca_coll_base_module_2_2_0_t *module; + mca_coll_base_module_2_3_0_t *module; opal_list_t *selectable; avail_coll_t *avail; @@ -386,7 +386,7 @@ static opal_list_t *check_components(opal_list_t * components, */ static int check_one_component(ompi_communicator_t * comm, const mca_base_component_t * component, - mca_coll_base_module_2_2_0_t ** module) + mca_coll_base_module_2_3_0_t ** module) { int err; int priority = -1; @@ -420,7 +420,7 @@ static int check_one_component(ompi_communicator_t * comm, */ static int query(const mca_base_component_t * component, ompi_communicator_t * comm, - int *priority, mca_coll_base_module_2_2_0_t ** module) + int *priority, mca_coll_base_module_2_3_0_t ** module) { *module = NULL; if (2 == component->mca_type_major_version && @@ -440,9 +440,9 @@ static int query(const mca_base_component_t * component, static int query_2_0_0(const mca_coll_base_component_2_0_0_t * component, ompi_communicator_t * comm, int *priority, - mca_coll_base_module_2_2_0_t ** module) + mca_coll_base_module_2_3_0_t ** module) { - mca_coll_base_module_2_2_0_t *ret; + mca_coll_base_module_2_3_0_t *ret; /* There's currently no need for conversion */ diff --git a/ompi/mca/coll/coll.h b/ompi/mca/coll/coll.h index d8b47bcd31..f852f26732 100644 --- a/ompi/mca/coll/coll.h +++ b/ompi/mca/coll/coll.h @@ -138,7 +138,7 @@ typedef int (*mca_coll_base_component_init_query_fn_t) * provide a module with the requested functionality or NULL if the * component should not be used on the given communicator. */ -typedef struct mca_coll_base_module_2_2_0_t * +typedef struct mca_coll_base_module_2_3_0_t * (*mca_coll_base_component_comm_query_2_0_0_fn_t) (struct ompi_communicator_t *comm, int *priority); @@ -178,7 +178,7 @@ typedef struct mca_coll_base_module_2_2_0_t * * @param[in] comm Communicator being created */ typedef int -(*mca_coll_base_module_enable_1_1_0_fn_t)(struct mca_coll_base_module_2_2_0_t* module, +(*mca_coll_base_module_enable_1_1_0_fn_t)(struct mca_coll_base_module_2_3_0_t* module, struct ompi_communicator_t *comm); @@ -193,225 +193,225 @@ typedef int * @param[in] comm Communicator being disabled */ typedef int -(*mca_coll_base_module_disable_1_2_0_fn_t)(struct mca_coll_base_module_2_2_0_t* module, +(*mca_coll_base_module_disable_1_2_0_fn_t)(struct mca_coll_base_module_2_3_0_t* module, struct ompi_communicator_t *comm); /* blocking collectives */ typedef int (*mca_coll_base_module_allgather_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, - struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_allgatherv_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, const int *rcounts, const int *disps, struct ompi_datatype_t *rdtype, - struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_allreduce_fn_t) (const void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, - struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_alltoall_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, - struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_alltoallv_fn_t) (const void *sbuf, const int *scounts, const int *sdisps, struct ompi_datatype_t *sdtype, void *rbuf, const int *rcounts, const int *rdisps, struct ompi_datatype_t *rdtype, - struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_alltoallw_fn_t) (const void *sbuf, const int *scounts, const int *sdisps, struct ompi_datatype_t * const *sdtypes, void *rbuf, const int *rcounts, const int *rdisps, struct ompi_datatype_t * const *rdtypes, - struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_barrier_fn_t) - (struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + (struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_bcast_fn_t) (void *buff, int count, struct ompi_datatype_t *datatype, int root, - struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_exscan_fn_t) (const void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, - struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_gather_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, - int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_gatherv_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, const int *rcounts, const int *disps, struct ompi_datatype_t *rdtype, - int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_reduce_fn_t) (const void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, - struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_reduce_scatter_fn_t) (const void *sbuf, void *rbuf, const int *rcounts, struct ompi_datatype_t *dtype, - struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_reduce_scatter_block_fn_t) (const void *sbuf, void *rbuf, int rcount, struct ompi_datatype_t *dtype, - struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_scan_fn_t) (const void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, - struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_op_t *op, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_scatter_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, - int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_scatterv_fn_t) (const void *sbuf, const int *scounts, const int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, - int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + int root, struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); /* nonblocking collectives */ typedef int (*mca_coll_base_module_iallgather_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_iallgatherv_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, const int *rcounts, const int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_iallreduce_fn_t) (const void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, - ompi_request_t ** request, struct mca_coll_base_module_2_2_0_t *module); + ompi_request_t ** request, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_ialltoall_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_ialltoallv_fn_t) (const void *sbuf, const int *scounts, const int *sdisps, struct ompi_datatype_t *sdtype, void *rbuf, const int *rcounts, const int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_ialltoallw_fn_t) (const void *sbuf, const int *scounts, const int *sdisps, struct ompi_datatype_t * const *sdtypes, void *rbuf, const int *rcounts, const int *rdisps, struct ompi_datatype_t * const *rdtypes, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_ibarrier_fn_t) (struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_ibcast_fn_t) (void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_iexscan_fn_t) (const void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_igather_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_igatherv_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, const int *rcounts, const int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_ireduce_fn_t) (const void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_ireduce_scatter_fn_t) (const void *sbuf, void *rbuf, const int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_ireduce_scatter_block_fn_t) (const void *sbuf, void *rbuf, int rcount, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_iscan_fn_t) (const void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_iscatter_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_iscatterv_fn_t) (const void *sbuf, const int *scounts, const int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); /* persistent collectives */ typedef int (*mca_coll_base_module_allgather_init_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_allgatherv_init_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void * rbuf, const int *rcounts, const int *disps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_allreduce_init_fn_t) (const void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, struct ompi_info_t *info, - ompi_request_t ** request, struct mca_coll_base_module_2_2_0_t *module); + ompi_request_t ** request, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_alltoall_init_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_alltoallv_init_fn_t) (const void *sbuf, const int *scounts, const int *sdisps, struct ompi_datatype_t *sdtype, void *rbuf, const int *rcounts, const int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_alltoallw_init_fn_t) (const void *sbuf, const int *scounts, const int *sdisps, struct ompi_datatype_t * const *sdtypes, void *rbuf, const int *rcounts, const int *rdisps, struct ompi_datatype_t * const *rdtypes, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_barrier_init_fn_t) (struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_bcast_init_fn_t) (void *buff, int count, struct ompi_datatype_t *datatype, int root, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_exscan_init_fn_t) (const void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_gather_init_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_gatherv_init_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, const int *rcounts, const int *disps, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_reduce_init_fn_t) (const void *sbuf, void* rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, int root, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_reduce_scatter_init_fn_t) (const void *sbuf, void *rbuf, const int *rcounts, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_reduce_scatter_block_init_fn_t) (const void *sbuf, void *rbuf, int rcount, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_scan_init_fn_t) (const void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_scatter_init_fn_t) (const void *sbuf, int scount, struct ompi_datatype_t *sdtype, void *rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_scatterv_init_fn_t) (const void *sbuf, const int *scounts, const int *disps, struct ompi_datatype_t *sdtype, void* rbuf, int rcount, struct ompi_datatype_t *rdtype, int root, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); /* * The signature of the neighborhood alltoallw differs from alltoallw @@ -419,17 +419,17 @@ typedef int (*mca_coll_base_module_scatterv_init_fn_t) typedef int (*mca_coll_base_module_neighbor_alltoallw_fn_t) (const void *sbuf, const int *scounts, const MPI_Aint *sdisps, struct ompi_datatype_t * const *sdtypes, void *rbuf, const int *rcounts, const MPI_Aint *rdisps, struct ompi_datatype_t * const *rdtypes, - struct ompi_communicator_t *comm, struct mca_coll_base_module_2_2_0_t *module); + struct ompi_communicator_t *comm, struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_ineighbor_alltoallw_fn_t) (const void *sbuf, const int *scounts, const MPI_Aint *sdisps, struct ompi_datatype_t * const *sdtypes, void *rbuf, const int *rcounts, const MPI_Aint *rdisps, struct ompi_datatype_t * const *rdtypes, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); typedef int (*mca_coll_base_module_neighbor_alltoallw_init_fn_t) (const void *sbuf, const int *scounts, const MPI_Aint *sdisps, struct ompi_datatype_t * const *sdtypes, void *rbuf, const int *rcounts, const MPI_Aint *rdisps, struct ompi_datatype_t * const *rdtypes, struct ompi_communicator_t *comm, struct ompi_info_t *info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); /* * reduce_local @@ -440,7 +440,7 @@ typedef int (*mca_coll_base_module_neighbor_alltoallw_init_fn_t) typedef int (*mca_coll_base_module_reduce_local_fn_t) (const void *inbuf, void *inoutbuf, int count, struct ompi_datatype_t * dtype, struct ompi_op_t * op, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); /** @@ -501,7 +501,7 @@ typedef struct mca_coll_base_component_2_0_0_t mca_coll_base_component_t; * function, so the component is free to create a structure that * inherits from this one for use as the module structure. */ -struct mca_coll_base_module_2_2_0_t { +struct mca_coll_base_module_2_3_0_t { /** Collective modules all inherit from opal_object */ opal_object_t super; @@ -602,12 +602,12 @@ struct mca_coll_base_module_2_2_0_t { not be used by other modules */ struct mca_coll_base_comm_t* base_data; }; -typedef struct mca_coll_base_module_2_2_0_t mca_coll_base_module_2_2_0_t; +typedef struct mca_coll_base_module_2_3_0_t mca_coll_base_module_2_3_0_t; /** Per guidence in mca.h, use the unversioned struct name if you just want to always keep up with the most recent version of the interace. */ -typedef struct mca_coll_base_module_2_2_0_t mca_coll_base_module_t; +typedef struct mca_coll_base_module_2_3_0_t mca_coll_base_module_t; OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_coll_base_module_t); /** @@ -623,150 +623,150 @@ struct mca_coll_base_comm_coll_t { /* blocking collectives */ mca_coll_base_module_allgather_fn_t coll_allgather; - mca_coll_base_module_2_2_0_t *coll_allgather_module; + mca_coll_base_module_2_3_0_t *coll_allgather_module; mca_coll_base_module_allgatherv_fn_t coll_allgatherv; - mca_coll_base_module_2_2_0_t *coll_allgatherv_module; + mca_coll_base_module_2_3_0_t *coll_allgatherv_module; mca_coll_base_module_allreduce_fn_t coll_allreduce; - mca_coll_base_module_2_2_0_t *coll_allreduce_module; + mca_coll_base_module_2_3_0_t *coll_allreduce_module; mca_coll_base_module_alltoall_fn_t coll_alltoall; - mca_coll_base_module_2_2_0_t *coll_alltoall_module; + mca_coll_base_module_2_3_0_t *coll_alltoall_module; mca_coll_base_module_alltoallv_fn_t coll_alltoallv; - mca_coll_base_module_2_2_0_t *coll_alltoallv_module; + mca_coll_base_module_2_3_0_t *coll_alltoallv_module; mca_coll_base_module_alltoallw_fn_t coll_alltoallw; - mca_coll_base_module_2_2_0_t *coll_alltoallw_module; + mca_coll_base_module_2_3_0_t *coll_alltoallw_module; mca_coll_base_module_barrier_fn_t coll_barrier; - mca_coll_base_module_2_2_0_t *coll_barrier_module; + mca_coll_base_module_2_3_0_t *coll_barrier_module; mca_coll_base_module_bcast_fn_t coll_bcast; - mca_coll_base_module_2_2_0_t *coll_bcast_module; + mca_coll_base_module_2_3_0_t *coll_bcast_module; mca_coll_base_module_exscan_fn_t coll_exscan; - mca_coll_base_module_2_2_0_t *coll_exscan_module; + mca_coll_base_module_2_3_0_t *coll_exscan_module; mca_coll_base_module_gather_fn_t coll_gather; - mca_coll_base_module_2_2_0_t *coll_gather_module; + mca_coll_base_module_2_3_0_t *coll_gather_module; mca_coll_base_module_gatherv_fn_t coll_gatherv; - mca_coll_base_module_2_2_0_t *coll_gatherv_module; + mca_coll_base_module_2_3_0_t *coll_gatherv_module; mca_coll_base_module_reduce_fn_t coll_reduce; - mca_coll_base_module_2_2_0_t *coll_reduce_module; + mca_coll_base_module_2_3_0_t *coll_reduce_module; mca_coll_base_module_reduce_scatter_fn_t coll_reduce_scatter; - mca_coll_base_module_2_2_0_t *coll_reduce_scatter_module; + mca_coll_base_module_2_3_0_t *coll_reduce_scatter_module; mca_coll_base_module_reduce_scatter_block_fn_t coll_reduce_scatter_block; - mca_coll_base_module_2_2_0_t *coll_reduce_scatter_block_module; + mca_coll_base_module_2_3_0_t *coll_reduce_scatter_block_module; mca_coll_base_module_scan_fn_t coll_scan; - mca_coll_base_module_2_2_0_t *coll_scan_module; + mca_coll_base_module_2_3_0_t *coll_scan_module; mca_coll_base_module_scatter_fn_t coll_scatter; - mca_coll_base_module_2_2_0_t *coll_scatter_module; + mca_coll_base_module_2_3_0_t *coll_scatter_module; mca_coll_base_module_scatterv_fn_t coll_scatterv; - mca_coll_base_module_2_2_0_t *coll_scatterv_module; + mca_coll_base_module_2_3_0_t *coll_scatterv_module; /* nonblocking collectives */ mca_coll_base_module_iallgather_fn_t coll_iallgather; - mca_coll_base_module_2_2_0_t *coll_iallgather_module; + mca_coll_base_module_2_3_0_t *coll_iallgather_module; mca_coll_base_module_iallgatherv_fn_t coll_iallgatherv; - mca_coll_base_module_2_2_0_t *coll_iallgatherv_module; + mca_coll_base_module_2_3_0_t *coll_iallgatherv_module; mca_coll_base_module_iallreduce_fn_t coll_iallreduce; - mca_coll_base_module_2_2_0_t *coll_iallreduce_module; + mca_coll_base_module_2_3_0_t *coll_iallreduce_module; mca_coll_base_module_ialltoall_fn_t coll_ialltoall; - mca_coll_base_module_2_2_0_t *coll_ialltoall_module; + mca_coll_base_module_2_3_0_t *coll_ialltoall_module; mca_coll_base_module_ialltoallv_fn_t coll_ialltoallv; - mca_coll_base_module_2_2_0_t *coll_ialltoallv_module; + mca_coll_base_module_2_3_0_t *coll_ialltoallv_module; mca_coll_base_module_ialltoallw_fn_t coll_ialltoallw; - mca_coll_base_module_2_2_0_t *coll_ialltoallw_module; + mca_coll_base_module_2_3_0_t *coll_ialltoallw_module; mca_coll_base_module_ibarrier_fn_t coll_ibarrier; - mca_coll_base_module_2_2_0_t *coll_ibarrier_module; + mca_coll_base_module_2_3_0_t *coll_ibarrier_module; mca_coll_base_module_ibcast_fn_t coll_ibcast; - mca_coll_base_module_2_2_0_t *coll_ibcast_module; + mca_coll_base_module_2_3_0_t *coll_ibcast_module; mca_coll_base_module_iexscan_fn_t coll_iexscan; - mca_coll_base_module_2_2_0_t *coll_iexscan_module; + mca_coll_base_module_2_3_0_t *coll_iexscan_module; mca_coll_base_module_igather_fn_t coll_igather; - mca_coll_base_module_2_2_0_t *coll_igather_module; + mca_coll_base_module_2_3_0_t *coll_igather_module; mca_coll_base_module_igatherv_fn_t coll_igatherv; - mca_coll_base_module_2_2_0_t *coll_igatherv_module; + mca_coll_base_module_2_3_0_t *coll_igatherv_module; mca_coll_base_module_ireduce_fn_t coll_ireduce; - mca_coll_base_module_2_2_0_t *coll_ireduce_module; + mca_coll_base_module_2_3_0_t *coll_ireduce_module; mca_coll_base_module_ireduce_scatter_fn_t coll_ireduce_scatter; - mca_coll_base_module_2_2_0_t *coll_ireduce_scatter_module; + mca_coll_base_module_2_3_0_t *coll_ireduce_scatter_module; mca_coll_base_module_ireduce_scatter_block_fn_t coll_ireduce_scatter_block; - mca_coll_base_module_2_2_0_t *coll_ireduce_scatter_block_module; + mca_coll_base_module_2_3_0_t *coll_ireduce_scatter_block_module; mca_coll_base_module_iscan_fn_t coll_iscan; - mca_coll_base_module_2_2_0_t *coll_iscan_module; + mca_coll_base_module_2_3_0_t *coll_iscan_module; mca_coll_base_module_iscatter_fn_t coll_iscatter; - mca_coll_base_module_2_2_0_t *coll_iscatter_module; + mca_coll_base_module_2_3_0_t *coll_iscatter_module; mca_coll_base_module_iscatterv_fn_t coll_iscatterv; - mca_coll_base_module_2_2_0_t *coll_iscatterv_module; + mca_coll_base_module_2_3_0_t *coll_iscatterv_module; /* persistent collectives */ mca_coll_base_module_allgather_init_fn_t coll_allgather_init; - mca_coll_base_module_2_2_0_t *coll_allgather_init_module; + mca_coll_base_module_2_3_0_t *coll_allgather_init_module; mca_coll_base_module_allgatherv_init_fn_t coll_allgatherv_init; - mca_coll_base_module_2_2_0_t *coll_allgatherv_init_module; + mca_coll_base_module_2_3_0_t *coll_allgatherv_init_module; mca_coll_base_module_allreduce_init_fn_t coll_allreduce_init; - mca_coll_base_module_2_2_0_t *coll_allreduce_init_module; + mca_coll_base_module_2_3_0_t *coll_allreduce_init_module; mca_coll_base_module_alltoall_init_fn_t coll_alltoall_init; - mca_coll_base_module_2_2_0_t *coll_alltoall_init_module; + mca_coll_base_module_2_3_0_t *coll_alltoall_init_module; mca_coll_base_module_alltoallv_init_fn_t coll_alltoallv_init; - mca_coll_base_module_2_2_0_t *coll_alltoallv_init_module; + mca_coll_base_module_2_3_0_t *coll_alltoallv_init_module; mca_coll_base_module_alltoallw_init_fn_t coll_alltoallw_init; - mca_coll_base_module_2_2_0_t *coll_alltoallw_init_module; + mca_coll_base_module_2_3_0_t *coll_alltoallw_init_module; mca_coll_base_module_barrier_init_fn_t coll_barrier_init; - mca_coll_base_module_2_2_0_t *coll_barrier_init_module; + mca_coll_base_module_2_3_0_t *coll_barrier_init_module; mca_coll_base_module_bcast_init_fn_t coll_bcast_init; - mca_coll_base_module_2_2_0_t *coll_bcast_init_module; + mca_coll_base_module_2_3_0_t *coll_bcast_init_module; mca_coll_base_module_exscan_init_fn_t coll_exscan_init; - mca_coll_base_module_2_2_0_t *coll_exscan_init_module; + mca_coll_base_module_2_3_0_t *coll_exscan_init_module; mca_coll_base_module_gather_init_fn_t coll_gather_init; - mca_coll_base_module_2_2_0_t *coll_gather_init_module; + mca_coll_base_module_2_3_0_t *coll_gather_init_module; mca_coll_base_module_gatherv_init_fn_t coll_gatherv_init; - mca_coll_base_module_2_2_0_t *coll_gatherv_init_module; + mca_coll_base_module_2_3_0_t *coll_gatherv_init_module; mca_coll_base_module_reduce_init_fn_t coll_reduce_init; - mca_coll_base_module_2_2_0_t *coll_reduce_init_module; + mca_coll_base_module_2_3_0_t *coll_reduce_init_module; mca_coll_base_module_reduce_scatter_init_fn_t coll_reduce_scatter_init; - mca_coll_base_module_2_2_0_t *coll_reduce_scatter_init_module; + mca_coll_base_module_2_3_0_t *coll_reduce_scatter_init_module; mca_coll_base_module_reduce_scatter_block_init_fn_t coll_reduce_scatter_block_init; - mca_coll_base_module_2_2_0_t *coll_reduce_scatter_block_init_module; + mca_coll_base_module_2_3_0_t *coll_reduce_scatter_block_init_module; mca_coll_base_module_scan_init_fn_t coll_scan_init; - mca_coll_base_module_2_2_0_t *coll_scan_init_module; + mca_coll_base_module_2_3_0_t *coll_scan_init_module; mca_coll_base_module_scatter_init_fn_t coll_scatter_init; - mca_coll_base_module_2_2_0_t *coll_scatter_init_module; + mca_coll_base_module_2_3_0_t *coll_scatter_init_module; mca_coll_base_module_scatterv_init_fn_t coll_scatterv_init; - mca_coll_base_module_2_2_0_t *coll_scatterv_init_module; + mca_coll_base_module_2_3_0_t *coll_scatterv_init_module; /* blocking neighborhood collectives */ mca_coll_base_module_allgather_fn_t coll_neighbor_allgather; - mca_coll_base_module_2_2_0_t *coll_neighbor_allgather_module; + mca_coll_base_module_2_3_0_t *coll_neighbor_allgather_module; mca_coll_base_module_allgatherv_fn_t coll_neighbor_allgatherv; - mca_coll_base_module_2_2_0_t *coll_neighbor_allgatherv_module; + mca_coll_base_module_2_3_0_t *coll_neighbor_allgatherv_module; mca_coll_base_module_alltoall_fn_t coll_neighbor_alltoall; - mca_coll_base_module_2_2_0_t *coll_neighbor_alltoall_module; + mca_coll_base_module_2_3_0_t *coll_neighbor_alltoall_module; mca_coll_base_module_alltoallv_fn_t coll_neighbor_alltoallv; - mca_coll_base_module_2_2_0_t *coll_neighbor_alltoallv_module; + mca_coll_base_module_2_3_0_t *coll_neighbor_alltoallv_module; mca_coll_base_module_neighbor_alltoallw_fn_t coll_neighbor_alltoallw; - mca_coll_base_module_2_2_0_t *coll_neighbor_alltoallw_module; + mca_coll_base_module_2_3_0_t *coll_neighbor_alltoallw_module; /* nonblocking neighborhood collectives */ mca_coll_base_module_iallgather_fn_t coll_ineighbor_allgather; - mca_coll_base_module_2_2_0_t *coll_ineighbor_allgather_module; + mca_coll_base_module_2_3_0_t *coll_ineighbor_allgather_module; mca_coll_base_module_iallgatherv_fn_t coll_ineighbor_allgatherv; - mca_coll_base_module_2_2_0_t *coll_ineighbor_allgatherv_module; + mca_coll_base_module_2_3_0_t *coll_ineighbor_allgatherv_module; mca_coll_base_module_ialltoall_fn_t coll_ineighbor_alltoall; - mca_coll_base_module_2_2_0_t *coll_ineighbor_alltoall_module; + mca_coll_base_module_2_3_0_t *coll_ineighbor_alltoall_module; mca_coll_base_module_ialltoallv_fn_t coll_ineighbor_alltoallv; - mca_coll_base_module_2_2_0_t *coll_ineighbor_alltoallv_module; + mca_coll_base_module_2_3_0_t *coll_ineighbor_alltoallv_module; mca_coll_base_module_ineighbor_alltoallw_fn_t coll_ineighbor_alltoallw; - mca_coll_base_module_2_2_0_t *coll_ineighbor_alltoallw_module; + mca_coll_base_module_2_3_0_t *coll_ineighbor_alltoallw_module; /* persistent neighborhood collectives */ mca_coll_base_module_allgather_init_fn_t coll_neighbor_allgather_init; - mca_coll_base_module_2_2_0_t *coll_neighbor_allgather_init_module; + mca_coll_base_module_2_3_0_t *coll_neighbor_allgather_init_module; mca_coll_base_module_allgatherv_init_fn_t coll_neighbor_allgatherv_init; - mca_coll_base_module_2_2_0_t *coll_neighbor_allgatherv_init_module; + mca_coll_base_module_2_3_0_t *coll_neighbor_allgatherv_init_module; mca_coll_base_module_alltoall_init_fn_t coll_neighbor_alltoall_init; - mca_coll_base_module_2_2_0_t *coll_neighbor_alltoall_init_module; + mca_coll_base_module_2_3_0_t *coll_neighbor_alltoall_init_module; mca_coll_base_module_alltoallv_init_fn_t coll_neighbor_alltoallv_init; - mca_coll_base_module_2_2_0_t *coll_neighbor_alltoallv_init_module; + mca_coll_base_module_2_3_0_t *coll_neighbor_alltoallv_init_module; mca_coll_base_module_neighbor_alltoallw_init_fn_t coll_neighbor_alltoallw_init; - mca_coll_base_module_2_2_0_t *coll_neighbor_alltoallw_init_module; + mca_coll_base_module_2_3_0_t *coll_neighbor_alltoallw_init_module; mca_coll_base_module_reduce_local_fn_t coll_reduce_local; - mca_coll_base_module_2_2_0_t *coll_reduce_local_module; + mca_coll_base_module_2_3_0_t *coll_reduce_local_module; }; typedef struct mca_coll_base_comm_coll_t mca_coll_base_comm_coll_t; diff --git a/ompi/mca/coll/libnbc/coll_libnbc.h b/ompi/mca/coll/libnbc/coll_libnbc.h index dba87225bb..967a779425 100644 --- a/ompi/mca/coll/libnbc/coll_libnbc.h +++ b/ompi/mca/coll/libnbc/coll_libnbc.h @@ -157,258 +157,258 @@ int NBC_Progress(NBC_Handle *handle); int ompi_coll_libnbc_iallgather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_iallgatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_iallreduce(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ialltoall(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ialltoallv(const void* sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ialltoallw(const void *sbuf, const int *scounts, const int *sdisps, struct ompi_datatype_t * const *sdtypes, void *rbuf, const int *rcounts, const int *rdisps, struct ompi_datatype_t * const *rdtypes, struct ompi_communicator_t *comm, ompi_request_t **request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ibarrier(struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ibcast(void *buffer, int count, MPI_Datatype datatype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_iexscan(const void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, ompi_request_t **request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_igather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_igatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ireduce(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ireduce_scatter(const void* sendbuf, void* recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ireduce_scatter_block(const void *sbuf, void *rbuf, int rcount, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, ompi_request_t **request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_iscan(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_iscatter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_iscatterv(const void* sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_iallgather_inter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_iallgatherv_inter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_iallreduce_inter(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ialltoall_inter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ialltoallv_inter(const void* sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ialltoallw_inter(const void *sbuf, const int *scounts, const int *sdisps, struct ompi_datatype_t * const *sdtypes, void *rbuf, const int *rcounts, const int *rdisps, struct ompi_datatype_t * const *rdtypes, struct ompi_communicator_t *comm, ompi_request_t **request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ibarrier_inter(struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ibcast_inter(void *buffer, int count, MPI_Datatype datatype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_igather_inter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_igatherv_inter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ireduce_inter(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ireduce_scatter_inter(const void* sendbuf, void* recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ireduce_scatter_block_inter(const void *sbuf, void *rbuf, int rcount, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, ompi_request_t **request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_iscatter_inter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_iscatterv_inter(const void* sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ineighbor_allgather(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, int rcount, MPI_Datatype rtype, struct ompi_communicator_t *comm, - ompi_request_t ** request, struct mca_coll_base_module_2_2_0_t *module); + ompi_request_t ** request, struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ineighbor_allgatherv(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, const int *rcounts, const int *displs, MPI_Datatype rtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ineighbor_alltoall(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, int rcount, MPI_Datatype rtype, struct ompi_communicator_t *comm, - ompi_request_t ** request, struct mca_coll_base_module_2_2_0_t *module); + ompi_request_t ** request, struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ineighbor_alltoallv(const void *sbuf, const int *scounts, const int *sdispls, MPI_Datatype stype, void *rbuf, const int *rcounts, const int *rdispls, MPI_Datatype rtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_ineighbor_alltoallw(const void *sbuf, const int *scounts, const MPI_Aint *sdisps, struct ompi_datatype_t * const *stypes, void *rbuf, const int *rcounts, const MPI_Aint *rdisps, struct ompi_datatype_t * const *rtypes, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_allgather_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_allgatherv_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_allreduce_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_alltoall_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_alltoallv_init(const void* sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_alltoallw_init(const void *sbuf, const int *scounts, const int *sdisps, struct ompi_datatype_t * const *sdtypes, void *rbuf, const int *rcounts, const int *rdisps, struct ompi_datatype_t * const *rdtypes, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t **request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_barrier_init(struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_bcast_init(void *buffer, int count, MPI_Datatype datatype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_exscan_init(const void *sbuf, void *rbuf, int count, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t **request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_gather_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_gatherv_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_reduce_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_reduce_scatter_init(const void* sendbuf, void* recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_reduce_scatter_block_init(const void *sbuf, void *rbuf, int rcount, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t **request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_scan_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_scatter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_scatterv_init(const void* sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_allgather_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_allgatherv_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_allreduce_inter_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_alltoall_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_alltoallv_inter_init(const void* sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_alltoallw_inter_init(const void *sbuf, const int *scounts, const int *sdisps, struct ompi_datatype_t * const *sdtypes, void *rbuf, const int *rcounts, const int *rdisps, struct ompi_datatype_t * const *rdtypes, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t **request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_barrier_inter_init(struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_bcast_inter_init(void *buffer, int count, MPI_Datatype datatype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_gather_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_gatherv_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_reduce_inter_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_reduce_scatter_inter_init(const void* sendbuf, void* recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_reduce_scatter_block_inter_init(const void *sbuf, void *rbuf, int rcount, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t **request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_scatter_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_scatterv_inter_init(const void* sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_neighbor_allgather_init(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, int rcount, MPI_Datatype rtype, struct ompi_communicator_t *comm, - MPI_Info info, ompi_request_t ** request, struct mca_coll_base_module_2_2_0_t *module); + MPI_Info info, ompi_request_t ** request, struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_neighbor_allgatherv_init(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, const int *rcounts, const int *displs, MPI_Datatype rtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_neighbor_alltoall_init(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, int rcount, MPI_Datatype rtype, struct ompi_communicator_t *comm, MPI_Info info, - ompi_request_t ** request, struct mca_coll_base_module_2_2_0_t *module); + ompi_request_t ** request, struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_neighbor_alltoallv_init(const void *sbuf, const int *scounts, const int *sdispls, MPI_Datatype stype, void *rbuf, const int *rcounts, const int *rdispls, MPI_Datatype rtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_libnbc_neighbor_alltoallw_init(const void *sbuf, const int *scounts, const MPI_Aint *sdisps, struct ompi_datatype_t * const *stypes, void *rbuf, const int *rcounts, const MPI_Aint *rdisps, struct ompi_datatype_t * const *rtypes, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); END_C_DECLS diff --git a/ompi/mca/coll/libnbc/nbc_iallgather.c b/ompi/mca/coll/libnbc/nbc_iallgather.c index cb87a645e2..e7a9104fba 100644 --- a/ompi/mca/coll/libnbc/nbc_iallgather.c +++ b/ompi/mca/coll/libnbc/nbc_iallgather.c @@ -46,7 +46,7 @@ int NBC_Allgather_args_compare(NBC_Allgather_args *a, NBC_Allgather_args *b, voi * each node receives from it's left (modulo p) neighbor */ static int nbc_allgather_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res; MPI_Aint rcvext; @@ -176,7 +176,7 @@ static int nbc_allgather_init(const void* sendbuf, int sendcount, MPI_Datatype s int ompi_coll_libnbc_iallgather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allgather_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, request, module, false); @@ -196,7 +196,7 @@ int ompi_coll_libnbc_iallgather(const void* sendbuf, int sendcount, MPI_Datatype static int nbc_allgather_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, rsize; MPI_Aint rcvext; @@ -253,7 +253,7 @@ static int nbc_allgather_inter_init(const void* sendbuf, int sendcount, MPI_Data int ompi_coll_libnbc_iallgather_inter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allgather_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -272,7 +272,7 @@ int ompi_coll_libnbc_iallgather_inter(const void* sendbuf, int sendcount, MPI_Da int ompi_coll_libnbc_allgather_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allgather_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -284,7 +284,7 @@ int ompi_coll_libnbc_allgather_init(const void* sendbuf, int sendcount, MPI_Data int ompi_coll_libnbc_allgather_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allgather_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_iallgatherv.c b/ompi/mca/coll/libnbc/nbc_iallgatherv.c index 83dc8af5d4..500a29dd6c 100644 --- a/ompi/mca/coll/libnbc/nbc_iallgatherv.c +++ b/ompi/mca/coll/libnbc/nbc_iallgatherv.c @@ -36,7 +36,7 @@ * each node receives from node (rank-2)%p recvcounts[(rank+2)%p] elements */ static int nbc_allgatherv_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res, speer, rpeer; MPI_Aint rcvext; @@ -121,7 +121,7 @@ static int nbc_allgatherv_init(const void* sendbuf, int sendcount, MPI_Datatype int ompi_coll_libnbc_iallgatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allgatherv_init(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -140,7 +140,7 @@ int ompi_coll_libnbc_iallgatherv(const void* sendbuf, int sendcount, MPI_Datatyp static int nbc_allgatherv_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, rsize; MPI_Aint rcvext; @@ -200,7 +200,7 @@ static int nbc_allgatherv_inter_init(const void* sendbuf, int sendcount, MPI_Dat int ompi_coll_libnbc_iallgatherv_inter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allgatherv_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -219,7 +219,7 @@ int ompi_coll_libnbc_iallgatherv_inter(const void* sendbuf, int sendcount, MPI_D int ompi_coll_libnbc_allgatherv_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allgatherv_init(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -231,7 +231,7 @@ int ompi_coll_libnbc_allgatherv_init(const void* sendbuf, int sendcount, MPI_Dat int ompi_coll_libnbc_allgatherv_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allgatherv_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_iallreduce.c b/ompi/mca/coll/libnbc/nbc_iallreduce.c index 9bfb294396..f61b5fbb93 100644 --- a/ompi/mca/coll/libnbc/nbc_iallreduce.c +++ b/ompi/mca/coll/libnbc/nbc_iallreduce.c @@ -55,7 +55,7 @@ int NBC_Allreduce_args_compare(NBC_Allreduce_args *a, NBC_Allreduce_args *b, voi static int nbc_allreduce_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res; ptrdiff_t ext, lb; @@ -197,7 +197,7 @@ static int nbc_allreduce_init(const void* sendbuf, void* recvbuf, int count, MPI int ompi_coll_libnbc_iallreduce(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allreduce_init(sendbuf, recvbuf, count, datatype, op, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -216,7 +216,7 @@ int ompi_coll_libnbc_iallreduce(const void* sendbuf, void* recvbuf, int count, M static int nbc_allreduce_inter_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, res, rsize; size_t size; @@ -280,7 +280,7 @@ static int nbc_allreduce_inter_init(const void* sendbuf, void* recvbuf, int coun int ompi_coll_libnbc_iallreduce_inter(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allreduce_inter_init(sendbuf, recvbuf, count, datatype, op, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -737,7 +737,7 @@ static inline int allred_sched_linear(int rank, int rsize, const void *sendbuf, int ompi_coll_libnbc_allreduce_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allreduce_init(sendbuf, recvbuf, count, datatype, op, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -749,7 +749,7 @@ int ompi_coll_libnbc_allreduce_init(const void* sendbuf, void* recvbuf, int coun int ompi_coll_libnbc_allreduce_inter_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_allreduce_inter_init(sendbuf, recvbuf, count, datatype, op, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ialltoall.c b/ompi/mca/coll/libnbc/nbc_ialltoall.c index 9f83a08b5c..f51562708e 100644 --- a/ompi/mca/coll/libnbc/nbc_ialltoall.c +++ b/ompi/mca/coll/libnbc/nbc_ialltoall.c @@ -56,7 +56,7 @@ int NBC_Alltoall_args_compare(NBC_Alltoall_args *a, NBC_Alltoall_args *b, void * /* simple linear MPI_Ialltoall the (simple) algorithm just sends to all nodes */ static int nbc_alltoall_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res, datasize; size_t a2asize, sndsize; @@ -283,7 +283,7 @@ static int nbc_alltoall_init(const void* sendbuf, int sendcount, MPI_Datatype se int ompi_coll_libnbc_ialltoall(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoall_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -302,7 +302,7 @@ int ompi_coll_libnbc_ialltoall(const void* sendbuf, int sendcount, MPI_Datatype static int nbc_alltoall_inter_init (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, rsize; MPI_Aint sndext, rcvext; @@ -367,7 +367,7 @@ static int nbc_alltoall_inter_init (const void* sendbuf, int sendcount, MPI_Data int ompi_coll_libnbc_ialltoall_inter (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoall_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -592,7 +592,7 @@ static inline int a2a_sched_inplace(int rank, int p, NBC_Schedule* schedule, voi int ompi_coll_libnbc_alltoall_init (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoall_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -604,7 +604,7 @@ int ompi_coll_libnbc_alltoall_init (const void* sendbuf, int sendcount, MPI_Data int ompi_coll_libnbc_alltoall_inter_init (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoall_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ialltoallv.c b/ompi/mca/coll/libnbc/nbc_ialltoallv.c index 1f3d4230d5..2c433d0611 100644 --- a/ompi/mca/coll/libnbc/nbc_ialltoallv.c +++ b/ompi/mca/coll/libnbc/nbc_ialltoallv.c @@ -44,7 +44,7 @@ static inline int a2av_sched_inplace(int rank, int p, NBC_Schedule *schedule, static int nbc_alltoallv_init(const void* sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res; MPI_Aint sndext, rcvext; @@ -143,7 +143,7 @@ static int nbc_alltoallv_init(const void* sendbuf, const int *sendcounts, const int ompi_coll_libnbc_ialltoallv(const void* sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoallv_init(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, request, module, false); @@ -165,7 +165,7 @@ int ompi_coll_libnbc_ialltoallv(const void* sendbuf, const int *sendcounts, cons static int nbc_alltoallv_inter_init (const void* sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, rsize; MPI_Aint sndext, rcvext; @@ -231,7 +231,7 @@ static int nbc_alltoallv_inter_init (const void* sendbuf, const int *sendcounts, int ompi_coll_libnbc_ialltoallv_inter (const void* sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoallv_inter_init(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, request, module, false); @@ -391,7 +391,7 @@ static inline int a2av_sched_inplace(int rank, int p, NBC_Schedule *schedule, int ompi_coll_libnbc_alltoallv_init(const void* sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoallv_init(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -404,7 +404,7 @@ int ompi_coll_libnbc_alltoallv_init(const void* sendbuf, const int *sendcounts, int ompi_coll_libnbc_alltoallv_inter_init(const void* sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoallv_inter_init(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ialltoallw.c b/ompi/mca/coll/libnbc/nbc_ialltoallw.c index 38a69d3b70..366c0aa752 100644 --- a/ompi/mca/coll/libnbc/nbc_ialltoallw.c +++ b/ompi/mca/coll/libnbc/nbc_ialltoallw.c @@ -44,7 +44,7 @@ static inline int a2aw_sched_inplace(int rank, int p, NBC_Schedule *schedule, static int nbc_alltoallw_init(const void* sendbuf, const int *sendcounts, const int *sdispls, struct ompi_datatype_t * const *sendtypes, void* recvbuf, const int *recvcounts, const int *rdispls, struct ompi_datatype_t * const *recvtypes, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res; NBC_Schedule *schedule; @@ -129,7 +129,7 @@ static int nbc_alltoallw_init(const void* sendbuf, const int *sendcounts, const int ompi_coll_libnbc_ialltoallw(const void* sendbuf, const int *sendcounts, const int *sdispls, struct ompi_datatype_t * const *sendtypes, void* recvbuf, const int *recvcounts, const int *rdispls, struct ompi_datatype_t * const *recvtypes, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoallw_init(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, request, module, false); @@ -151,7 +151,7 @@ int ompi_coll_libnbc_ialltoallw(const void* sendbuf, const int *sendcounts, cons static int nbc_alltoallw_inter_init (const void* sendbuf, const int *sendcounts, const int *sdispls, struct ompi_datatype_t * const *sendtypes, void* recvbuf, const int *recvcounts, const int *rdispls, struct ompi_datatype_t * const *recvtypes, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, rsize; NBC_Schedule *schedule; @@ -204,7 +204,7 @@ static int nbc_alltoallw_inter_init (const void* sendbuf, const int *sendcounts, int ompi_coll_libnbc_ialltoallw_inter(const void* sendbuf, const int *sendcounts, const int *sdispls, struct ompi_datatype_t * const *sendtypes, void* recvbuf, const int *recvcounts, const int *rdispls, struct ompi_datatype_t * const *recvtypes, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoallw_inter_init(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, request, module, false); @@ -365,7 +365,7 @@ static inline int a2aw_sched_inplace(int rank, int p, NBC_Schedule *schedule, int ompi_coll_libnbc_alltoallw_init(const void* sendbuf, const int *sendcounts, const int *sdispls, struct ompi_datatype_t * const *sendtypes, void* recvbuf, const int *recvcounts, const int *rdispls, struct ompi_datatype_t * const *recvtypes, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoallw_init(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -378,7 +378,7 @@ int ompi_coll_libnbc_alltoallw_init(const void* sendbuf, const int *sendcounts, int ompi_coll_libnbc_alltoallw_inter_init(const void* sendbuf, const int *sendcounts, const int *sdispls, struct ompi_datatype_t * const *sendtypes, void* recvbuf, const int *recvcounts, const int *rdispls, struct ompi_datatype_t * const *recvtypes, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_alltoallw_inter_init(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ibarrier.c b/ompi/mca/coll/libnbc/nbc_ibarrier.c index 6b86a5ac64..bed454b859 100644 --- a/ompi/mca/coll/libnbc/nbc_ibarrier.c +++ b/ompi/mca/coll/libnbc/nbc_ibarrier.c @@ -23,7 +23,7 @@ /* Dissemination implementation of MPI_Ibarrier */ static int nbc_barrier_init(struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, maxround, res, recvpeer, sendpeer; NBC_Schedule *schedule; @@ -100,7 +100,7 @@ static int nbc_barrier_init(struct ompi_communicator_t *comm, ompi_request_t ** } int ompi_coll_libnbc_ibarrier(struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_barrier_init(comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { return res; @@ -117,7 +117,7 @@ int ompi_coll_libnbc_ibarrier(struct ompi_communicator_t *comm, ompi_request_t * } static int nbc_barrier_inter_init(struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, res, rsize; NBC_Schedule *schedule; @@ -187,7 +187,7 @@ static int nbc_barrier_inter_init(struct ompi_communicator_t *comm, ompi_request } int ompi_coll_libnbc_ibarrier_inter(struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_barrier_inter_init(comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { return res; @@ -204,7 +204,7 @@ int ompi_coll_libnbc_ibarrier_inter(struct ompi_communicator_t *comm, ompi_reque } int ompi_coll_libnbc_barrier_init(struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_barrier_init(comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { return res; @@ -214,7 +214,7 @@ int ompi_coll_libnbc_barrier_init(struct ompi_communicator_t *comm, MPI_Info inf } int ompi_coll_libnbc_barrier_inter_init(struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_barrier_inter_init(comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { return res; diff --git a/ompi/mca/coll/libnbc/nbc_ibcast.c b/ompi/mca/coll/libnbc/nbc_ibcast.c index 140a56af08..8f2ecd64c1 100644 --- a/ompi/mca/coll/libnbc/nbc_ibcast.c +++ b/ompi/mca/coll/libnbc/nbc_ibcast.c @@ -47,7 +47,7 @@ int NBC_Bcast_args_compare(NBC_Bcast_args *a, NBC_Bcast_args *b, void *param) { static int nbc_bcast_init(void *buffer, int count, MPI_Datatype datatype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res, segsize; size_t size; @@ -173,7 +173,7 @@ static int nbc_bcast_init(void *buffer, int count, MPI_Datatype datatype, int ro int ompi_coll_libnbc_ibcast(void *buffer, int count, MPI_Datatype datatype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_bcast_init(buffer, count, datatype, root, comm, request, module, false); @@ -344,7 +344,7 @@ static inline int bcast_sched_chain(int rank, int p, int root, NBC_Schedule *sch static int nbc_bcast_inter_init(void *buffer, int count, MPI_Datatype datatype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res; NBC_Schedule *schedule; ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; @@ -396,7 +396,7 @@ static int nbc_bcast_inter_init(void *buffer, int count, MPI_Datatype datatype, int ompi_coll_libnbc_ibcast_inter(void *buffer, int count, MPI_Datatype datatype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_bcast_inter_init(buffer, count, datatype, root, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -415,7 +415,7 @@ int ompi_coll_libnbc_ibcast_inter(void *buffer, int count, MPI_Datatype datatype int ompi_coll_libnbc_bcast_init(void *buffer, int count, MPI_Datatype datatype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_bcast_init(buffer, count, datatype, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -427,7 +427,7 @@ int ompi_coll_libnbc_bcast_init(void *buffer, int count, MPI_Datatype datatype, int ompi_coll_libnbc_bcast_inter_init(void *buffer, int count, MPI_Datatype datatype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_bcast_inter_init(buffer, count, datatype, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_iexscan.c b/ompi/mca/coll/libnbc/nbc_iexscan.c index 6d12666f57..7cc8c7f4e6 100644 --- a/ompi/mca/coll/libnbc/nbc_iexscan.c +++ b/ompi/mca/coll/libnbc/nbc_iexscan.c @@ -48,7 +48,7 @@ int NBC_Scan_args_compare(NBC_Scan_args *a, NBC_Scan_args *b, void *param) { */ static int nbc_exscan_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res; ptrdiff_t gap, span; NBC_Schedule *schedule; @@ -196,7 +196,7 @@ static int nbc_exscan_init(const void* sendbuf, void* recvbuf, int count, MPI_Da int ompi_coll_libnbc_iexscan(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_exscan_init(sendbuf, recvbuf, count, datatype, op, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -215,7 +215,7 @@ int ompi_coll_libnbc_iexscan(const void* sendbuf, void* recvbuf, int count, MPI_ int ompi_coll_libnbc_exscan_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_exscan_init(sendbuf, recvbuf, count, datatype, op, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_igather.c b/ompi/mca/coll/libnbc/nbc_igather.c index d897c7b95f..521d583af8 100644 --- a/ompi/mca/coll/libnbc/nbc_igather.c +++ b/ompi/mca/coll/libnbc/nbc_igather.c @@ -47,7 +47,7 @@ int NBC_Gather_args_compare(NBC_Gather_args *a, NBC_Gather_args *b, void *param) static int nbc_gather_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res; MPI_Aint rcvext = 0; NBC_Schedule *schedule; @@ -176,7 +176,7 @@ static int nbc_gather_init(const void* sendbuf, int sendcount, MPI_Datatype send int ompi_coll_libnbc_igather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_gather_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -196,7 +196,7 @@ int ompi_coll_libnbc_igather(const void* sendbuf, int sendcount, MPI_Datatype se static int nbc_gather_inter_init (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, rsize; MPI_Aint rcvext = 0; NBC_Schedule *schedule; @@ -256,7 +256,7 @@ static int nbc_gather_inter_init (const void* sendbuf, int sendcount, MPI_Dataty int ompi_coll_libnbc_igather_inter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_gather_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -276,7 +276,7 @@ int ompi_coll_libnbc_igather_inter(const void* sendbuf, int sendcount, MPI_Datat int ompi_coll_libnbc_gather_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_gather_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -289,7 +289,7 @@ int ompi_coll_libnbc_gather_init(const void* sendbuf, int sendcount, MPI_Datatyp int ompi_coll_libnbc_gather_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_gather_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_igatherv.c b/ompi/mca/coll/libnbc/nbc_igatherv.c index eac3fa65da..0fe0fbfd80 100644 --- a/ompi/mca/coll/libnbc/nbc_igatherv.c +++ b/ompi/mca/coll/libnbc/nbc_igatherv.c @@ -32,7 +32,7 @@ static int nbc_gatherv_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res; MPI_Aint rcvext = 0; NBC_Schedule *schedule; @@ -108,7 +108,7 @@ static int nbc_gatherv_init(const void* sendbuf, int sendcount, MPI_Datatype sen int ompi_coll_libnbc_igatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_gatherv_init(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -128,7 +128,7 @@ int ompi_coll_libnbc_igatherv(const void* sendbuf, int sendcount, MPI_Datatype s static int nbc_gatherv_inter_init (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, rsize; MPI_Aint rcvext; NBC_Schedule *schedule; @@ -188,7 +188,7 @@ static int nbc_gatherv_inter_init (const void* sendbuf, int sendcount, MPI_Datat int ompi_coll_libnbc_igatherv_inter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_gatherv_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm, request, module, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -208,7 +208,7 @@ int ompi_coll_libnbc_igatherv_inter(const void* sendbuf, int sendcount, MPI_Data int ompi_coll_libnbc_gatherv_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_gatherv_init(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -221,7 +221,7 @@ int ompi_coll_libnbc_gatherv_init(const void* sendbuf, int sendcount, MPI_Dataty int ompi_coll_libnbc_gatherv_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_gatherv_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c b/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c index cff0d4d956..9835b0f5a0 100644 --- a/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c +++ b/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c @@ -47,7 +47,7 @@ int NBC_Ineighbor_allgather_args_compare(NBC_Ineighbor_allgather_args *a, NBC_In static int nbc_neighbor_allgather_init(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, int rcount, MPI_Datatype rtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, indegree, outdegree, *srcs, *dsts; MPI_Aint rcvext; ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; @@ -165,7 +165,7 @@ static int nbc_neighbor_allgather_init(const void *sbuf, int scount, MPI_Datatyp int ompi_coll_libnbc_ineighbor_allgather(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, int rcount, MPI_Datatype rtype, struct ompi_communicator_t *comm, - ompi_request_t ** request, struct mca_coll_base_module_2_2_0_t *module) { + ompi_request_t ** request, struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_neighbor_allgather_init(sbuf, scount, stype, rbuf, rcount, rtype, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -335,7 +335,7 @@ static inline int bcast_sched_chain(int rank, int p, int root, NBC_Schedule *sch int ompi_coll_libnbc_neighbor_allgather_init(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, int rcount, MPI_Datatype rtype, struct ompi_communicator_t *comm, - MPI_Info info, ompi_request_t ** request, struct mca_coll_base_module_2_2_0_t *module) { + MPI_Info info, ompi_request_t ** request, struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_neighbor_allgather_init(sbuf, scount, stype, rbuf, rcount, rtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ineighbor_allgatherv.c b/ompi/mca/coll/libnbc/nbc_ineighbor_allgatherv.c index fd034bd761..649349b751 100644 --- a/ompi/mca/coll/libnbc/nbc_ineighbor_allgatherv.c +++ b/ompi/mca/coll/libnbc/nbc_ineighbor_allgatherv.c @@ -47,7 +47,7 @@ int NBC_Ineighbor_allgatherv_args_compare(NBC_Ineighbor_allgatherv_args *a, NBC_ static int nbc_neighbor_allgatherv_init(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, const int *rcounts, const int *displs, MPI_Datatype rtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, indegree, outdegree, *srcs, *dsts; MPI_Aint rcvext; ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; @@ -167,7 +167,7 @@ static int nbc_neighbor_allgatherv_init(const void *sbuf, int scount, MPI_Dataty int ompi_coll_libnbc_ineighbor_allgatherv(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, const int *rcounts, const int *displs, MPI_Datatype rtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_neighbor_allgatherv_init(sbuf, scount, stype, rbuf, rcounts, displs, rtype, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -186,7 +186,7 @@ int ompi_coll_libnbc_ineighbor_allgatherv(const void *sbuf, int scount, MPI_Data int ompi_coll_libnbc_neighbor_allgatherv_init(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, const int *rcounts, const int *displs, MPI_Datatype rtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_neighbor_allgatherv_init(sbuf, scount, stype, rbuf, rcounts, displs, rtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c b/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c index 77a4d3c22c..c24a8781bd 100644 --- a/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c +++ b/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c @@ -44,7 +44,7 @@ int NBC_Ineighbor_alltoall_args_compare(NBC_Ineighbor_alltoall_args *a, NBC_Inei static int nbc_neighbor_alltoall_init(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, int rcount, MPI_Datatype rtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, indegree, outdegree, *srcs, *dsts; MPI_Aint sndext, rcvext; ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; @@ -169,7 +169,7 @@ static int nbc_neighbor_alltoall_init(const void *sbuf, int scount, MPI_Datatype int ompi_coll_libnbc_ineighbor_alltoall(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, int rcount, MPI_Datatype rtype, struct ompi_communicator_t *comm, - ompi_request_t ** request, struct mca_coll_base_module_2_2_0_t *module) { + ompi_request_t ** request, struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_neighbor_alltoall_init(sbuf, scount, stype, rbuf, rcount, rtype, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -187,7 +187,7 @@ int ompi_coll_libnbc_ineighbor_alltoall(const void *sbuf, int scount, MPI_Dataty int ompi_coll_libnbc_neighbor_alltoall_init(const void *sbuf, int scount, MPI_Datatype stype, void *rbuf, int rcount, MPI_Datatype rtype, struct ompi_communicator_t *comm, MPI_Info info, - ompi_request_t ** request, struct mca_coll_base_module_2_2_0_t *module) { + ompi_request_t ** request, struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_neighbor_alltoall_init(sbuf, scount, stype, rbuf, rcount, rtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallv.c b/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallv.c index c7fe1ac3b7..58307dbd43 100644 --- a/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallv.c +++ b/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallv.c @@ -47,7 +47,7 @@ int NBC_Ineighbor_alltoallv_args_compare(NBC_Ineighbor_alltoallv_args *a, NBC_In static int nbc_neighbor_alltoallv_init(const void *sbuf, const int *scounts, const int *sdispls, MPI_Datatype stype, void *rbuf, const int *rcounts, const int *rdispls, MPI_Datatype rtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, indegree, outdegree, *srcs, *dsts; MPI_Aint sndext, rcvext; ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; @@ -174,7 +174,7 @@ static int nbc_neighbor_alltoallv_init(const void *sbuf, const int *scounts, con int ompi_coll_libnbc_ineighbor_alltoallv(const void *sbuf, const int *scounts, const int *sdispls, MPI_Datatype stype, void *rbuf, const int *rcounts, const int *rdispls, MPI_Datatype rtype, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_neighbor_alltoallv_init(sbuf, scounts, sdispls, stype, rbuf, rcounts, rdispls, rtype, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -193,7 +193,7 @@ int ompi_coll_libnbc_ineighbor_alltoallv(const void *sbuf, const int *scounts, c int ompi_coll_libnbc_neighbor_alltoallv_init(const void *sbuf, const int *scounts, const int *sdispls, MPI_Datatype stype, void *rbuf, const int *rcounts, const int *rdispls, MPI_Datatype rtype, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_neighbor_alltoallv_init(sbuf, scounts, sdispls, stype, rbuf, rcounts, rdispls, rtype, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallw.c b/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallw.c index 008cce4492..adc0ba3ae5 100644 --- a/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallw.c +++ b/ompi/mca/coll/libnbc/nbc_ineighbor_alltoallw.c @@ -46,7 +46,7 @@ int NBC_Ineighbor_alltoallw_args_compare(NBC_Ineighbor_alltoallw_args *a, NBC_In static int nbc_neighbor_alltoallw_init(const void *sbuf, const int *scounts, const MPI_Aint *sdisps, struct ompi_datatype_t * const *stypes, void *rbuf, const int *rcounts, const MPI_Aint *rdisps, struct ompi_datatype_t * const *rtypes, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, indegree, outdegree, *srcs, *dsts; ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; NBC_Schedule *schedule; @@ -159,7 +159,7 @@ static int nbc_neighbor_alltoallw_init(const void *sbuf, const int *scounts, con int ompi_coll_libnbc_ineighbor_alltoallw(const void *sbuf, const int *scounts, const MPI_Aint *sdisps, struct ompi_datatype_t * const *stypes, void *rbuf, const int *rcounts, const MPI_Aint *rdisps, struct ompi_datatype_t * const *rtypes, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_neighbor_alltoallw_init(sbuf, scounts, sdisps, stypes, rbuf, rcounts, rdisps, rtypes, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -178,7 +178,7 @@ int ompi_coll_libnbc_ineighbor_alltoallw(const void *sbuf, const int *scounts, c int ompi_coll_libnbc_neighbor_alltoallw_init(const void *sbuf, const int *scounts, const MPI_Aint *sdisps, struct ompi_datatype_t * const *stypes, void *rbuf, const int *rcounts, const MPI_Aint *rdisps, struct ompi_datatype_t * const *rtypes, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_neighbor_alltoallw_init(sbuf, scounts, sdisps, stypes, rbuf, rcounts, rdisps, rtypes, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ireduce.c b/ompi/mca/coll/libnbc/nbc_ireduce.c index 185571b889..d4bcb62e06 100644 --- a/ompi/mca/coll/libnbc/nbc_ireduce.c +++ b/ompi/mca/coll/libnbc/nbc_ireduce.c @@ -55,7 +55,7 @@ int NBC_Reduce_args_compare(NBC_Reduce_args *a, NBC_Reduce_args *b, void *param) /* the non-blocking reduce */ static int nbc_reduce_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res, segsize; size_t size; MPI_Aint ext; @@ -210,7 +210,7 @@ static int nbc_reduce_init(const void* sendbuf, void* recvbuf, int count, MPI_Da int ompi_coll_libnbc_ireduce(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_init(sendbuf, recvbuf, count, datatype, op, root, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -228,7 +228,7 @@ int ompi_coll_libnbc_ireduce(const void* sendbuf, void* recvbuf, int count, MPI_ static int nbc_reduce_inter_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, res, rsize; NBC_Schedule *schedule; ompi_coll_libnbc_module_t *libnbc_module = (ompi_coll_libnbc_module_t*) module; @@ -276,7 +276,7 @@ static int nbc_reduce_inter_init(const void* sendbuf, void* recvbuf, int count, int ompi_coll_libnbc_ireduce_inter(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_inter_init(sendbuf, recvbuf, count, datatype, op, root, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -562,7 +562,7 @@ static inline int red_sched_linear (int rank, int rsize, int root, const void *s int ompi_coll_libnbc_reduce_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_init(sendbuf, recvbuf, count, datatype, op, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -574,7 +574,7 @@ int ompi_coll_libnbc_reduce_init(const void* sendbuf, void* recvbuf, int count, int ompi_coll_libnbc_reduce_inter_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_inter_init(sendbuf, recvbuf, count, datatype, op, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c b/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c index 118717e938..3b318ea1d3 100644 --- a/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c +++ b/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c @@ -44,7 +44,7 @@ static int nbc_reduce_scatter_init(const void* sendbuf, void* recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int peer, rank, maxr, p, res, count; MPI_Aint ext; ptrdiff_t gap, span, span_align; @@ -211,7 +211,7 @@ static int nbc_reduce_scatter_init(const void* sendbuf, void* recvbuf, const int int ompi_coll_libnbc_ireduce_scatter (const void* sendbuf, void* recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_scatter_init(sendbuf, recvbuf, recvcounts, datatype, op, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -228,7 +228,7 @@ int ompi_coll_libnbc_ireduce_scatter (const void* sendbuf, void* recvbuf, const } static int nbc_reduce_scatter_inter_init (const void* sendbuf, void* recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, res, count, lsize, rsize; MPI_Aint ext; ptrdiff_t gap, span, span_align; @@ -353,7 +353,7 @@ static int nbc_reduce_scatter_inter_init (const void* sendbuf, void* recvbuf, co int ompi_coll_libnbc_ireduce_scatter_inter (const void* sendbuf, void* recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_scatter_inter_init(sendbuf, recvbuf, recvcounts, datatype, op, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -371,7 +371,7 @@ int ompi_coll_libnbc_ireduce_scatter_inter (const void* sendbuf, void* recvbuf, int ompi_coll_libnbc_reduce_scatter_init(const void* sendbuf, void* recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_scatter_init(sendbuf, recvbuf, recvcounts, datatype, op, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -383,7 +383,7 @@ int ompi_coll_libnbc_reduce_scatter_init(const void* sendbuf, void* recvbuf, con int ompi_coll_libnbc_reduce_scatter_inter_init(const void* sendbuf, void* recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_scatter_inter_init(sendbuf, recvbuf, recvcounts, datatype, op, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c b/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c index 07ac5d73c9..6553b44d63 100644 --- a/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c +++ b/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c @@ -42,7 +42,7 @@ static int nbc_reduce_scatter_block_init(const void* sendbuf, void* recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int peer, rank, maxr, p, res, count; MPI_Aint ext; ptrdiff_t gap, span; @@ -209,7 +209,7 @@ static int nbc_reduce_scatter_block_init(const void* sendbuf, void* recvbuf, int int ompi_coll_libnbc_ireduce_scatter_block(const void* sendbuf, void* recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_scatter_block_init(sendbuf, recvbuf, recvcount, datatype, op, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -227,7 +227,7 @@ int ompi_coll_libnbc_ireduce_scatter_block(const void* sendbuf, void* recvbuf, i static int nbc_reduce_scatter_block_inter_init(const void *sendbuf, void *recvbuf, int rcount, struct ompi_datatype_t *dtype, struct ompi_op_t *op, struct ompi_communicator_t *comm, ompi_request_t **request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, res, count, lsize, rsize; MPI_Aint ext; ptrdiff_t gap, span, span_align; @@ -348,7 +348,7 @@ static int nbc_reduce_scatter_block_inter_init(const void *sendbuf, void *recvbu int ompi_coll_libnbc_ireduce_scatter_block_inter(const void* sendbuf, void* recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_scatter_block_inter_init(sendbuf, recvbuf, recvcount, datatype, op, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -366,7 +366,7 @@ int ompi_coll_libnbc_ireduce_scatter_block_inter(const void* sendbuf, void* recv int ompi_coll_libnbc_reduce_scatter_block_init(const void* sendbuf, void* recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_scatter_block_init(sendbuf, recvbuf, recvcount, datatype, op, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -378,7 +378,7 @@ int ompi_coll_libnbc_reduce_scatter_block_init(const void* sendbuf, void* recvbu int ompi_coll_libnbc_reduce_scatter_block_inter_init(const void* sendbuf, void* recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_reduce_scatter_block_inter_init(sendbuf, recvbuf, recvcount, datatype, op, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_iscan.c b/ompi/mca/coll/libnbc/nbc_iscan.c index 43199bcdf0..4d4f3677b7 100644 --- a/ompi/mca/coll/libnbc/nbc_iscan.c +++ b/ompi/mca/coll/libnbc/nbc_iscan.c @@ -48,7 +48,7 @@ int NBC_Scan_args_compare(NBC_Scan_args *a, NBC_Scan_args *b, void *param) { */ static int nbc_scan_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res; ptrdiff_t gap, span; NBC_Schedule *schedule; @@ -174,7 +174,7 @@ static int nbc_scan_init(const void* sendbuf, void* recvbuf, int count, MPI_Data int ompi_coll_libnbc_iscan(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_scan_init(sendbuf, recvbuf, count, datatype, op, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -192,7 +192,7 @@ int ompi_coll_libnbc_iscan(const void* sendbuf, void* recvbuf, int count, MPI_Da int ompi_coll_libnbc_scan_init(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_scan_init(sendbuf, recvbuf, count, datatype, op, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_iscatter.c b/ompi/mca/coll/libnbc/nbc_iscatter.c index a0b0169636..a7bbb42b66 100644 --- a/ompi/mca/coll/libnbc/nbc_iscatter.c +++ b/ompi/mca/coll/libnbc/nbc_iscatter.c @@ -48,7 +48,7 @@ int NBC_Scatter_args_compare(NBC_Scatter_args *a, NBC_Scatter_args *b, void *par static int nbc_scatter_init (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res; MPI_Aint sndext = 0; NBC_Schedule *schedule; @@ -171,7 +171,7 @@ static int nbc_scatter_init (const void* sendbuf, int sendcount, MPI_Datatype se int ompi_coll_libnbc_iscatter (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_scatter_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -190,7 +190,7 @@ int ompi_coll_libnbc_iscatter (const void* sendbuf, int sendcount, MPI_Datatype static int nbc_scatter_inter_init (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, rsize; MPI_Aint sndext; NBC_Schedule *schedule; @@ -250,7 +250,7 @@ static int nbc_scatter_inter_init (const void* sendbuf, int sendcount, MPI_Datat int ompi_coll_libnbc_iscatter_inter (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_scatter_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -269,7 +269,7 @@ int ompi_coll_libnbc_iscatter_inter (const void* sendbuf, int sendcount, MPI_Dat int ompi_coll_libnbc_scatter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_scatter_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -282,7 +282,7 @@ int ompi_coll_libnbc_scatter_init(const void* sendbuf, int sendcount, MPI_Dataty int ompi_coll_libnbc_scatter_inter_init(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_scatter_inter_init(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/libnbc/nbc_iscatterv.c b/ompi/mca/coll/libnbc/nbc_iscatterv.c index 17da0ae8ff..e9f8ba7394 100644 --- a/ompi/mca/coll/libnbc/nbc_iscatterv.c +++ b/ompi/mca/coll/libnbc/nbc_iscatterv.c @@ -31,7 +31,7 @@ static int nbc_scatterv_init(const void* sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int rank, p, res; MPI_Aint sndext; NBC_Schedule *schedule; @@ -106,7 +106,7 @@ static int nbc_scatterv_init(const void* sendbuf, const int *sendcounts, const i int ompi_coll_libnbc_iscatterv(const void* sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_scatterv_init(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -125,7 +125,7 @@ int ompi_coll_libnbc_iscatterv(const void* sendbuf, const int *sendcounts, const static int nbc_scatterv_inter_init (const void* sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module, bool persistent) { + struct mca_coll_base_module_2_3_0_t *module, bool persistent) { int res, rsize; MPI_Aint sndext; NBC_Schedule *schedule; @@ -184,7 +184,7 @@ static int nbc_scatterv_inter_init (const void* sendbuf, const int *sendcounts, int ompi_coll_libnbc_iscatterv_inter(const void* sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_scatterv_inter_init(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, false); if (OPAL_LIKELY(OMPI_SUCCESS != res)) { @@ -203,7 +203,7 @@ int ompi_coll_libnbc_iscatterv_inter(const void* sendbuf, const int *sendcounts, int ompi_coll_libnbc_scatterv_init(const void* sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_scatterv_init(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -216,7 +216,7 @@ int ompi_coll_libnbc_scatterv_init(const void* sendbuf, const int *sendcounts, c int ompi_coll_libnbc_scatterv_inter_init(const void* sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, struct ompi_communicator_t *comm, MPI_Info info, ompi_request_t ** request, - struct mca_coll_base_module_2_2_0_t *module) { + struct mca_coll_base_module_2_3_0_t *module) { int res = nbc_scatterv_inter_init(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, request, module, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff --git a/ompi/mca/coll/portals4/coll_portals4.h b/ompi/mca/coll/portals4/coll_portals4.h index e1cbfc2bd7..175c951e81 100644 --- a/ompi/mca/coll/portals4/coll_portals4.h +++ b/ompi/mca/coll/portals4/coll_portals4.h @@ -206,18 +206,18 @@ int ompi_coll_portals4_ireduce_intra(const void* sendbuf, void* recvbuf, int cou int root, struct ompi_communicator_t *comm, ompi_request_t ** ompi_request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_portals4_ireduce_intra_fini(struct ompi_coll_portals4_request_t *request); int ompi_coll_portals4_allreduce_intra(const void* sendbuf, void* recvbuf, int count, MPI_Datatype dtype, MPI_Op op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_portals4_iallreduce_intra(const void* sendbuf, void* recvbuf, int count, MPI_Datatype dtype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** ompi_request, - struct mca_coll_base_module_2_2_0_t *module); + struct mca_coll_base_module_2_3_0_t *module); int ompi_coll_portals4_iallreduce_intra_fini(struct ompi_coll_portals4_request_t *request); diff --git a/ompi/mca/coll/portals4/coll_portals4_allreduce.c b/ompi/mca/coll/portals4/coll_portals4_allreduce.c index 56f1ea3062..fe0250defd 100644 --- a/ompi/mca/coll/portals4/coll_portals4_allreduce.c +++ b/ompi/mca/coll/portals4/coll_portals4_allreduce.c @@ -360,7 +360,7 @@ allreduce_kary_tree_bottom(ompi_coll_portals4_request_t *request) int ompi_coll_portals4_allreduce_intra(const void* sendbuf, void* recvbuf, int count, MPI_Datatype dtype, MPI_Op op, struct ompi_communicator_t *comm, - struct mca_coll_base_module_2_2_0_t *module) + struct mca_coll_base_module_2_3_0_t *module) { mca_coll_portals4_module_t *portals4_module = (mca_coll_portals4_module_t*) module; ompi_coll_portals4_request_t *request; @@ -390,7 +390,7 @@ int ompi_coll_portals4_iallreduce_intra(const void* sendbuf, void* recvbuf, int MPI_Datatype dtype, MPI_Op op, struct ompi_communicator_t *comm, ompi_request_t ** ompi_request, - struct mca_coll_base_module_2_2_0_t *module) + struct mca_coll_base_module_2_3_0_t *module) { mca_coll_portals4_module_t *portals4_module = (mca_coll_portals4_module_t*) module; ompi_coll_portals4_request_t *request; diff --git a/ompi/mca/coll/portals4/coll_portals4_barrier.c b/ompi/mca/coll/portals4/coll_portals4_barrier.c index f2544ce0cd..b40c1f9256 100644 --- a/ompi/mca/coll/portals4/coll_portals4_barrier.c +++ b/ompi/mca/coll/portals4/coll_portals4_barrier.c @@ -269,7 +269,7 @@ ompi_coll_portals4_barrier_intra(struct ompi_communicator_t *comm, int ompi_coll_portals4_ibarrier_intra(struct ompi_communicator_t *comm, ompi_request_t **ompi_req, - struct mca_coll_base_module_2_2_0_t *module) + struct mca_coll_base_module_2_3_0_t *module) { int ret; mca_coll_portals4_module_t *portals4_module = (mca_coll_portals4_module_t*) module; diff --git a/ompi/mca/coll/portals4/coll_portals4_reduce.c b/ompi/mca/coll/portals4/coll_portals4_reduce.c index 2fdb36b739..798a1fa17e 100644 --- a/ompi/mca/coll/portals4/coll_portals4_reduce.c +++ b/ompi/mca/coll/portals4/coll_portals4_reduce.c @@ -402,7 +402,7 @@ ompi_coll_portals4_ireduce_intra(const void* sendbuf, void* recvbuf, int count, int root, struct ompi_communicator_t *comm, ompi_request_t ** ompi_request, - struct mca_coll_base_module_2_2_0_t *module) + struct mca_coll_base_module_2_3_0_t *module) { int ret; mca_coll_portals4_module_t *portals4_module = (mca_coll_portals4_module_t*) module;