Fix some poorly choosen constants in the XGrid PLS
This commit was SVN r6901.
Этот коммит содержится в:
родитель
933fcfe4fd
Коммит
f6a64706ad
@ -255,7 +255,7 @@ mca_pls_xgrid_set_node_name(orte_ras_node_t* node,
|
|||||||
|
|
||||||
/* allocate vpids for the daemons */
|
/* allocate vpids for the daemons */
|
||||||
num_nodes = opal_list_get_size(&nodes);
|
num_nodes = opal_list_get_size(&nodes);
|
||||||
if (num_nodes == 0) return OMPI_ERR_BAD_PARAM;
|
if (num_nodes == 0) return ORTE_ERR_BAD_PARAM;
|
||||||
ret = orte_ns.reserve_range(0, num_nodes, &vpid);
|
ret = orte_ns.reserve_range(0, num_nodes, &vpid);
|
||||||
if (ORTE_SUCCESS != ret) goto cleanup;
|
if (ORTE_SUCCESS != ret) goto cleanup;
|
||||||
|
|
||||||
@ -339,12 +339,12 @@ mca_pls_xgrid_set_node_name(orte_ras_node_t* node,
|
|||||||
|
|
||||||
/* we should have a result - find out if it worked */
|
/* we should have a result - find out if it worked */
|
||||||
if (XGActionMonitorOutcomeSuccess == [actionMonitor outcome]) {
|
if (XGActionMonitorOutcomeSuccess == [actionMonitor outcome]) {
|
||||||
ret = OMPI_SUCCESS;
|
ret = ORTE_SUCCESS;
|
||||||
} else {
|
} else {
|
||||||
NSError *err = [actionMonitor error];
|
NSError *err = [actionMonitor error];
|
||||||
fprintf(stderr, "orte:pls:xgrid: launch failed: %s\n",
|
fprintf(stderr, "orte:pls:xgrid: launch failed: %s\n",
|
||||||
[[err localizedFailureReason] cString]);
|
[[err localizedFailureReason] cString]);
|
||||||
ret = OMPI_ERROR;
|
ret = ORTE_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* save the XGJob identifier somewhere we can get to it */
|
/* save the XGJob identifier somewhere we can get to it */
|
||||||
@ -375,12 +375,12 @@ cleanup:
|
|||||||
|
|
||||||
/* we should have a result - find out if it worked */
|
/* we should have a result - find out if it worked */
|
||||||
if (XGActionMonitorOutcomeSuccess == [actionMonitor outcome]) {
|
if (XGActionMonitorOutcomeSuccess == [actionMonitor outcome]) {
|
||||||
ret = OMPI_SUCCESS;
|
ret = ORTE_SUCCESS;
|
||||||
} else {
|
} else {
|
||||||
NSError *err = [actionMonitor error];
|
NSError *err = [actionMonitor error];
|
||||||
fprintf(stderr, "orte:pls:xgrid: terminate failed: %s\n",
|
fprintf(stderr, "orte:pls:xgrid: terminate failed: %s\n",
|
||||||
[[err localizedFailureReason] cString]);
|
[[err localizedFailureReason] cString]);
|
||||||
ret = OMPI_ERROR;
|
ret = ORTE_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user