1
1
This commit was SVN r21591.
Этот коммит содержится в:
Ralph Castain 2009-07-02 17:48:36 +00:00
родитель d3fb39073f
Коммит e30826c6e1
3 изменённых файлов: 3 добавлений и 2 удалений

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

@ -407,7 +407,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
* paffinity scheme. * paffinity scheme.
*/ */
ret = opal_paffinity_base_get(&mask); ret = opal_paffinity_base_get(&mask);
proc_bound = false;
if (OPAL_SUCCESS == ret) { if (OPAL_SUCCESS == ret) {
/* paffinity is supported - check for binding */ /* paffinity is supported - check for binding */
OPAL_PAFFINITY_PROCESS_IS_BOUND(mask, &proc_bound); OPAL_PAFFINITY_PROCESS_IS_BOUND(mask, &proc_bound);

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

@ -417,7 +417,7 @@ static int orte_rmaps_rf_map(orte_job_t *jdata)
('N' == rfmap->node_name[1])))) { ('N' == rfmap->node_name[1])))) {
relative_index=atoi(strtok(rfmap->node_name,"+n")); relative_index=atoi(strtok(rfmap->node_name,"+n"));
if ( relative_index >= opal_list_get_size (&node_list) || ( 0 > relative_index)){ if ( relative_index >= (int)opal_list_get_size (&node_list) || ( 0 > relative_index)){
orte_show_help("help-rmaps_rank_file.txt","bad-index", true,rfmap->node_name); orte_show_help("help-rmaps_rank_file.txt","bad-index", true,rfmap->node_name);
ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM); ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM);
return ORTE_ERR_BAD_PARAM; return ORTE_ERR_BAD_PARAM;

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

@ -773,6 +773,7 @@ static int parse_node_range(char *orig, char ***names, orte_vpid_t *vpid_start,
/* protect input */ /* protect input */
base = strdup(orig); base = strdup(orig);
suffix = '\0';
/* default to no procs */ /* default to no procs */
*vpid_start = ORTE_VPID_INVALID; *vpid_start = ORTE_VPID_INVALID;
@ -780,6 +781,7 @@ static int parse_node_range(char *orig, char ***names, orte_vpid_t *vpid_start,
/* start by searching for ranges and proc specifications */ /* start by searching for ranges and proc specifications */
len = strlen(base); len = strlen(base);
ptr = NULL; ptr = NULL;
found_range = false;
for (i = 0; i <= len; ++i) { for (i = 0; i <= len; ++i) {
if (base[i] == '[') { if (base[i] == '[') {
/* we found a range. this gets dealt with below */ /* we found a range. this gets dealt with below */