From b1a07ff6859c1b4c14fda3f58acabacba8b83469 Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" <morrone2@llnl.gov> Date: Sat, 6 Jan 2007 00:19:33 +0000 Subject: [PATCH] svn merge -r10698:10701 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1 --- src/slurmctld/job_mgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c index c6c5894f13f..2ba8ed00dc8 100644 --- a/src/slurmctld/job_mgr.c +++ b/src/slurmctld/job_mgr.c @@ -2666,8 +2666,6 @@ static int _validate_job_desc(job_desc_msg_t * job_desc_msg, int allocate, job_desc_msg->nice = NICE_OFFSET; } - if (job_desc_msg->num_procs == NO_VAL) - job_desc_msg->num_procs = 1; /* default cpu count of 1 */ if (job_desc_msg->min_sockets == (uint16_t) NO_VAL) job_desc_msg->min_sockets = 1; /* default socket count of 1 */ if (job_desc_msg->min_cores == (uint16_t) NO_VAL) @@ -2676,6 +2674,8 @@ static int _validate_job_desc(job_desc_msg_t * job_desc_msg, int allocate, job_desc_msg->min_threads = 1; /* default thread count of 1 */ if (job_desc_msg->min_nodes == NO_VAL) job_desc_msg->min_nodes = 1; /* default node count of 1 */ + if (job_desc_msg->num_procs == NO_VAL) + job_desc_msg->num_procs = job_desc_msg->min_nodes; if (job_desc_msg->min_sockets == (uint16_t) NO_VAL) job_desc_msg->min_sockets = 1; /* default socket count of 1 */ if (job_desc_msg->min_cores == (uint16_t) NO_VAL) -- GitLab