Skip to content

Commit

Permalink
Correctly parse map-by modifiers
Browse files Browse the repository at this point in the history
There can be multiple modifiers, so need to allow
for that when parsing them by ensuring all modifiers
are passed to the check_modifiers function.

Signed-off-by: Ralph Castain <[email protected]>
(cherry picked from commit e2af1aa)
  • Loading branch information
rhc54 committed Dec 8, 2024
1 parent 2828a49 commit f58be9f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/mca/rmaps/base/rmaps_base_frame.c
Original file line number Diff line number Diff line change
Expand Up @@ -492,12 +492,12 @@ int prte_rmaps_base_set_mapping_policy(prte_job_t *jdata, char *inspec)
PMIX_ARGV_FREE_COMPAT(ck);
goto setpolicy;
}
cptr = ck[3];
PMIX_ARGV_JOIN(cptr, &ck[3], ':');
} else {
PMIX_ARGV_JOIN(cptr, &ck[1], ':');
pmix_output_verbose(5, prte_rmaps_base_framework.framework_output,
"%s rmaps:base policy %s modifiers %s provided",
PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), ck[0], ck[1]);
cptr = ck[1];
PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), ck[0], cptr);
}
if (PRTE_SUCCESS != (rc = check_modifiers(cptr, jdata, &tmp)) &&
PRTE_ERR_TAKE_NEXT_OPTION != rc) {
Expand All @@ -506,6 +506,7 @@ int prte_rmaps_base_set_mapping_policy(prte_job_t *jdata, char *inspec)
rc = PRTE_ERR_SILENT;
}
PMIX_ARGV_FREE_COMPAT(ck);
free(cptr);
return rc;
}
if (ppr) {
Expand Down

0 comments on commit f58be9f

Please sign in to comment.