Browse files

a relag of v1.2.23

  • Loading branch information...
2 parents c7953ca + 252f5f6 commit cc774bc195e5c75ad8a93ee3f87e95966d255172 Moe Jette committed Feb 15, 2008
Showing with 14 additions and 9 deletions.
  1. +8 −6 NEWS
  2. +0 −1 src/plugins/mpi/mvapich/mvapich.c
  3. +3 −1 src/plugins/sched/wiki/start_job.c
  4. +3 −1 src/plugins/sched/wiki2/start_job.c
View
14 NEWS
@@ -3,7 +3,7 @@ documents those changes that are of interest to users and admins.
* Changes in SLURM 1.2.23
=========================
- -- Fix for libpmi to not export unneed variables like xstr*
+ -- Fix for libpmi to not export unneeded variables like xstr*
-- BLUEGENE - added per partition dynamic block creation
-- fix infinite loop bug in sview when there were multiple partitions
-- Send message to srun command when a job is requeued due to node failure.
@@ -16,16 +16,18 @@ documents those changes that are of interest to users and admins.
specifying an account of the form "qos-name".
-- In select/linear, fix bug in scheduling required nodes that already have
a job running on them (req.load.patch from Chris Holmes, HP).
- -- Change timeout for srun/sbatch --get-user-env option to 2 secs, don't get
- DISPLAY environment variables, but explicitly set ENVIRONMENT=BATCH and
- HOSTNAME to the execution host of the batch script.
+ -- For use with Moab only: change timeout for srun/sbatch --get-user-env
+ option to 2 secs, don't get DISPLAY environment variables, but explicitly
+ set ENVIRONMENT=BATCH and HOSTNAME to the execution host of the batch script.
+ -- Add configuration parameter GetEnvTimeout for use with Moab. See
+ "man slurm.conf" for details.
-- Modify salloc and sbatch to accept both "--tasks" and "--ntasks" as
equivalent options for compatibility with srun.
- -- Add configuration parameter GetEnvTimeout for use with Moab. See
- "man slurm.conf" for details.
-- If a partition's node list contains space separators, replace them with
commas for easier parsing.
-- BLUEGENE - fixed bug in geometry specs when creating a block.
+ -- Add support for Moab and Maui to start jobs with select/cons_res plugin
+ and jobs requiring more than one CPU per task.
* Changes in SLURM 1.2.22
=========================
View
1 src/plugins/mpi/mvapich/mvapich.c
@@ -1252,7 +1252,6 @@ static void *mvapich_thr(void *arg)
int first = 1;
debug ("mvapich-0.9.x/gen2: thread started: %ld", pthread_self ());
- info ("mvapich debug version");
mvapich_mvarray_create (st);
View
4 src/plugins/sched/wiki/start_job.c
@@ -195,6 +195,7 @@ static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
* performs many string compares. */
xfree(job_ptr->details->req_node_layout);
if (task_cnt && cr_enabled) {
+ uint16_t cpus_per_task = MAX(1, job_ptr->details->cpus_per_task);
job_ptr->details->req_node_layout = (uint16_t *)
xmalloc(bit_set_count(new_bitmap) * sizeof(uint16_t));
bsize = bit_size(new_bitmap);
@@ -212,7 +213,8 @@ static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
if ((node_idx[node_name_len] == ',') ||
(node_idx[node_name_len] == '\0')) {
job_ptr->details->
- req_node_layout[ll]++;
+ req_node_layout[ll] +=
+ cpus_per_task;
}
node_cur = strchr(node_idx, ',');
if (node_cur)
View
4 src/plugins/sched/wiki2/start_job.c
@@ -251,6 +251,7 @@ static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
* performs many string compares. */
xfree(job_ptr->details->req_node_layout);
if (task_cnt && cr_enabled) {
+ uint16_t cpus_per_task = MAX(1, job_ptr->details->cpus_per_task);
job_ptr->details->req_node_layout = (uint16_t *)
xmalloc(bit_set_count(new_bitmap) * sizeof(uint16_t));
bsize = bit_size(new_bitmap);
@@ -268,7 +269,8 @@ static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
if ((node_idx[node_name_len] == ',') ||
(node_idx[node_name_len] == '\0')) {
job_ptr->details->
- req_node_layout[ll]++;
+ req_node_layout[ll] +=
+ cpus_per_task;
}
node_cur = strchr(node_idx, ',');
if (node_cur)

0 comments on commit cc774bc

Please sign in to comment.