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

Fix compile problem

Просмотр исходного кода 
This commit was SVN r14713.
Этот коммит содержится в:
Ralph Castain 2007-05-21 20:11:03 +00:00
родитель 4fff584a68
Коммит b771cfcce3
1 изменённых файлов: 7 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
orte/mca/pls/bproc/pls_bproc.c
Просмотреть файл

@ -535,7 +535,7 @@ static int orte_pls_bproc_launch_daemons(orte_job_map_t *map, char ***envp) {
/* set up the base environment so the daemons can get their names once launched */ /* set up the base environment so the daemons can get their names once launched */
rc = orte_ns_nds_bproc_put(ORTE_PROC_MY_NAME->cellid, 0, daemon_vpid_start, rc = orte_ns_nds_bproc_put(ORTE_PROC_MY_NAME->cellid, 0, daemon_vpid_start,
0, num_daemons, envp); 0, num_daemons, ORTE_VPID_INVALID, 1, envp);
if(ORTE_SUCCESS != rc) { if(ORTE_SUCCESS != rc) {
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
goto cleanup; goto cleanup;
@ -806,7 +806,7 @@ static int orte_pls_bproc_launch_app(orte_job_map_t* map, int num_slots,
orte_vpid_t vpid_start, int app_context) { orte_vpid_t vpid_start, int app_context) {
int *node_array=NULL, num_nodes, cycle; int *node_array=NULL, num_nodes, cycle;
int rc, i, j, stride; int rc, i, j, stride;
orte_std_cntr_t num_processes; orte_std_cntr_t num_processes, num_cycles;
int *pids = NULL; int *pids = NULL;
char *var, *param; char *var, *param;
orte_process_name_t * proc_name; orte_process_name_t * proc_name;
@ -863,6 +863,9 @@ static int orte_pls_bproc_launch_app(orte_job_map_t* map, int num_slots,
goto cleanup; goto cleanup;
} }
/* compute the total number of cycles that will be required */
num_cycles = 2;
/* initialize the cycle count. Computing the process name under Bproc /* initialize the cycle count. Computing the process name under Bproc
* is a complex matter when mapping by slot as Bproc's inherent * is a complex matter when mapping by slot as Bproc's inherent
* methodology is to do everything by node. When mapping by slot, the * methodology is to do everything by node. When mapping by slot, the
@ -904,7 +907,7 @@ static int orte_pls_bproc_launch_app(orte_job_map_t* map, int num_slots,
/* setup environment so the procs can figure out their names */ /* setup environment so the procs can figure out their names */
rc = orte_ns_nds_bproc_put(ORTE_PROC_MY_NAME->cellid, map->job, vpid_start, map->vpid_start, rc = orte_ns_nds_bproc_put(ORTE_PROC_MY_NAME->cellid, map->job, vpid_start, map->vpid_start,
num_processes, &env); num_processes, i, num_cycles, &env);
if(ORTE_SUCCESS != rc) { if(ORTE_SUCCESS != rc) {
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
goto cleanup; goto cleanup;
@ -1228,7 +1231,7 @@ int orte_pls_bproc_terminate_job(orte_jobid_t jobid, struct timeval *timeout, op
OPAL_TRACE(1); OPAL_TRACE(1);
if(0 < mca_pls_bproc_component.debug) { if(0 < mca_pls_bproc_component.debug) {
opal_output(0, "orte_pls_bproc: terminating job %ld", jobid); opal_output(0, "orte_pls_bproc: terminating job %ld", (long)jobid);
} }
/* kill application process */ /* kill application process */