Support for 24.5.x (#348)

* support for 24.05.x

* --power / POWER_FLAGS were removed in 24.05

* CR_OTHER_CONS_TRES was removed in 24.05

* bump minimum cython version to 0.29.37

* partition: add power_down_on_idle attribute

---------

Co-authored-by: Bas van der Vlies <[email protected]>

Author: tazend

README.md

@@ -6,18 +6,18 @@ pyslurm is the Python client library for the [Slurm Workload Manager](https://sl
 
 * [Slurm](https://slurm.schedmd.com) - Slurm shared library and header files
 * [Python](https://www.python.org) - >= 3.6
-* [Cython](https://cython.org) - >= 0.29.36
+* [Cython](https://cython.org) - >= 0.29.37
 
-This Version is for Slurm 23.11.x
+This Version is for Slurm 24.05.x
 
 ## Versioning
 
 In pyslurm, the versioning scheme follows the official Slurm versioning. The
 first two numbers (`MAJOR.MINOR`) always correspond to Slurms Major-Release,
-for example `23.11`.
+for example `24.05`.
 The last number (`MICRO`) is however not tied in any way to Slurms `MICRO`
 version, but is instead PySlurm's internal Patch-Level. For example, any
-pyslurm 23.11.X version should work with any Slurm 23.11.X release.
+pyslurm 24.05.X version should work with any Slurm 24.05.X release.
 
 ## Installation
 
@@ -29,8 +29,8 @@ the corresponding paths to the necessary files.
 You can specify those with environment variables (recommended), for example:
 
 ```shell
-export SLURM_INCLUDE_DIR=/opt/slurm/23.11/include
-export SLURM_LIB_DIR=/opt/slurm/23.11/lib
+export SLURM_INCLUDE_DIR=/opt/slurm/24.05/include
+export SLURM_LIB_DIR=/opt/slurm/24.05/lib
 ```
 
 Then you can proceed to install pyslurm, for example by cloning the Repository:

build_requirements.txt

@@ -1,4 +1,4 @@
 setuptools>=59.2.0
 wheel>=0.37.0
-Cython>=0.29.36
+Cython>=0.29.37
 packaging>=21.3

pyproject.toml

@@ -3,7 +3,7 @@
 requires = [
     "setuptools>=59.2.0",
     "wheel>=0.37.0",
-    "Cython>=0.29.36",
+    "Cython>=0.29.37",
     "packaging>=21.3"
 ]
 

pyslurm/__version__.py

@@ -5,4 +5,4 @@
 # The last Number "Z" is the current Pyslurm patch version, which should be
 # incremented each time a new release is made (except when migrating to a new
 # Slurm Major release, then set it back to 0)
-__version__ = "23.11.0"
+__version__ = "24.5.0"

pyslurm/core/job/job.pxd

@@ -47,7 +47,7 @@ from pyslurm.slurm cimport (
     job_info_msg_t,
     slurm_job_info_t,
     slurm_job_state_string,
-    slurm_job_reason_string,
+    slurm_job_state_reason_string,
     slurm_job_share_string,
     slurm_job_batch_script,
     slurm_get_job_stdin,
@@ -358,8 +358,6 @@ cdef class Job:
             Whether the Job should be killed on an invalid dependency.
         spreads_over_nodes (bool):
             Whether the Job should be spread over as many nodes as possible.
-        power_options (list):
-            Options set for Power Management.
         is_cronjob (bool):
             Whether this Job is a cronjob.
         cronjob_time (str):

pyslurm/core/job/job.pyx

@@ -650,7 +650,7 @@ cdef class Job:
         if self.ptr.state_desc:
             return cstr.to_unicode(self.ptr.state_desc)
 
-        return cstr.to_unicode(slurm_job_reason_string(self.ptr.state_reason))
+        return cstr.to_unicode(slurm_job_state_reason_string(self.ptr.state_reason))
 
     @property
     def is_requeueable(self):
@@ -1177,10 +1177,6 @@ cdef class Job:
     def spreads_over_nodes(self):
         return u64_parse_bool_flag(self.ptr.bitflags, slurm.SPREAD_JOB)
 
-    @property
-    def power_options(self):
-        return power_type_int_to_list(self.ptr.power_flags)
-
     @property
     def is_cronjob(self):
         return u64_parse_bool_flag(self.ptr.bitflags, slurm.CRON_JOB)

pyslurm/core/job/sbatch_opts.pyx

@@ -138,7 +138,6 @@ SBATCH_OPTIONS = [
     SbatchOpt("O", "overcommit", "overcommit", True),
     SbatchOpt("s", "oversubscribe", "resource_sharing", "yes"),
     SbatchOpt("p", "partition", "partition"),
-    SbatchOpt(None, "power", "power_options"),
     SbatchOpt(None, "prefer", None),
     SbatchOpt(None, "priority", "priority"),
     SbatchOpt(None, "profile", "profile_types"),

pyslurm/core/job/submission.pxd

@@ -251,9 +251,6 @@ cdef class JobSubmitDescription:
         partitions (Union[list, str]):
             A list of partitions the Job may use.
             This is the same as -p/--partition from sbatch.
-        power_options (list):
-            A list of power management plugin options for the Job.
-            This is the same as --power from sbatch.
         accounting_gather_frequency (Union[dict, str]):
             Interval for accounting info to be gathered.
             This is the same as --acctg-freq from sbatch.
@@ -600,7 +597,6 @@ cdef class JobSubmitDescription:
         log_files_open_mode
         overcommit
         partitions
-        power_options
         profile_types
         accounting_gather_frequency
         qos

pyslurm/core/job/submission.pyx

@@ -266,7 +266,6 @@ cdef class JobSubmitDescription:
         ptr.requeue = u16_bool(self.is_requeueable)
         ptr.wait_all_nodes = u16_bool(self.wait_all_nodes)
         ptr.mail_type = mail_type_list_to_int(self.mail_types)
-        ptr.power_flags = power_type_list_to_int(self.power_options)
         ptr.profile = acctg_profile_list_to_int(self.profile_types)
         ptr.shared = shared_type_str_to_int(self.resource_sharing)
 

pyslurm/core/job/util.pyx

@@ -178,37 +178,6 @@ def acctg_profile_int_to_list(flags):
     return profiles
 
 
-def power_type_list_to_int(types):
-    """Convert a str or list of str with power types to uint8_t."""
-    cdef uint8_t flags = 0
-
-    if not types:
-        return slurm.NO_VAL8
-
-    if isinstance(types, str):
-        types = types.split(",")
-
-    for typ in types:
-        typ = typ.casefold()
-
-        if "level" == typ:
-            flags |= slurm.SLURM_POWER_FLAGS_LEVEL
-        else:
-            raise ValueError("Invalid power type: {typ}.")
-
-    return flags
-
-
-def power_type_int_to_list(flags):
-    """Convert uint8_t power type flags to a list of strings."""
-    types = []
-
-    if flags & slurm.SLURM_POWER_FLAGS_LEVEL:
-        types.append("LEVEL")
-
-    return types
-
-
 def shared_type_str_to_int(typ):
     """Convert a job-sharing type str to its numerical representation."""
     if not typ:
@@ -227,7 +196,7 @@ def shared_type_str_to_int(typ):
         raise ValueError(f"Invalid resource_sharing type: {typ}.")
 
 
-def cpu_gov_str_to_int(gov): 
+def cpu_gov_str_to_int(gov):
     """Convert a cpu governor str to is numerical representation."""
     if not gov:
         return u32(None)