From b15afcd034e312cab42f1acfe99c1e94f944f05e Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 24 Jun 2010 19:31:32 +0000
Subject: [PATCH] fix for support of gang scheduling with
SelectTypeParameter=CR_CPU and task affinity (was using CPU count instead of
core count in bitmap logic).
---
src/slurmctld/gang.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/slurmctld/gang.c b/src/slurmctld/gang.c
index f9f30dc8221..f584d2458c6 100644
--- a/src/slurmctld/gang.c
+++ b/src/slurmctld/gang.c
@@ -244,7 +244,7 @@ static void _load_phys_res_cnt(void)
for (i = 0, node_ptr = node_record_table_ptr; i < node_record_count;
i++, node_ptr++) {
- if ((gr_type == GS_CPU) || (gr_type == GS_CPU2)) {
+ if (gr_type == GS_CPU) {
if (gs_fast_schedule)
bit = node_ptr->config_ptr->cpus;
else
@@ -275,12 +275,12 @@ static uint16_t _get_phys_bit_cnt(int node_index)
struct node_record *node_ptr = node_record_table_ptr + node_index;
if (gs_fast_schedule) {
- if ((gr_type == GS_CPU) || (gr_type == GS_CPU2))
+ if (gr_type == GS_CPU)
return node_ptr->config_ptr->cpus;
return node_ptr->config_ptr->cores *
node_ptr->config_ptr->sockets;
} else {
- if ((gr_type == GS_CPU) || (gr_type == GS_CPU2))
+ if (gr_type == GS_CPU)
return node_ptr->cpus;
return node_ptr->cores * node_ptr->sockets;
}
--
GitLab