Skip to content

Commit

Permalink
Fix the map-by pe-list option
Browse files Browse the repository at this point in the history 
Be a little more careful when checking the option as it
can contain a comma-delimited list of ranges, and not
just individual cpus.

Signed-off-by: Ralph Castain <rhc@pmix.org>
  • Loading branch information
@rhc54
rhc54 committed Jan 15, 2024
1 parent 14dd818 commit 4f27008
Showing 1 changed file with 78 additions and 25 deletions.
103 changes: 78 additions & 25 deletions src/mca/rmaps/base/rmaps_base_frame.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
* Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -430,10 +430,10 @@ int prte_rmaps_base_set_default_mapping(prte_job_t *jdata,

int prte_rmaps_base_set_mapping_policy(prte_job_t *jdata, char *inspec)
{
char **ck;
char *ptr, *cptr;
char **ck, **range;
char *ptr, *cptr, *val;
prte_mapping_policy_t tmp;
int rc;
int rc, n;
bool ppr = false;
char *temp_parm, *temp_token, *parm_delimiter;

Expand Down Expand Up @@ -535,6 +535,26 @@ int prte_rmaps_base_set_mapping_policy(prte_job_t *jdata, char *inspec)
}

cptr = ck[0];
// check for an '=' and split out the value from the option
if (NULL != (ptr = strchr(ck[0], '='))) {
*ptr = '\0';
cptr = strdup(ck[0]);
*ptr = '='; // restore the option
++ptr;
if (NULL == ptr) {
/* malformed option */
pmix_show_help("help-prte-rmaps-base.txt", "unrecognized-policy",
true, "mapping", ck[0]);
PMIX_ARGV_FREE_COMPAT(ck);
free(cptr);
return PRTE_ERR_SILENT;
}
val = strdup(ptr);
} else {
cptr = strdup(ck[0]);
val = NULL;
}

if (PMIX_CHECK_CLI_OPTION(cptr, PRTE_CLI_SLOT)) {
PRTE_SET_MAPPING_POLICY(tmp, PRTE_MAPPING_BYSLOT);

Expand Down Expand Up @@ -575,6 +595,10 @@ int prte_rmaps_base_set_mapping_policy(prte_job_t *jdata, char *inspec)
(NULL != jdata && !prte_get_attribute(&jdata->attributes, PRTE_JOB_FILE, NULL, PMIX_STRING))) {
pmix_show_help("help-prte-rmaps-base.txt", "rankfile-no-filename", true);
PMIX_ARGV_FREE_COMPAT(ck);
free(cptr);
if (NULL != val) {
free(val);
}
return PRTE_ERR_BAD_PARAM;
}
/* if they asked for rankfile and didn't specify one, but did
Expand All @@ -585,6 +609,10 @@ int prte_rmaps_base_set_mapping_policy(prte_job_t *jdata, char *inspec)
/* also not allowed */
pmix_show_help("help-prte-rmaps-base.txt", "rankfile-no-filename", true);
PMIX_ARGV_FREE_COMPAT(ck);
free(cptr);
if (NULL != val) {
free(val);
}
return PRTE_ERR_BAD_PARAM;
}
prte_set_attribute(&jdata->attributes, PRTE_JOB_FILE, PRTE_ATTR_GLOBAL,
Expand All @@ -608,41 +636,58 @@ int prte_rmaps_base_set_mapping_policy(prte_job_t *jdata, char *inspec)
} else if (PMIX_CHECK_CLI_OPTION(cptr, PRTE_CLI_PELIST)) {
if (NULL == jdata) {
pmix_show_help("help-prte-rmaps-base.txt", "unsupported-default-policy", true,
"mapping policy", cptr);
PMIX_ARGV_FREE_COMPAT(ck);
return PRTE_ERR_SILENT;
}
ptr = strchr(cptr, '=');
if (NULL == ptr) {
/* malformed option */
pmix_show_help("help-prte-rmaps-base.txt", "unrecognized-policy",
true, cptr);
"mapping", cptr);
PMIX_ARGV_FREE_COMPAT(ck);
free(cptr);
if (NULL != val) {
free(val);
}
return PRTE_ERR_SILENT;
}
ptr++; // move past the equal sign
if (NULL == ptr) {
if (NULL == val) {
/* malformed option */
pmix_show_help("help-prte-rmaps-base.txt", "unrecognized-policy",
true, cptr);
true, "mapping", ck[0]);
PMIX_ARGV_FREE_COMPAT(ck);
free(cptr);
if (NULL != val) {
free(val);
}
return PRTE_ERR_SILENT;
}
/* Verify the list is composed of numeric tokens */
temp_parm = strdup(ptr);
temp_token = strtok(temp_parm, ",");
/* Verify the list is composed of comma-delimited ranges */
temp_token = strtok(val, ",");
while (NULL != temp_token) {
(void)strtol(temp_token, &parm_delimiter, 10);
if ('\0' != *parm_delimiter) {
// check for range
range = PMIX_ARGV_SPLIT_COMPAT(temp_token, '-');
if (2 < PMIX_ARGV_COUNT_COMPAT(range)) {
// can only have one '-' delimiter
pmix_show_help("help-prte-rmaps-base.txt", "invalid-value", true,
"mapping policy", "PE-LIST", ptr);
"mapping", "PE-LIST", ck[0]);
PMIX_ARGV_FREE_COMPAT(ck);
free(temp_parm);
return PRTE_ERR_SILENT;
PMIX_ARGV_FREE_COMPAT(range);
free(cptr);
if (NULL != val) {
free(val);
}
}
for (n=0; NULL != range[n]; n++) {
(void)strtol(range[n], &parm_delimiter, 10);
if ('\0' != *parm_delimiter) {
pmix_show_help("help-prte-rmaps-base.txt", "invalid-value", true,
"mapping", "PE-LIST", val);
PMIX_ARGV_FREE_COMPAT(ck);
PMIX_ARGV_FREE_COMPAT(range);
free(cptr);
if (NULL != val) {
free(val);
}
return PRTE_ERR_SILENT;
}
}
PMIX_ARGV_FREE_COMPAT(range);
temp_token = strtok(NULL, ",");
}
free(temp_parm);
prte_set_attribute(&jdata->attributes, PRTE_JOB_CPUSET, PRTE_ATTR_GLOBAL,
ptr, PMIX_STRING);
PRTE_SET_MAPPING_POLICY(tmp, PRTE_MAPPING_PELIST);
Expand All @@ -655,9 +700,17 @@ int prte_rmaps_base_set_mapping_policy(prte_job_t *jdata, char *inspec)
pmix_show_help("help-prte-rmaps-base.txt", "unrecognized-policy",
true, "mapping", cptr);
PMIX_ARGV_FREE_COMPAT(ck);
free(cptr);
if (NULL != val) {
free(val);
}
return PRTE_ERR_SILENT;
}
PMIX_ARGV_FREE_COMPAT(ck);
free(cptr);
if (NULL != val) {
free(val);
}
PRTE_SET_MAPPING_DIRECTIVE(tmp, PRTE_MAPPING_GIVEN);

setpolicy:
Expand Down

0 comments on commit 4f27008

Please sign in to comment.