Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pyslurm/core/reservation.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,8 @@ class ReservationFlags(SlurmFlag):
SKIP = slurm.RESERVE_FLAG_SKIP
SCHED_FAILED = slurm.RESERVE_FLAG_SCHED_FAILED
REPLACE_DOWN = slurm.RESERVE_FLAG_REPLACE_DOWN
GRES_REQUIRED = slurm.RESERVE_FLAG_GRES_REQ
TRES_PER_NODE = slurm.RESERVE_TRES_PER_NODE


class ReservationReoccurrence(SlurmEnum):
Expand Down
16 changes: 16 additions & 0 deletions tests/unit/test_reservation.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,19 @@ def test_flags_sched_failed():
decoded = ReservationFlags(combo.value)
assert ReservationFlags.SCHED_FAILED in decoded


def test_flags_gres_tres():
# Regression: reservations with GRES/TRES (e.g. TRES=cpu=2,gres/gpu=2)
# cause Slurm to set GRES_REQ and TRES_PER_NODE internally, which
# previously raised ValueError due to unrecognised bits.
combo = (
ReservationFlags.SPECIFIC_NODES # SLURM_BIT(15) = 32768
| ReservationFlags.GRES_REQUIRED # SLURM_BIT(37) = 137438953472
| ReservationFlags.TRES_PER_NODE # SLURM_BIT(38) = 274877906944
)
assert combo.value == 412316893184
decoded = ReservationFlags(412316893184)
assert ReservationFlags.GRES_REQUIRED in decoded
assert ReservationFlags.TRES_PER_NODE in decoded
assert ReservationFlags.SPECIFIC_NODES in decoded