From 0b3d1694ca2001c6f9032cfdb005aefe9c29b8ff Mon Sep 17 00:00:00 2001 From: Ben Roberts <ben@schedmd.com> Date: Fri, 23 Apr 2021 13:56:27 -0500 Subject: [PATCH] Docs - Note --ntasks-per-core/socket incompatible with select/linear Bug 11447 --- doc/man/man1/salloc.1 | 12 +++++------- doc/man/man1/sbatch.1 | 10 ++++------ doc/man/man1/srun.1 | 10 ++++------ 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1 index bc71f1d0f4e..5ee3fb8c16d 100644 --- a/doc/man/man1/salloc.1 +++ b/doc/man/man1/salloc.1 @@ -1,4 +1,4 @@ -.TH salloc "1" "Slurm Commands" "February 2021" "Slurm Commands" +.TH salloc "1" "Slurm Commands" "April 2021" "Slurm Commands" .SH "NAME" salloc \- Obtain a Slurm job allocation (a set of nodes), execute a command, @@ -1339,9 +1339,8 @@ Request the maximum \fIntasks\fR be invoked on each core. Meant to be used with the \fB\-\-ntasks\fR option. Related to \fB\-\-ntasks\-per\-node\fR except at the core level instead of the node level. -NOTE: This option is not supported unless \fISelectType=cons_res\fR is -configured (either directly or indirectly on Cray systems) -along with the node's core count. +\fBNOTE\fR: This option is not supported when using +\fISelectType=select/linear\fR. .TP \fB\-\-ntasks\-per\-gpu\fR=<\fIntasks\fR> @@ -1386,9 +1385,8 @@ Request the maximum \fIntasks\fR be invoked on each socket. Meant to be used with the \fB\-\-ntasks\fR option. Related to \fB\-\-ntasks\-per\-node\fR except at the socket level instead of the node level. -NOTE: This option is not supported unless \fISelectType=cons_res\fR is -configured (either directly or indirectly on Cray systems) -along with the node's socket count. +\fBNOTE\fR: This option is not supported when using +\fISelectType=select/linear\fR. .TP \fB\-\-no\-bell\fR diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1 index 6bb68ba1f39..45a42a0e28e 100644 --- a/doc/man/man1/sbatch.1 +++ b/doc/man/man1/sbatch.1 @@ -1458,9 +1458,8 @@ Request the maximum \fIntasks\fR be invoked on each core. Meant to be used with the \fB\-\-ntasks\fR option. Related to \fB\-\-ntasks\-per\-node\fR except at the core level instead of the node level. -NOTE: This option is not supported unless \fISelectType=cons_res\fR is -configured (either directly or indirectly on Cray systems) -along with the node's core count. +\fBNOTE\fR: This option is not supported when using +\fISelectType=select/linear\fR. .TP \fB\-\-ntasks\-per\-gpu\fR=<\fIntasks\fR> @@ -1505,9 +1504,8 @@ Request the maximum \fIntasks\fR be invoked on each socket. Meant to be used with the \fB\-\-ntasks\fR option. Related to \fB\-\-ntasks\-per\-node\fR except at the socket level instead of the node level. -NOTE: This option is not supported unless \fISelectType=cons_res\fR is -configured (either directly or indirectly on Cray systems) -along with the node's socket count. +\fBNOTE\fR: This option is not supported when using +\fISelectType=select/linear\fR. .TP \fB\-O\fR, \fB\-\-overcommit\fR diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1 index 127995343d1..2087adb903a 100644 --- a/doc/man/man1/srun.1 +++ b/doc/man/man1/srun.1 @@ -1826,9 +1826,8 @@ Related to \fB\-\-ntasks\-per\-node\fR except at the core level instead of the node level. Masks will automatically be generated to bind the tasks to specific cores unless \fB\-\-cpu\-bind=none\fR is specified. -NOTE: This option is not supported unless \fISelectType=cons_res\fR is -configured (either directly or indirectly on Cray systems) -along with the node's core count. +\fBNOTE\fR: This option is not supported when using +\fISelectType=select/linear\fR. .TP \fB\-\-ntasks\-per\-gpu\fR=<\fIntasks\fR> @@ -1877,9 +1876,8 @@ Related to \fB\-\-ntasks\-per\-node\fR except at the socket level instead of the node level. Masks will automatically be generated to bind the tasks to specific sockets unless \fB\-\-cpu\-bind=none\fR is specified. -NOTE: This option is not supported unless \fISelectType=cons_res\fR is -configured (either directly or indirectly on Cray systems) -along with the node's socket count. +\fBNOTE\fR: This option is not supported when using +\fISelectType=select/linear\fR. .TP \fB\-O\fR, \fB\-\-overcommit\fR -- GitLab