From 0598ea2c7141c31fe227404bfc1c7a54a6d8dc1b Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 18 Feb 2009 18:24:40 +0000
Subject: [PATCH] clarify how SelectTypeParameters is interpretted

---
 doc/man/man5/slurm.conf.5 | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 76ddb0ced10..c38b0587f05 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -1130,18 +1130,30 @@ Setting a value for \fBDefMemPerCPU\fR is strongly recommended.
 .TP
 \fBCR_Core\fR
 Cores are consumable resources.
+On nodes with hyper\-threads, each thread is counted as a CPU to 
+satisfy a job's resource requirement, but multiple jobs are not 
+allocated threads on the same core.
 .TP
 \fBCR_Core_Memory\fR
 Cores and memory are consumable resources.
+On nodes with hyper\-threads, each thread is counted as a CPU to 
+satisfy a job's resource requirement, but multiple jobs are not 
+allocated threads on the same core.
 Setting a value for \fBDefMemPerCPU\fR is strongly recommended.
 .TP
 \fBCR_Socket\fR
 Sockets are consumable resources. 
+On nodes with multiple cores, each core or thread is counted as a CPU 
+to satisfy a job's resource requirement, but multiple jobs are not 
+allocated resources on the same socket.
 Note that jobs requesting one CPU will only be given access to 
 that one CPU, but no other job will share the socket.
 .TP
 \fBCR_Socket_Memory\fR
-Memory and CPUs are consumable resources.
+Memory and sockets are consumable resources. 
+On nodes with multiple cores, each core or thread is counted as a CPU 
+to satisfy a job's resource requirement, but multiple jobs are not
+allocated resources on the same socket.
 Note that jobs requesting one CPU will only be given access to 
 that one CPU, but no other job will share the socket.
 Setting a value for \fBDefMemPerCPU\fR is strongly recommended.
@@ -2124,7 +2136,7 @@ PartitionName=long Nodes=dev[9\-17] MaxTime=120 AllowGroups=admin
 
 .SH "COPYING"
 Copyright (C) 2002\-2007 The Regents of the University of California.
-Copyright (C) 2008 Lawrence Livermore National Security.
+Copyright (C) 2008\-2009 Lawrence Livermore National Security.
 Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 LLNL\-CODE\-402394.
 .LP
-- 
GitLab