If the user asked for dynamic rules but "forget" to provide them, nicely
complain and switch back to the default behavior (fixed rules). This commit was SVN r22109.
Этот коммит содержится в:
George Bosilca
родитель
941b8722b4
Коммит
3a2f071018
@ -91,45 +91,26 @@ ompi_coll_tuned_comm_query(struct ompi_communicator_t *comm, int *priority)
|
|||||||
tuned_module->super.coll_module_enable = tuned_module_enable;
|
tuned_module->super.coll_module_enable = tuned_module_enable;
|
||||||
tuned_module->super.ft_event = mca_coll_tuned_ft_event;
|
tuned_module->super.ft_event = mca_coll_tuned_ft_event;
|
||||||
|
|
||||||
if (ompi_coll_tuned_use_dynamic_rules) {
|
/* By default stick with the fied version of the tuned collectives. Later on,
|
||||||
OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_query using intra_dynamic"));
|
* when the module get enabled, set the correct version based on the availability
|
||||||
|
* of the dynamic rules.
|
||||||
tuned_module->super.coll_allgather = ompi_coll_tuned_allgather_intra_dec_dynamic;
|
*/
|
||||||
tuned_module->super.coll_allgatherv = ompi_coll_tuned_allgatherv_intra_dec_dynamic;
|
tuned_module->super.coll_allgather = ompi_coll_tuned_allgather_intra_dec_fixed;
|
||||||
tuned_module->super.coll_allreduce = ompi_coll_tuned_allreduce_intra_dec_dynamic;
|
tuned_module->super.coll_allgatherv = ompi_coll_tuned_allgatherv_intra_dec_fixed;
|
||||||
tuned_module->super.coll_alltoall = ompi_coll_tuned_alltoall_intra_dec_dynamic;
|
tuned_module->super.coll_allreduce = ompi_coll_tuned_allreduce_intra_dec_fixed;
|
||||||
tuned_module->super.coll_alltoallv = ompi_coll_tuned_alltoallv_intra_dec_dynamic;
|
tuned_module->super.coll_alltoall = ompi_coll_tuned_alltoall_intra_dec_fixed;
|
||||||
tuned_module->super.coll_alltoallw = NULL;
|
tuned_module->super.coll_alltoallv = ompi_coll_tuned_alltoallv_intra_dec_fixed;
|
||||||
tuned_module->super.coll_barrier = ompi_coll_tuned_barrier_intra_dec_dynamic;
|
tuned_module->super.coll_alltoallw = NULL;
|
||||||
tuned_module->super.coll_bcast = ompi_coll_tuned_bcast_intra_dec_dynamic;
|
tuned_module->super.coll_barrier = ompi_coll_tuned_barrier_intra_dec_fixed;
|
||||||
tuned_module->super.coll_exscan = NULL;
|
tuned_module->super.coll_bcast = ompi_coll_tuned_bcast_intra_dec_fixed;
|
||||||
tuned_module->super.coll_gather = ompi_coll_tuned_gather_intra_dec_dynamic;
|
tuned_module->super.coll_exscan = NULL;
|
||||||
tuned_module->super.coll_gatherv = NULL;
|
tuned_module->super.coll_gather = ompi_coll_tuned_gather_intra_dec_fixed;
|
||||||
tuned_module->super.coll_reduce = ompi_coll_tuned_reduce_intra_dec_dynamic;
|
tuned_module->super.coll_gatherv = NULL;
|
||||||
tuned_module->super.coll_reduce_scatter = ompi_coll_tuned_reduce_scatter_intra_dec_dynamic;
|
tuned_module->super.coll_reduce = ompi_coll_tuned_reduce_intra_dec_fixed;
|
||||||
tuned_module->super.coll_scan = NULL;
|
tuned_module->super.coll_reduce_scatter = ompi_coll_tuned_reduce_scatter_intra_dec_fixed;
|
||||||
tuned_module->super.coll_scatter = ompi_coll_tuned_scatter_intra_dec_dynamic;
|
tuned_module->super.coll_scan = NULL;
|
||||||
tuned_module->super.coll_scatterv = NULL;
|
tuned_module->super.coll_scatter = ompi_coll_tuned_scatter_intra_dec_fixed;
|
||||||
} else {
|
tuned_module->super.coll_scatterv = NULL;
|
||||||
OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_query using intra_fixed"));
|
|
||||||
|
|
||||||
tuned_module->super.coll_allgather = ompi_coll_tuned_allgather_intra_dec_fixed;
|
|
||||||
tuned_module->super.coll_allgatherv = ompi_coll_tuned_allgatherv_intra_dec_fixed;
|
|
||||||
tuned_module->super.coll_allreduce = ompi_coll_tuned_allreduce_intra_dec_fixed;
|
|
||||||
tuned_module->super.coll_alltoall = ompi_coll_tuned_alltoall_intra_dec_fixed;
|
|
||||||
tuned_module->super.coll_alltoallv = ompi_coll_tuned_alltoallv_intra_dec_fixed;
|
|
||||||
tuned_module->super.coll_alltoallw = NULL;
|
|
||||||
tuned_module->super.coll_barrier = ompi_coll_tuned_barrier_intra_dec_fixed;
|
|
||||||
tuned_module->super.coll_bcast = ompi_coll_tuned_bcast_intra_dec_fixed;
|
|
||||||
tuned_module->super.coll_exscan = NULL;
|
|
||||||
tuned_module->super.coll_gather = ompi_coll_tuned_gather_intra_dec_fixed;
|
|
||||||
tuned_module->super.coll_gatherv = NULL;
|
|
||||||
tuned_module->super.coll_reduce = ompi_coll_tuned_reduce_intra_dec_fixed;
|
|
||||||
tuned_module->super.coll_reduce_scatter = ompi_coll_tuned_reduce_scatter_intra_dec_fixed;
|
|
||||||
tuned_module->super.coll_scan = NULL;
|
|
||||||
tuned_module->super.coll_scatter = ompi_coll_tuned_scatter_intra_dec_fixed;
|
|
||||||
tuned_module->super.coll_scatterv = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return &(tuned_module->super);
|
return &(tuned_module->super);
|
||||||
}
|
}
|
||||||
@ -225,6 +206,8 @@ tuned_module_enable( mca_coll_base_module_t *module,
|
|||||||
|
|
||||||
/* if using dynamic rules make sure all overrides are NULL before we start override anything accidently */
|
/* if using dynamic rules make sure all overrides are NULL before we start override anything accidently */
|
||||||
if (ompi_coll_tuned_use_dynamic_rules) {
|
if (ompi_coll_tuned_use_dynamic_rules) {
|
||||||
|
int has_dynamic_rules = 0;
|
||||||
|
|
||||||
OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init MCW & Dynamic"));
|
OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init MCW & Dynamic"));
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -253,10 +236,39 @@ tuned_module_enable( mca_coll_base_module_t *module,
|
|||||||
for( i = 0; i < COLLCOUNT; i++ ) {
|
for( i = 0; i < COLLCOUNT; i++ ) {
|
||||||
data->com_rules[i] = ompi_coll_tuned_get_com_rule_ptr( mca_coll_tuned_component.all_base_rules,
|
data->com_rules[i] = ompi_coll_tuned_get_com_rule_ptr( mca_coll_tuned_component.all_base_rules,
|
||||||
i, size );
|
i, size );
|
||||||
|
if( NULL != data->com_rules[i] ) {
|
||||||
|
has_dynamic_rules++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if( 0 == has_dynamic_rules ) {
|
||||||
|
/* no real dynamic rules available. Switch back
|
||||||
|
* to default.
|
||||||
|
*/
|
||||||
|
ompi_coll_tuned_use_dynamic_rules = 0;
|
||||||
|
OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:module_enable switch back to fixed"
|
||||||
|
" decision by lack of dynamic rules"));
|
||||||
|
} else {
|
||||||
|
OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_enable using intra_dynamic"));
|
||||||
|
tuned_module->super.coll_allgather = ompi_coll_tuned_allgather_intra_dec_dynamic;
|
||||||
|
tuned_module->super.coll_allgatherv = ompi_coll_tuned_allgatherv_intra_dec_dynamic;
|
||||||
|
tuned_module->super.coll_allreduce = ompi_coll_tuned_allreduce_intra_dec_dynamic;
|
||||||
|
tuned_module->super.coll_alltoall = ompi_coll_tuned_alltoall_intra_dec_dynamic;
|
||||||
|
tuned_module->super.coll_alltoallv = ompi_coll_tuned_alltoallv_intra_dec_dynamic;
|
||||||
|
tuned_module->super.coll_alltoallw = NULL;
|
||||||
|
tuned_module->super.coll_barrier = ompi_coll_tuned_barrier_intra_dec_dynamic;
|
||||||
|
tuned_module->super.coll_bcast = ompi_coll_tuned_bcast_intra_dec_dynamic;
|
||||||
|
tuned_module->super.coll_exscan = NULL;
|
||||||
|
tuned_module->super.coll_gather = ompi_coll_tuned_gather_intra_dec_dynamic;
|
||||||
|
tuned_module->super.coll_gatherv = NULL;
|
||||||
|
tuned_module->super.coll_reduce = ompi_coll_tuned_reduce_intra_dec_dynamic;
|
||||||
|
tuned_module->super.coll_reduce_scatter = ompi_coll_tuned_reduce_scatter_intra_dec_dynamic;
|
||||||
|
tuned_module->super.coll_scan = NULL;
|
||||||
|
tuned_module->super.coll_scatter = ompi_coll_tuned_scatter_intra_dec_dynamic;
|
||||||
|
tuned_module->super.coll_scatterv = NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* general n fan out tree */
|
/* general n fan out tree */
|
||||||
data->cached_ntree = NULL;
|
data->cached_ntree = NULL;
|
||||||
/* binary tree */
|
/* binary tree */
|
||||||
|
|||||||
Загрузка…
x
Ссылка в новой задаче
Block a user