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

Sigh - remove debug

Просмотр исходного кода 
Signed-off-by: Ralph Castain <rhc@open-mpi.org>
Этот коммит содержится в:
Ralph Castain 2017-05-10 11:26:42 -07:00
родитель 2d93d15aa7
Коммит 911961ee21
2 изменённых файлов: 0 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
orte/mca/rmaps/round_robin/rmaps_rr.c
Просмотреть файл

@ -108,7 +108,6 @@ static int orte_rmaps_rr_map(orte_job_t *jdata)
orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:multi-apps-and-zero-np", orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:multi-apps-and-zero-np",
true, jdata->num_apps, NULL); true, jdata->num_apps, NULL);
rc = ORTE_ERR_SILENT; rc = ORTE_ERR_SILENT;
opal_output(0, "RMAPS RR FAILING: %s:%d", __FILE__, __LINE__);
goto error; goto error;
} }
@ -119,7 +118,6 @@ static int orte_rmaps_rr_map(orte_job_t *jdata)
if(ORTE_SUCCESS != (rc = orte_rmaps_base_get_target_nodes(&node_list, &num_slots, app, if(ORTE_SUCCESS != (rc = orte_rmaps_base_get_target_nodes(&node_list, &num_slots, app,
jdata->map->mapping, initial_map, false))) { jdata->map->mapping, initial_map, false))) {
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
opal_output(0, "RMAPS RR FAILING: %s:%d", __FILE__, __LINE__);
goto error; goto error;
} }
/* flag that all subsequent requests should not reset the node->mapped flag */ /* flag that all subsequent requests should not reset the node->mapped flag */
@ -238,12 +236,10 @@ static int orte_rmaps_rr_map(orte_job_t *jdata)
true, "mapping", true, "mapping",
orte_rmaps_base_print_mapping(jdata->map->mapping)); orte_rmaps_base_print_mapping(jdata->map->mapping));
rc = ORTE_ERR_SILENT; rc = ORTE_ERR_SILENT;
opal_output(0, "RMAPS RR FAILING: %s:%d", __FILE__, __LINE__);
goto error; goto error;
} }
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
opal_output(0, "RMAPS RR FAILING: %s:%d", __FILE__, __LINE__);
goto error; goto error;
} }
@ -253,7 +249,6 @@ static int orte_rmaps_rr_map(orte_job_t *jdata)
*/ */
if (ORTE_SUCCESS != (rc = orte_rmaps_base_compute_vpids(jdata, app, &node_list))) { if (ORTE_SUCCESS != (rc = orte_rmaps_base_compute_vpids(jdata, app, &node_list))) {
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
opal_output(0, "RMAPS RR FAILING: %s:%d", __FILE__, __LINE__);
return rc; return rc;
} }
@ -275,7 +270,6 @@ static int orte_rmaps_rr_map(orte_job_t *jdata)
return ORTE_SUCCESS; return ORTE_SUCCESS;
error: error:
opal_output(0, "RMAPS RR FAILING: %s:%d", __FILE__, __LINE__);
while(NULL != (item = opal_list_remove_first(&node_list))) { while(NULL != (item = opal_list_remove_first(&node_list))) {
OBJ_RELEASE(item); OBJ_RELEASE(item);
} }
@ -287,4 +281,3 @@ static int orte_rmaps_rr_map(orte_job_t *jdata)
orte_rmaps_base_module_t orte_rmaps_round_robin_module = { orte_rmaps_base_module_t orte_rmaps_round_robin_module = {
orte_rmaps_rr_map orte_rmaps_rr_map
}; };

9
orte/mca/rmaps/round_robin/rmaps_rr_mappers.c
Просмотреть файл

@ -493,7 +493,6 @@ int orte_rmaps_rr_byobj(orte_job_t *jdata,
orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:alloc-error", orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:alloc-error",
true, app->num_procs, app->app, orte_process_info.nodename); true, app->num_procs, app->app, orte_process_info.nodename);
ORTE_UPDATE_EXIT_STATUS(ORTE_ERROR_DEFAULT_EXIT_CODE); ORTE_UPDATE_EXIT_STATUS(ORTE_ERROR_DEFAULT_EXIT_CODE);
opal_output(0, "RMAPS RR NO-SPAN FAILING: %s:%d", __FILE__, __LINE__);
return ORTE_ERR_SILENT; return ORTE_ERR_SILENT;
} }
} }
@ -511,7 +510,6 @@ int orte_rmaps_rr_byobj(orte_job_t *jdata,
if (NULL == node->topology || NULL == node->topology->topo) { if (NULL == node->topology || NULL == node->topology->topo) {
orte_show_help("help-orte-rmaps-ppr.txt", "ppr-topo-missing", orte_show_help("help-orte-rmaps-ppr.txt", "ppr-topo-missing",
true, node->name); true, node->name);
opal_output(0, "RMAPS RR NO-SPAN FAILING: %s:%d", __FILE__, __LINE__);
return ORTE_ERR_SILENT; return ORTE_ERR_SILENT;
} }
start = 0; start = 0;
@ -550,7 +548,6 @@ int orte_rmaps_rr_byobj(orte_job_t *jdata,
/* add this node to the map, if reqd */ /* add this node to the map, if reqd */
if (!ORTE_FLAG_TEST(node, ORTE_NODE_FLAG_MAPPED)) { if (!ORTE_FLAG_TEST(node, ORTE_NODE_FLAG_MAPPED)) {
if (ORTE_SUCCESS > (idx = opal_pointer_array_add(jdata->map->nodes, (void*)node))) { if (ORTE_SUCCESS > (idx = opal_pointer_array_add(jdata->map->nodes, (void*)node))) {
opal_output(0, "RMAPS RR NO-SPAN FAILING: %s:%d", __FILE__, __LINE__);
ORTE_ERROR_LOG(idx); ORTE_ERROR_LOG(idx);
return idx; return idx;
} }
@ -569,18 +566,15 @@ int orte_rmaps_rr_byobj(orte_job_t *jdata,
/* get the hwloc object */ /* get the hwloc object */
if (NULL == (obj = opal_hwloc_base_get_obj_by_type(node->topology->topo, target, cache_level, (i+start) % nobjs, OPAL_HWLOC_AVAILABLE))) { if (NULL == (obj = opal_hwloc_base_get_obj_by_type(node->topology->topo, target, cache_level, (i+start) % nobjs, OPAL_HWLOC_AVAILABLE))) {
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND); ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
opal_output(0, "RMAPS RR NO-SPAN FAILING: %s:%d", __FILE__, __LINE__);
return ORTE_ERR_NOT_FOUND; return ORTE_ERR_NOT_FOUND;
} }
if (orte_rmaps_base.cpus_per_rank > (int)opal_hwloc_base_get_npus(node->topology->topo, obj)) { if (orte_rmaps_base.cpus_per_rank > (int)opal_hwloc_base_get_npus(node->topology->topo, obj)) {
orte_show_help("help-orte-rmaps-base.txt", "mapping-too-low", true, orte_show_help("help-orte-rmaps-base.txt", "mapping-too-low", true,
orte_rmaps_base.cpus_per_rank, opal_hwloc_base_get_npus(node->topology->topo, obj), orte_rmaps_base.cpus_per_rank, opal_hwloc_base_get_npus(node->topology->topo, obj),
orte_rmaps_base_print_mapping(orte_rmaps_base.mapping)); orte_rmaps_base_print_mapping(orte_rmaps_base.mapping));
opal_output(0, "RMAPS RR NO-SPAN FAILING: %s:%d", __FILE__, __LINE__);
return ORTE_ERR_SILENT; return ORTE_ERR_SILENT;
} }
if (NULL == (proc = orte_rmaps_base_setup_proc(jdata, node, app->idx))) { if (NULL == (proc = orte_rmaps_base_setup_proc(jdata, node, app->idx))) {
opal_output(0, "RMAPS RR NO-SPAN FAILING: %s:%d", __FILE__, __LINE__);
return ORTE_ERR_OUT_OF_RESOURCE; return ORTE_ERR_OUT_OF_RESOURCE;
} }
nprocs_mapped++; nprocs_mapped++;
@ -607,14 +601,12 @@ int orte_rmaps_rr_byobj(orte_job_t *jdata,
orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:alloc-error", orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:alloc-error",
true, app->num_procs, app->app, orte_process_info.nodename); true, app->num_procs, app->app, orte_process_info.nodename);
ORTE_UPDATE_EXIT_STATUS(ORTE_ERROR_DEFAULT_EXIT_CODE); ORTE_UPDATE_EXIT_STATUS(ORTE_ERROR_DEFAULT_EXIT_CODE);
opal_output(0, "RMAPS RR NO-SPAN FAILING: %s:%d", __FILE__, __LINE__);
return ORTE_ERR_SILENT; return ORTE_ERR_SILENT;
} else if (ORTE_MAPPING_NO_OVERSUBSCRIBE & ORTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping)) { } else if (ORTE_MAPPING_NO_OVERSUBSCRIBE & ORTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping)) {
/* if we were explicitly told not to oversubscribe, then don't */ /* if we were explicitly told not to oversubscribe, then don't */
orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:alloc-error", orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:alloc-error",
true, app->num_procs, app->app, orte_process_info.nodename); true, app->num_procs, app->app, orte_process_info.nodename);
ORTE_UPDATE_EXIT_STATUS(ORTE_ERROR_DEFAULT_EXIT_CODE); ORTE_UPDATE_EXIT_STATUS(ORTE_ERROR_DEFAULT_EXIT_CODE);
opal_output(0, "RMAPS RR NO-SPAN FAILING: %s:%d", __FILE__, __LINE__);
return ORTE_ERR_SILENT; return ORTE_ERR_SILENT;
} }
} }
@ -629,7 +621,6 @@ int orte_rmaps_rr_byobj(orte_job_t *jdata,
if (nprocs_mapped < app->num_procs) { if (nprocs_mapped < app->num_procs) {
/* usually means there were no objects of the requested type */ /* usually means there were no objects of the requested type */
opal_output(0, "RMAPS RR NO-SPAN FAILING: %s:%d", __FILE__, __LINE__);
return ORTE_ERR_NOT_FOUND; return ORTE_ERR_NOT_FOUND;
} }