Merge pull request #2229 from rhc54/topic/dvm

Pickup the npernode and npersocket options and include them in the job object

orte/mca/schizo/ompi/schizo_ompi.c

@@ -275,13 +275,13 @@ static opal_cmd_line_init_t cmd_line_init[] = {
      * available - included for backwards compatibility
      */
     { "rmaps_ppr_pernode", '\0', "pernode", "pernode", 0,
-      NULL, OPAL_CMD_LINE_TYPE_BOOL,
+      &orte_cmd_options.pernode, OPAL_CMD_LINE_TYPE_BOOL,
       "Launch one process per available node" },
     { "rmaps_ppr_n_pernode", '\0', "npernode", "npernode", 1,
-        NULL, OPAL_CMD_LINE_TYPE_INT,
+        &orte_cmd_options.npernode, OPAL_CMD_LINE_TYPE_INT,
         "Launch n processes per node on all allocated nodes" },
     { "rmaps_ppr_n_pernode", '\0', "N", NULL, 1,
-        NULL, OPAL_CMD_LINE_TYPE_INT,
+        &orte_cmd_options.npernode, OPAL_CMD_LINE_TYPE_INT,
         "Launch n processes per node on all allocated nodes (synonym for npernode)" },
 
     /* declare hardware threads as independent cpus */
@@ -291,7 +291,7 @@ static opal_cmd_line_init_t cmd_line_init[] = {
 
     /* include npersocket for backwards compatibility */
     { "rmaps_ppr_n_persocket", '\0', "npersocket", "npersocket", 1,
-      NULL, OPAL_CMD_LINE_TYPE_INT,
+      &orte_cmd_options.npersocket, OPAL_CMD_LINE_TYPE_INT,
       "Launch n processes per socket on all allocated nodes" },
 
     /* Mapping options */

orte/orted/orted_submit.c

@@ -803,8 +803,14 @@ int orte_submit_job(char *argv[], int *index,
         ORTE_SET_MAPPING_DIRECTIVE(jdata->map->mapping, ORTE_MAPPING_GIVEN);
         /* define the ppr */
         (void)asprintf(&jdata->map->ppr, "%d:node", orte_cmd_options.npernode);
+    } else if (0 < orte_cmd_options.npersocket) {
+        ORTE_SET_MAPPING_POLICY(jdata->map->mapping, ORTE_MAPPING_PPR);
+        ORTE_SET_MAPPING_DIRECTIVE(jdata->map->mapping, ORTE_MAPPING_GIVEN);
+        /* define the ppr */
+        (void)asprintf(&jdata->map->ppr, "%d:socket", orte_cmd_options.npersocket);
     }
 
+
     /* if the user specified cpus/rank, set it */
     if (0 < orte_cmd_options.cpus_per_proc) {
         jdata->map->cpus_per_rank = orte_cmd_options.cpus_per_proc;