Skip to content

Commit f778e9d

Browse files
JonaOttotazend
authored andcommitted
Fixed mem_per_cpu setting in job class (#243)
* Fixed mem_per_cpu setting. * Fixed settings with mem_per_cp mentions.
1 parent b997755 commit f778e9d

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
@@ -659,7 +659,7 @@ cdef class config:
659659
Ctl_dict['max_dbd_msgs'] = self.__Config_ptr.max_dbd_msgs
660660
Ctl_dict['max_job_cnt'] = self.__Config_ptr.max_job_cnt
661661
Ctl_dict['max_job_id'] = self.__Config_ptr.max_job_id
662-
Ctl_dict['max_mem_per_cp'] = self.__Config_ptr.max_mem_per_cpu
662+
Ctl_dict['max_mem_per_cpu'] = self.__Config_ptr.max_mem_per_cpu
663663
Ctl_dict['max_step_cnt'] = self.__Config_ptr.max_step_cnt
664664
Ctl_dict['max_tasks_per_node'] = self.__Config_ptr.max_tasks_per_node
665665
Ctl_dict['min_job_age'] = self.__Config_ptr.min_job_age
@@ -1062,16 +1062,16 @@ cdef class partition:
10621062

10631063
if record.max_mem_per_cpu & slurm.MEM_PER_CPU:
10641064
if record.max_mem_per_cpu == slurm.MEM_PER_CPU:
1065-
Part_dict['max_mem_per_cp'] = "UNLIMITED"
1065+
Part_dict['max_mem_per_cpu'] = "UNLIMITED"
10661066
Part_dict['max_mem_per_node'] = None
10671067
else:
1068-
Part_dict['max_mem_per_cp'] = record.max_mem_per_cpu & (~slurm.MEM_PER_CPU)
1068+
Part_dict['max_mem_per_cpu'] = record.max_mem_per_cpu & (~slurm.MEM_PER_CPU)
10691069
Part_dict['max_mem_per_node'] = None
10701070
elif record.max_mem_per_cpu == 0:
1071-
Part_dict['max_mem_per_cp'] = None
1071+
Part_dict['max_mem_per_cpu'] = None
10721072
Part_dict['max_mem_per_node'] = "UNLIMITED"
10731073
else:
1074-
Part_dict['max_mem_per_cp'] = None
1074+
Part_dict['max_mem_per_cpu'] = None
10751075
Part_dict['max_mem_per_node'] = record.max_mem_per_cpu
10761076

10771077
if record.max_nodes == slurm.INFINITE:
@@ -2068,12 +2068,12 @@ cdef class job:
20682068

20692069
if self._record.pn_min_memory & slurm.MEM_PER_CPU:
20702070
self._record.pn_min_memory &= (~slurm.MEM_PER_CPU)
2071-
Job_dict['mem_per_cp'] = True
2071+
Job_dict['mem_per_cpu'] = True
20722072
Job_dict['min_memory_cp'] = self._record.pn_min_memory
20732073
Job_dict['mem_per_node'] = False
20742074
Job_dict['min_memory_node'] = None
20752075
else:
2076-
Job_dict['mem_per_cp'] = False
2076+
Job_dict['mem_per_cpu'] = False
20772077
Job_dict['min_memory_cp'] = None
20782078
Job_dict['mem_per_node'] = True
20792079
Job_dict['min_memory_node'] = self._record.pn_min_memory
@@ -2521,8 +2521,8 @@ cdef class job:
25212521

25222522
if job_opts.get("realmem"):
25232523
desc.pn_min_memory = job_opts.get("realmem")
2524-
elif job_opts.get("mem_per_cp"):
2525-
desc.pn_min_memory = job_opts.get("mem_per_cp") | slurm.MEM_PER_CPU
2524+
elif job_opts.get("mem_per_cpu"):
2525+
desc.pn_min_memory = job_opts.get("mem_per_cpu") | slurm.MEM_PER_CPU
25262526

25272527
if job_opts.get("tmpdisk"):
25282528
desc.pn_min_tmp_disk = job_opts.get("tmpdisk")
@@ -5285,10 +5285,10 @@ cdef class slurmdb_jobs:
52855285

52865286
if job.req_mem & slurm.MEM_PER_CPU:
52875287
JOBS_info['req_mem'] = job.req_mem & (~slurm.MEM_PER_CPU)
5288-
JOBS_info['req_mem_per_cp'] = True
5288+
JOBS_info['req_mem_per_cpu'] = True
52895289
else:
52905290
JOBS_info['req_mem'] = job.req_mem
5291-
JOBS_info['req_mem_per_cp'] = False
5291+
JOBS_info['req_mem_per_cpu'] = False
52925292

52935293
JOBS_info['requid'] = job.requid
52945294
JOBS_info['resvid'] = job.resvid

0 commit comments

Comments
 (0)