svn merge -r12620:12622 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

NEWS

@@ -82,6 +82,8 @@ documents those changes that are of interest to users and admins.
  -- In switch/federation, fix small memory leak effecting slurmd.
  -- Add PMI_FANOUT_OFF_HOST environment variable to control how message 
     forwarding is done for PMI (MPICH2). See "man srun" for details.
+ -- From sbatch set SLURM_NTASKS_PER_NODE when --ntasks-per-node option is 
+    specified.
 
 * Changes in SLURM 1.2.19
 =========================

doc/man/man1/sbatch.1

-.TH "sbatch" "1" "SLURM 1.3" "September 2007" "SLURM Commands"
+.TH "sbatch" "1" "SLURM 1.3" "November 2007" "SLURM Commands"
 .SH "NAME"
 .LP 
 sbatch \- Submit a batch script to SLURM.
@@ -642,6 +642,18 @@ Do not allocate a block on Blue Gene systems only.
 \fBMPIRUN_NOFREE\fR
 Do not free a block on Blue Gene systems only.
 .TP
+\fBSLURM_NTASKS_PER_CORE\fR
+Number of tasks requested per core.
+Only set if the \fB\-\-ntasks\-per\-core\fR option is specified.
+.TP
+\fBSLURM_NTASKS_PER_NODE\fR
+Number of tasks requested per node.
+Only set if the \fB\-\-ntasks\-per\-node\fR option is specified.
+.TP
+\fBSLURM_NTASKS_PER_SOCKET\fR
+Number of tasks requested per socket.
+Only set if the \fB\-\-ntasks\-per\-socket\fR option is specified.
+.TP
 \fBMPIRUN_PARTITION\fR
 The block name on Blue Gene systems only.
 

src/sbatch/opt.c

@@ -1173,14 +1173,20 @@ static void _set_options(int argc, char **argv)
 		case LONG_OPT_NTASKSPERNODE:
 			opt.ntasks_per_node = _get_int(optarg,
 				"ntasks-per-node");
+			setenvf(NULL, "SLURM_NTASKS_PER_NODE", "%d",
+				opt.ntasks_per_node);
 			break;
 		case LONG_OPT_NTASKSPERSOCKET:
 			opt.ntasks_per_socket = _get_int(optarg, 
 				"ntasks-per-socket");
+			setenvf(NULL, "SLURM_NTASKS_PER_SOCKET", "%d",
+				opt.ntasks_per_socket);
 			break;
 		case LONG_OPT_NTASKSPERCORE:
 			opt.ntasks_per_core = _get_int(optarg,
 				"ntasks-per-core");
+			setenvf(NULL, "SLURM_NTASKS_PER_CORE", "%d",
+				opt.ntasks_per_socket);
 			break;
 		case LONG_OPT_BLRTS_IMAGE:
 			xfree(opt.blrtsimage);