Browse files

retag

  • Loading branch information...
2 parents 3d0b158 + f94c41d commit 0b96f1ae4bb1b1cb76fce884ff1aebfc1eb4cb86 @dannyauble dannyauble committed Aug 9, 2006
Showing with 18 additions and 2 deletions.
  1. +16 −2 src/plugins/select/bluegene/plugin/select_bluegene.c
  2. +2 −0 testsuite/expect/globals
View
18 src/plugins/select/bluegene/plugin/select_bluegene.c
@@ -422,7 +422,8 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
{
job_desc_msg_t *job_desc = (job_desc_msg_t *)data;
uint32_t *nodes = (uint32_t *)data;
- int tmp;
+ int tmp, i;
+ uint16_t req_geometry[BA_SYSTEM_DIMENSIONS];
switch (type) {
case SELECT_GET_NODE_SCALING:
@@ -453,9 +454,22 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
select_g_set_jobinfo(job_desc->select_jobinfo,
SELECT_DATA_MAX_PROCS,
&tmp);
-
+
if(job_desc->min_nodes == NO_VAL)
return SLURM_SUCCESS;
+ select_g_get_jobinfo(job_desc->select_jobinfo,
+ SELECT_DATA_GEOMETRY, &req_geometry);
+
+ if(req_geometry[0] != 0
+ && req_geometry[0] != (uint16_t)NO_VAL) {
+ job_desc->min_nodes = 1;
+ for (i=0; i<BA_SYSTEM_DIMENSIONS; i++)
+ job_desc->min_nodes *=
+ (uint16_t)req_geometry[i];
+ job_desc->min_nodes *= bluegene_bp_node_cnt;
+ job_desc->max_nodes = job_desc->min_nodes;
+ }
+
if(job_desc->min_nodes < job_desc->num_procs)
job_desc->min_nodes = job_desc->num_procs;
if(job_desc->max_nodes < job_desc->num_procs)
View
2 testsuite/expect/globals
@@ -288,6 +288,8 @@ proc wait_for_file { file_name } {
exec $bin_sleep 1
}
if [file exists $file_name] {
+# Add small delay for I/O buffering
+ exec $bin_sleep 1
return 0
}
}

0 comments on commit 0b96f1a

Please sign in to comment.