diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5 index ec04c0b6d3885dc824f92bca10be2cd98ddba1cd..a4837e95155363fb2a783e76dae1a63b6ff4493c 100644 --- a/doc/man/man5/slurm.conf.5 +++ b/doc/man/man5/slurm.conf.5 @@ -1607,10 +1607,7 @@ Without this option, by default one task will be allocated per thread on nodes with more than one \fBThreadsPerCore\fR configured. .TP \fBCR_CORE_DEFAULT_DIST_BLOCK\fR -Allocate cores within a node using block distribution by default. -This is a pseudo-best-fit algorithm that minimizes the number of -boards and minimizes the number of sockets (within minimum boards) -used for the allocation. +Allocate cores using block distribution by default. This default behavior can be overridden specifying a particular "\-m" parameter with srun/salloc/sbatch. Without this option, cores will be allocated cyclicly across the sockets. @@ -2333,14 +2330,6 @@ they must exactly match the entries in the \fBNodeName\fR By default, the \fBNodeAddr\fR will be identical in value to \fBNodeName\fR. -.TP -\fBBoards\fR -Number of Baseboards in nodes with a baseboard controller. -Note that when Boards is specified, SocketsPerBoard, -CoresPerSocket, and ThreadsPerCore should be specified. -Boards and CPUs are mutully exclusive. -The default value is 1. - .TP \fBCoresPerSocket\fR Number of cores in a single physical processor socket (e.g. "2"). @@ -2355,7 +2344,6 @@ The default value is 1. Number of logical processors on the node (e.g. "2"). If \fBCPUs\fR is omitted, it will set equal to the product of \fBSockets\fR, \fBCoresPerSocket\fR, and \fBThreadsPerCore\fR. -CPUs and Boards are mutually exclusive. The default value is 1. .TP @@ -2410,15 +2398,6 @@ If Sockets is omitted, it will be inferred from \fBCPUs\fR, \fBCoresPerSocket\fR, and \fBThreadsPerCore\fR. \fBNOTE\fR: If you have multi\-core processors, you will likely need to specify these parameters. -Sockets and SocketsPerBoard are mutually exclusive. -If Sockets is specified when Boards is also used, -Sockets is interpreted as SocketsPerBoard rather than total sockets. -The default value is 1. - -.TP -\fBSocketsPerBoard\fR -Number of physical processor sockets/chips on a baseboard. -Sockets and SocketsPerBoard are mutually exclusive. The default value is 1. .TP @@ -3392,15 +3371,6 @@ See the \fBlogrotate\fR man page for more details. } .br -.TP -\fBReqResv\fR -Specifies users of this partition are required to designate a reservation -when submitting a job. This option can be useful in restricting usage -of a partition that may have higher priority or additional resources to be -allowed only within a reservation. -Possible values are "YES" and "NO". -The default value is "NO". - .SH "COPYING" Copyright (C) 2002\-2007 The Regents of the University of California. Copyright (C) 2008\-2010 Lawrence Livermore National Security.