1
1

Per the telecon, silence the warning for 1.7.5 to give us time to consider a better permanent solution

Refs trac:4339

This commit was SVN r30941.

The following Trac tickets were found above:
  Ticket 4339 --> https://svn.open-mpi.org/trac/ompi/ticket/4339
Этот коммит содержится в:
Ralph Castain 2014-03-05 03:02:29 +00:00
родитель 50c30d62ca
Коммит a2b539c763

Просмотреть файл

@ -70,9 +70,9 @@ int orte_rmaps_rr_byslot(orte_job_t *jdata,
if ((OPAL_BIND_TO_CORE == OPAL_GET_BINDING_POLICY(jdata->map->binding) ||
OPAL_BIND_TO_HWTHREAD == OPAL_GET_BINDING_POLICY(jdata->map->binding)) &&
!OPAL_BIND_OVERLOAD_ALLOWED(jdata->map->binding)){
orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:oversubscribed",
/* orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:oversubscribed",
true, num_slots, app->num_procs * orte_rmaps_base.cpus_per_rank);
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE);
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE); */
}
} else {
/* don't default to bound */
@ -254,9 +254,9 @@ int orte_rmaps_rr_bynode(orte_job_t *jdata,
if ((OPAL_BIND_TO_CORE == OPAL_GET_BINDING_POLICY(jdata->map->binding) ||
OPAL_BIND_TO_HWTHREAD == OPAL_GET_BINDING_POLICY(jdata->map->binding)) &&
!OPAL_BIND_OVERLOAD_ALLOWED(jdata->map->binding)){
orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:oversubscribed",
/* orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:oversubscribed",
true, num_slots, app->num_procs * orte_rmaps_base.cpus_per_rank);
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE);
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE); */
}
} else {
/* don't default to bound */
@ -510,9 +510,9 @@ int orte_rmaps_rr_byobj(orte_job_t *jdata,
if ((OPAL_BIND_TO_CORE == OPAL_GET_BINDING_POLICY(jdata->map->binding) ||
OPAL_BIND_TO_HWTHREAD == OPAL_GET_BINDING_POLICY(jdata->map->binding)) &&
!OPAL_BIND_OVERLOAD_ALLOWED(jdata->map->binding)){
orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:oversubscribed",
/* orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:oversubscribed",
true, num_slots, app->num_procs * orte_rmaps_base.cpus_per_rank);
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE);
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE); */
}
} else {
/* don't default to bound */
@ -655,9 +655,9 @@ static int byobj_span(orte_job_t *jdata,
if ((OPAL_BIND_TO_CORE == OPAL_GET_BINDING_POLICY(jdata->map->binding) ||
OPAL_BIND_TO_HWTHREAD == OPAL_GET_BINDING_POLICY(jdata->map->binding)) &&
!OPAL_BIND_OVERLOAD_ALLOWED(jdata->map->binding)){
orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:oversubscribed",
/* orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:oversubscribed",
true, num_slots, app->num_procs * orte_rmaps_base.cpus_per_rank);
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE);
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE); */
}
} else {
/* don't default to bound */