A few changes to the lsf components - mostly cleanup, no major logic changes
This commit was SVN r15563.
Этот коммит содержится в:
родитель
d99c764e75
Коммит
f219cc1e6e
@ -155,6 +155,11 @@ static int pls_lsf_launch_job(orte_jobid_t jobid)
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* RHC: I do not believe LSF has launch_id's - does it?
|
||||||
|
They certainly are not used anywhere below!
|
||||||
|
*/
|
||||||
|
|
||||||
/* Iterate through each of the nodes and check to see if we have
|
/* Iterate through each of the nodes and check to see if we have
|
||||||
* a valid launch_id (must be > 0). If not, then error out as
|
* a valid launch_id (must be > 0). If not, then error out as
|
||||||
* we cannot do anything
|
* we cannot do anything
|
||||||
@ -171,6 +176,7 @@ static int pls_lsf_launch_job(orte_jobid_t jobid)
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
num_nodes = map->num_new_daemons;
|
num_nodes = map->num_new_daemons;
|
||||||
opal_output(0, "pls lsf num new daemons: %d!\n", num_nodes);
|
opal_output(0, "pls lsf num new daemons: %d!\n", num_nodes);
|
||||||
@ -220,7 +226,7 @@ static int pls_lsf_launch_job(orte_jobid_t jobid)
|
|||||||
orte_pls_base_orted_append_basic_args(&argc, &argv,
|
orte_pls_base_orted_append_basic_args(&argc, &argv,
|
||||||
&proc_name_index,
|
&proc_name_index,
|
||||||
NULL,
|
NULL,
|
||||||
num_nodes
|
map->num_nodes /* need total #daemons here */
|
||||||
);
|
);
|
||||||
|
|
||||||
/* force orted to use the lsf sds */
|
/* force orted to use the lsf sds */
|
||||||
|
@ -91,7 +91,10 @@ static int allocate(orte_jobid_t jobid, opal_list_t *attributes)
|
|||||||
/* not a repeat - create a node entry for it */
|
/* not a repeat - create a node entry for it */
|
||||||
node = OBJ_NEW(orte_ras_node_t);
|
node = OBJ_NEW(orte_ras_node_t);
|
||||||
node->node_name = strdup(nodelist[i]);
|
node->node_name = strdup(nodelist[i]);
|
||||||
|
/* RHC: LSF does not use launch_id, so leave it invalid */
|
||||||
|
#if 0
|
||||||
node->launch_id = count++;
|
node->launch_id = count++;
|
||||||
|
#endif
|
||||||
node->node_slots_inuse = 0;
|
node->node_slots_inuse = 0;
|
||||||
node->node_slots_max = 0;
|
node->node_slots_max = 0;
|
||||||
node->node_slots = 1;
|
node->node_slots = 1;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user