Repair builds without hwloc
cmr=v1.7.5:reviewer=jsquyres This commit was SVN r30940.
Этот коммит содержится в:
родитель
fbde50e7cd
Коммит
50c30d62ca
@ -599,7 +599,10 @@ static int check_modifiers(char *ck, orte_mapping_policy_t *tmp)
|
|||||||
int orte_rmaps_base_set_mapping_policy(orte_mapping_policy_t *policy,
|
int orte_rmaps_base_set_mapping_policy(orte_mapping_policy_t *policy,
|
||||||
char **device, char *inspec)
|
char **device, char *inspec)
|
||||||
{
|
{
|
||||||
char *ck, *ptr;
|
char *ck;
|
||||||
|
#if OPAL_HAVE_HWLOC
|
||||||
|
char *ptr;
|
||||||
|
#endif
|
||||||
orte_mapping_policy_t tmp;
|
orte_mapping_policy_t tmp;
|
||||||
int rc;
|
int rc;
|
||||||
size_t len;
|
size_t len;
|
||||||
|
@ -204,7 +204,7 @@ void orte_rmaps_base_map_job(int fd, short args, void *cbdata)
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
/* in the absence of hwloc, default to map-by slot */
|
/* in the absence of hwloc, default to map-by slot */
|
||||||
ORTE_SET_MAPPING_POLICY(map->mapping, ORTE_MAPPING_BYSLOT);
|
ORTE_SET_MAPPING_POLICY(jdata->map->mapping, ORTE_MAPPING_BYSLOT);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
/* check for oversubscribe directives */
|
/* check for oversubscribe directives */
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
* Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved.
|
* Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved.
|
||||||
* Copyright (c) 2013 Intel, Inc. All rights reserved.
|
* Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -62,6 +62,7 @@ int orte_rmaps_rr_byslot(orte_job_t *jdata,
|
|||||||
true, app->num_procs, app->app);
|
true, app->num_procs, app->app);
|
||||||
return ORTE_ERR_SILENT;
|
return ORTE_ERR_SILENT;
|
||||||
}
|
}
|
||||||
|
#if OPAL_HAVE_HWLOC
|
||||||
/* if we will and are allowed to oversubscribe, and binding was given, then
|
/* if we will and are allowed to oversubscribe, and binding was given, then
|
||||||
* we really should warn the user that we cannot bind
|
* we really should warn the user that we cannot bind
|
||||||
*/
|
*/
|
||||||
@ -77,6 +78,7 @@ int orte_rmaps_rr_byslot(orte_job_t *jdata,
|
|||||||
/* don't default to bound */
|
/* don't default to bound */
|
||||||
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE);
|
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* first pass: map the number of procs to each node until we
|
/* first pass: map the number of procs to each node until we
|
||||||
@ -244,6 +246,7 @@ int orte_rmaps_rr_bynode(orte_job_t *jdata,
|
|||||||
return ORTE_ERR_SILENT;
|
return ORTE_ERR_SILENT;
|
||||||
}
|
}
|
||||||
oversubscribed = true;
|
oversubscribed = true;
|
||||||
|
#if OPAL_HAVE_HWLOC
|
||||||
/* if we will and are allowed to oversubscribe, and binding was given, then
|
/* if we will and are allowed to oversubscribe, and binding was given, then
|
||||||
* we really should warn the user that we cannot bind
|
* we really should warn the user that we cannot bind
|
||||||
*/
|
*/
|
||||||
@ -259,6 +262,7 @@ int orte_rmaps_rr_bynode(orte_job_t *jdata,
|
|||||||
/* don't default to bound */
|
/* don't default to bound */
|
||||||
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE);
|
OPAL_SET_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NONE);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
nnodes = opal_list_get_size(node_list);
|
nnodes = opal_list_get_size(node_list);
|
||||||
|
@ -712,6 +712,7 @@ int orte_register_params(void)
|
|||||||
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
|
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
|
||||||
&orte_max_vm_size);
|
&orte_max_vm_size);
|
||||||
|
|
||||||
|
#if OPAL_HAVE_HWLOC
|
||||||
if (opal_hwloc_use_hwthreads_as_cpus) {
|
if (opal_hwloc_use_hwthreads_as_cpus) {
|
||||||
orte_set_slots = strdup("hwthreads");
|
orte_set_slots = strdup("hwthreads");
|
||||||
} else {
|
} else {
|
||||||
@ -725,6 +726,9 @@ int orte_register_params(void)
|
|||||||
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
|
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
|
||||||
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
|
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
|
||||||
&orte_set_slots);
|
&orte_set_slots);
|
||||||
|
#else
|
||||||
|
orte_set_slots = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* should we display the allocation after determining it? */
|
/* should we display the allocation after determining it? */
|
||||||
orte_display_allocation = false;
|
orte_display_allocation = false;
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user