Skip to content

Commit f60220c

Browse files
authored
Fixed mem_per_cpu setting in job class (#243)
* Fixed mem_per_cpu setting. * Fixed settings with mem_per_cp mentions.
1 parent f110bf5 commit f60220c

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

pyslurm/pyslurm.pyx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ cdef class config:
655655
Ctl_dict['max_dbd_msgs'] = self.__Config_ptr.max_dbd_msgs
656656
Ctl_dict['max_job_cnt'] = self.__Config_ptr.max_job_cnt
657657
Ctl_dict['max_job_id'] = self.__Config_ptr.max_job_id
658-
Ctl_dict['max_mem_per_cp'] = self.__Config_ptr.max_mem_per_cpu
658+
Ctl_dict['max_mem_per_cpu'] = self.__Config_ptr.max_mem_per_cpu
659659
Ctl_dict['max_step_cnt'] = self.__Config_ptr.max_step_cnt
660660
Ctl_dict['max_tasks_per_node'] = self.__Config_ptr.max_tasks_per_node
661661
Ctl_dict['min_job_age'] = self.__Config_ptr.min_job_age
@@ -1058,16 +1058,16 @@ cdef class partition:
10581058

10591059
if record.max_mem_per_cpu & slurm.MEM_PER_CPU:
10601060
if record.max_mem_per_cpu == slurm.MEM_PER_CPU:
1061-
Part_dict['max_mem_per_cp'] = "UNLIMITED"
1061+
Part_dict['max_mem_per_cpu'] = "UNLIMITED"
10621062
Part_dict['max_mem_per_node'] = None
10631063
else:
1064-
Part_dict['max_mem_per_cp'] = record.max_mem_per_cpu & (~slurm.MEM_PER_CPU)
1064+
Part_dict['max_mem_per_cpu'] = record.max_mem_per_cpu & (~slurm.MEM_PER_CPU)
10651065
Part_dict['max_mem_per_node'] = None
10661066
elif record.max_mem_per_cpu == 0:
1067-
Part_dict['max_mem_per_cp'] = None
1067+
Part_dict['max_mem_per_cpu'] = None
10681068
Part_dict['max_mem_per_node'] = "UNLIMITED"
10691069
else:
1070-
Part_dict['max_mem_per_cp'] = None
1070+
Part_dict['max_mem_per_cpu'] = None
10711071
Part_dict['max_mem_per_node'] = record.max_mem_per_cpu
10721072

10731073
if record.max_nodes == slurm.INFINITE:
@@ -2064,12 +2064,12 @@ cdef class job:
20642064

20652065
if self._record.pn_min_memory & slurm.MEM_PER_CPU:
20662066
self._record.pn_min_memory &= (~slurm.MEM_PER_CPU)
2067-
Job_dict['mem_per_cp'] = True
2067+
Job_dict['mem_per_cpu'] = True
20682068
Job_dict['min_memory_cp'] = self._record.pn_min_memory
20692069
Job_dict['mem_per_node'] = False
20702070
Job_dict['min_memory_node'] = None
20712071
else:
2072-
Job_dict['mem_per_cp'] = False
2072+
Job_dict['mem_per_cpu'] = False
20732073
Job_dict['min_memory_cp'] = None
20742074
Job_dict['mem_per_node'] = True
20752075
Job_dict['min_memory_node'] = self._record.pn_min_memory
@@ -2517,8 +2517,8 @@ cdef class job:
25172517

25182518
if job_opts.get("realmem"):
25192519
desc.pn_min_memory = job_opts.get("realmem")
2520-
elif job_opts.get("mem_per_cp"):
2521-
desc.pn_min_memory = job_opts.get("mem_per_cp") | slurm.MEM_PER_CPU
2520+
elif job_opts.get("mem_per_cpu"):
2521+
desc.pn_min_memory = job_opts.get("mem_per_cpu") | slurm.MEM_PER_CPU
25222522

25232523
if job_opts.get("tmpdisk"):
25242524
desc.pn_min_tmp_disk = job_opts.get("tmpdisk")
@@ -5281,10 +5281,10 @@ cdef class slurmdb_jobs:
52815281

52825282
if job.req_mem & slurm.MEM_PER_CPU:
52835283
JOBS_info['req_mem'] = job.req_mem & (~slurm.MEM_PER_CPU)
5284-
JOBS_info['req_mem_per_cp'] = True
5284+
JOBS_info['req_mem_per_cpu'] = True
52855285
else:
52865286
JOBS_info['req_mem'] = job.req_mem
5287-
JOBS_info['req_mem_per_cp'] = False
5287+
JOBS_info['req_mem_per_cpu'] = False
52885288

52895289
JOBS_info['requid'] = job.requid
52905290
JOBS_info['resvid'] = job.resvid

0 commit comments

Comments
 (0)