From ba40aa76d9ce5510955091fab8f939efe323f95e Mon Sep 17 00:00:00 2001
From: "Christopher J. Morrone" <morrone2@llnl.gov>
Date: Wed, 17 May 2006 00:45:33 +0000
Subject: [PATCH] Fix for srun -n and -O options when paired with -b.
---
NEWS | 1 +
src/srun/allocate.c | 3 +++
2 files changed, 4 insertions(+)
diff --git a/NEWS b/NEWS
index 6d038ae8323..893b7bf06a5 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ documents those changes that are of interest to users and admins.
-- Set "CFLAGS=-DISO8601" before configuration to get ISO8601 format
times for all SLURM commands. NOTE: This may break Moab, Maui, and/or
LSF schedulers.
+ -- Fix for srun -n and -O options when paired with -b.
* Changes in SLURM 1.1.0-pre8
=============================
diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index ba19b0a5bbc..e8b84da1ada 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -492,6 +492,7 @@ job_desc_msg_create_from_opts (char *script)
j->host = NULL;
if (script) {
+ char *buf = NULL;
/*
* If script is set then we are building a request for
* a batch job
@@ -500,6 +501,8 @@ job_desc_msg_create_from_opts (char *script)
if (opt.overcommit)
putenv("SLURM_OVERCOMMIT=1");
+ xstrfmtcat(buf, "SLURM_NPROCS=%d", opt.nprocs);
+ putenv(buf);
j->environment = environ;
j->env_size = envcount (environ);
--
GitLab