Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correctly add qualifiers to options #1334

Merged
merged 2 commits into from
Apr 7, 2022
Merged

Correctly add qualifiers to options #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad2bc4e
Correctly add qualifiers to options
rhc54 Apr 7, 2022
d972c42
Minor formatting cleanups
rhc54 Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/mca/rmaps/rank_file/rmaps_rank_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,10 @@ static int prte_rmaps_rf_map(prte_job_t *jdata)
rc = PRTE_ERR_OUT_OF_RESOURCE;
goto error;
}
if ((node->slots < (int) node->num_procs)
|| (0 < node->slots_max && node->slots_max < (int) node->num_procs)) {
if (PRTE_MAPPING_NO_OVERSUBSCRIBE
& PRTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping)) {
/* check if we are oversubscribed */
if ((node->slots < (int) node->num_procs) ||
(0 < node->slots_max && node->slots_max < (int) node->num_procs)) {
if (PRTE_MAPPING_NO_OVERSUBSCRIBE & PRTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping)) {
prte_show_help("help-prte-rmaps-base.txt", "prte-rmaps-base:alloc-error", true,
node->num_procs, app->app);
PRTE_UPDATE_EXIT_STATUS(PRTE_ERROR_DEFAULT_EXIT_CODE);
Expand Down
65 changes: 32 additions & 33 deletions src/mca/rmaps/seq/rmaps_seq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,43 +331,42 @@ static int prte_rmaps_seq_map(prte_job_t *jdata)
PRTE_FLAG_SET(node, PRTE_NODE_FLAG_MAPPED);
}
proc = prte_rmaps_base_setup_proc(jdata, node, i);
if (!PRTE_FLAG_TEST(app, PRTE_APP_FLAG_TOOL) &&
(node->slots < (int) node->num_procs) ||
(0 < node->slots_max && node->slots_max < (int) node->num_procs)) {
if (PRTE_MAPPING_NO_OVERSUBSCRIBE
& PRTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping)) {
prte_show_help("help-prte-rmaps-base.txt", "prte-rmaps-base:alloc-error", true,
node->num_procs, app->app);
PRTE_UPDATE_EXIT_STATUS(PRTE_ERROR_DEFAULT_EXIT_CODE);
rc = PRTE_ERR_SILENT;
goto error;
}
/* flag the node as oversubscribed so that sched-yield gets
* properly set
*/
PRTE_FLAG_SET(node, PRTE_NODE_FLAG_OVERSUBSCRIBED);
PRTE_FLAG_SET(jdata, PRTE_JOB_FLAG_OVERSUBSCRIBED);
/* check for permission */
if (PRTE_FLAG_TEST(node, PRTE_NODE_FLAG_SLOTS_GIVEN)) {
/* if we weren't given a directive either way, then we will error out
* as the #slots were specifically given, either by the host RM or
* via hostfile/dash-host */
if (!(PRTE_MAPPING_SUBSCRIBE_GIVEN
& PRTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping))) {
prte_show_help("help-prte-rmaps-base.txt", "prte-rmaps-base:alloc-error",
true, app->num_procs, app->app);
PRTE_UPDATE_EXIT_STATUS(PRTE_ERROR_DEFAULT_EXIT_CODE);
rc = PRTE_ERR_SILENT;
goto error;
} else if (PRTE_MAPPING_NO_OVERSUBSCRIBE
& PRTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping)) {
/* if we were explicitly told not to oversubscribe, then don't */
prte_show_help("help-prte-rmaps-base.txt", "prte-rmaps-base:alloc-error",
true, app->num_procs, app->app);
if (!PRTE_FLAG_TEST(app, PRTE_APP_FLAG_TOOL)) {
/* check if we are oversubscribed */
if ((node->slots < (int) node->num_procs) ||
(0 < node->slots_max && node->slots_max < (int) node->num_procs)) {
if (PRTE_MAPPING_NO_OVERSUBSCRIBE & PRTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping)) {
prte_show_help("help-prte-rmaps-base.txt", "prte-rmaps-base:alloc-error", true,
node->num_procs, app->app);
PRTE_UPDATE_EXIT_STATUS(PRTE_ERROR_DEFAULT_EXIT_CODE);
rc = PRTE_ERR_SILENT;
goto error;
}
/* flag the node as oversubscribed so that sched-yield gets
* properly set
*/
PRTE_FLAG_SET(node, PRTE_NODE_FLAG_OVERSUBSCRIBED);
PRTE_FLAG_SET(jdata, PRTE_JOB_FLAG_OVERSUBSCRIBED);
/* check for permission */
if (PRTE_FLAG_TEST(node, PRTE_NODE_FLAG_SLOTS_GIVEN)) {
/* if we weren't given a directive either way, then we will error out
* as the #slots were specifically given, either by the host RM or
* via hostfile/dash-host */
if (!(PRTE_MAPPING_SUBSCRIBE_GIVEN & PRTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping))) {
prte_show_help("help-prte-rmaps-base.txt", "prte-rmaps-base:alloc-error",
true, app->num_procs, app->app);
PRTE_UPDATE_EXIT_STATUS(PRTE_ERROR_DEFAULT_EXIT_CODE);
rc = PRTE_ERR_SILENT;
goto error;
} else if (PRTE_MAPPING_NO_OVERSUBSCRIBE & PRTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping)) {
/* if we were explicitly told not to oversubscribe, then don't */
prte_show_help("help-prte-rmaps-base.txt", "prte-rmaps-base:alloc-error",
true, app->num_procs, app->app);
PRTE_UPDATE_EXIT_STATUS(PRTE_ERROR_DEFAULT_EXIT_CODE);
rc = PRTE_ERR_SILENT;
goto error;
}
}
}
}
/* assign the vpid */
Expand Down
2 changes: 1 addition & 1 deletion src/mca/schizo/base/schizo_base_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ int prte_schizo_base_add_qualifier(pmix_cli_result_t *results,
// does it already contain a qualifier?
if (NULL != strchr(opt->values[0], ':')) {
// can just add this one to the end
pmix_asprintf(&tmp, "%s,%s", opt->values[0], qualifier);
pmix_asprintf(&tmp, "%s:%s", opt->values[0], qualifier);
free(opt->values[0]);
opt->values[0] = tmp;
} else {
Expand Down