From e1dc6635c6a1c920912cbb8692ee033c66e77615 Mon Sep 17 00:00:00 2001
From: jette <jette@schedmd.com>
Date: Sat, 19 Oct 2013 20:19:11 -0700
Subject: [PATCH] Make slurmd -C format match slurm.conf
Change Sockets to SocketsPerBoard and Procs to CPUs
---
src/slurmd/slurmd/slurmd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index 1b089582459..a3579771247 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -618,13 +618,13 @@ _fill_registration_msg(slurm_node_registration_status_msg_t *msg)
if (first_msg) {
first_msg = false;
- info("Procs=%u Boards=%u Sockets=%u Cores=%u Threads=%u "
+ info("CPUs=%u Boards=%u Sockets=%u Cores=%u Threads=%u "
"Memory=%u TmpDisk=%u Uptime=%u",
msg->cpus, msg->boards, msg->sockets, msg->cores,
msg->threads, msg->real_memory, msg->tmp_disk,
msg->up_time);
} else {
- debug3("Procs=%u Boards=%u Sockets=%u Cores=%u Threads=%u "
+ debug3("CPUs=%u Boards=%u Sockets=%u Cores=%u Threads=%u "
"Memory=%u TmpDisk=%u Uptime=%u",
msg->cpus, msg->boards, msg->sockets, msg->cores,
msg->threads, msg->real_memory, msg->tmp_disk,
@@ -840,7 +840,7 @@ _read_config(void)
if (cf->fast_schedule) {
info("Node configuration differs from hardware: "
"CPUs=%u:%u(hw) Boards=%u:%u(hw) "
- "Sockets=%u:%u(hw) CoresPerSocket=%u:%u(hw) "
+ "SocketsPerBoard=%u:%u(hw) CoresPerSocket=%u:%u(hw) "
"ThreadsPerCore=%u:%u(hw)",
conf->cpus, conf->actual_cpus,
conf->boards, conf->actual_boards,
@@ -855,7 +855,7 @@ _read_config(void)
"the bitmaps the slurmctld must create before "
"the slurmd registers.\n"
" CPUs=%u:%u(hw) Boards=%u:%u(hw) "
- "Sockets=%u:%u(hw) CoresPerSocket=%u:%u(hw) "
+ "SocketsPerBoard=%u:%u(hw) CoresPerSocket=%u:%u(hw) "
"ThreadsPerCore=%u:%u(hw)",
conf->cpus, conf->actual_cpus,
conf->boards, conf->actual_boards,
@@ -1174,7 +1174,7 @@ _print_config(void)
&conf->actual_threads,
&conf->block_map_size,
&conf->block_map, &conf->block_map_inv);
- printf("CPUs=%u Boards=%u Sockets=%u CoresPerSocket=%u "
+ printf("CPUs=%u Boards=%u SocketsPerBoard=%u CoresPerSocket=%u "
"ThreadsPerCore=%u ",
conf->actual_cpus, conf->actual_boards, conf->actual_sockets,
conf->actual_cores, conf->actual_threads);
--
GitLab