ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

coll/ml: move error messages to verbose output

Просмотр исходного кода 
There are situations where coll/ml does not initialize properly. These will
eventually need to be fixed but in the meantime it is better to not always
print an error message because the collective framework can still fall back
on another collective module. This commit reduces the verbose output.

cmr=v1.7.5:reviewer=manjugv

This commit was SVN r31129.
Этот коммит содержится в:
Nathan Hjelm 2014-03-18 21:26:10 +00:00
родитель 97d7315dd2
Коммит d9c8bf3785
1 изменённых файлов: 7 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
ompi/mca/coll/ml/coll_ml_module.c
Просмотреть файл

@ -578,7 +578,7 @@ static int check_global_view_of_subgroups( int n_procs_selected,
/* more than one local leader - don't know how to /* more than one local leader - don't know how to
* handle this, so bail * handle this, so bail
*/ */
ML_VERBOSE(0, ("More than a single leader for a group.")); ML_VERBOSE(1, ("More than a single leader for a group."));
ret=OMPI_ERROR; ret=OMPI_ERROR;
goto exit_ERROR; goto exit_ERROR;
} else { } else {
@ -599,7 +599,7 @@ static int check_global_view_of_subgroups( int n_procs_selected,
} }
} }
if( sum != n_procs_selected ) { if( sum != n_procs_selected ) {
ML_VERBOSE(0, ("number of procs in the group unexpected. Expected %d Got %d",n_procs_selected,sum)); ML_VERBOSE(1, ("number of procs in the group unexpected. Expected %d Got %d",n_procs_selected,sum));
ret=OMPI_ERROR; ret=OMPI_ERROR;
goto exit_ERROR; goto exit_ERROR;
} }
@ -609,7 +609,7 @@ static int check_global_view_of_subgroups( int n_procs_selected,
if(ll_p1!=all_selected[module->group_list[i]] && if(ll_p1!=all_selected[module->group_list[i]] &&
ll_p1!=-all_selected[module->group_list[i]] ) { ll_p1!=-all_selected[module->group_list[i]] ) {
ret=OMPI_ERROR; ret=OMPI_ERROR;
ML_VERBOSE(0, ("Mismatch in rank list - element #%d - %d ",i,all_selected[module->group_list[i]])); ML_VERBOSE(1, ("Mismatch in rank list - element #%d - %d ",i,all_selected[module->group_list[i]]));
goto exit_ERROR; goto exit_ERROR;
} }
} }
@ -3006,14 +3006,14 @@ mca_coll_ml_comm_query(struct ompi_communicator_t *comm, int *priority)
*/ */
ret = ml_discover_hierarchy(ml_module); ret = ml_discover_hierarchy(ml_module);
if (OMPI_SUCCESS != ret) { if (OMPI_SUCCESS != ret) {
ML_ERROR(("ml_discover_hierarchy exited with error.")); ML_VERBOSE(1, ("ml_discover_hierarchy exited with error."));
goto CLEANUP; goto CLEANUP;
} }
/* gvm Disabled for debuggin */ /* gvm Disabled for debuggin */
ret = mca_coll_ml_build_filtered_fn_table(ml_module); ret = mca_coll_ml_build_filtered_fn_table(ml_module);
if (OMPI_SUCCESS != ret) { if (OMPI_SUCCESS != ret) {
ML_ERROR(("mca_coll_ml_build_filtered_fn_table returned an error.")); ML_VERBOSE(1, ("mca_coll_ml_build_filtered_fn_table returned an error."));
goto CLEANUP; goto CLEANUP;
} }
@ -3027,7 +3027,7 @@ mca_coll_ml_comm_query(struct ompi_communicator_t *comm, int *priority)
ML_VERBOSE(10, ("Call for setup schedule.")); ML_VERBOSE(10, ("Call for setup schedule."));
ret = ml_coll_schedule_setup(ml_module); ret = ml_coll_schedule_setup(ml_module);
if (OMPI_SUCCESS != ret) { if (OMPI_SUCCESS != ret) {
ML_ERROR(("ml_coll_schedule_setup exit with error")); ML_VERBOSE(1, ("ml_coll_schedule_setup exit with error"));
goto CLEANUP; goto CLEANUP;
} }
@ -3035,7 +3035,7 @@ mca_coll_ml_comm_query(struct ompi_communicator_t *comm, int *priority)
ML_VERBOSE(10, ("Setup bcast table")); ML_VERBOSE(10, ("Setup bcast table"));
ret = setup_bcast_table(ml_module); ret = setup_bcast_table(ml_module);
if (OMPI_SUCCESS != ret) { if (OMPI_SUCCESS != ret) {
ML_ERROR(("setup_bcast_table exit with error")); ML_VERBOSE(1, ("setup_bcast_table exit with error"));
goto CLEANUP; goto CLEANUP;
} }