Skip to content

Commit 07f7d86

Browse files
committed
add new headers for 24.11
1 parent f6a84c0 commit 07f7d86

File tree

3 files changed

+261
-216
lines changed

3 files changed

+261
-216
lines changed

pyslurm/slurm/slurm.h.pxi

Lines changed: 52 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# * C-Macros are listed with their appropriate uint type
1010
# * Any definitions that cannot be translated are not included in this file
1111
#
12-
# Generated on 2024-07-12T16:21:51.963583
12+
# Generated on 2024-12-04T13:40:11.790952
1313
#
1414
# The Original Copyright notice from slurm.h has been included
1515
# below:
@@ -70,6 +70,8 @@ cdef extern from "slurm/slurm.h":
7070
uint32_t MAX_FED_JOB_ID
7171
uint8_t MAX_HET_JOB_COMPONENTS
7272
uint8_t MAX_FED_CLUSTERS
73+
uint16_t MAX_JOB_SIZE_BITMAP
74+
uint32_t MAX_SLURM_NODES
7375
uint32_t SLURM_MAX_NORMAL_STEP_ID
7476
uint32_t SLURM_PENDING_STEP
7577
uint32_t SLURM_EXTERN_CONT
@@ -79,7 +81,6 @@ cdef extern from "slurm/slurm.h":
7981
uint8_t JOB_STATE_BASE
8082
uint32_t JOB_STATE_FLAGS
8183
uint16_t JOB_LAUNCH_FAILED
82-
uint16_t JOB_UPDATE_DB
8384
uint16_t JOB_REQUEUE
8485
uint16_t JOB_REQUEUE_HOLD
8586
uint16_t JOB_SPECIAL_EXIT
@@ -308,6 +309,8 @@ cdef extern from "slurm/slurm.h":
308309
uint16_t PART_FLAG_PDOI_CLR
309310
uint32_t PART_FLAG_EXCLUSIVE_TOPO
310311
uint32_t PART_FLAG_EXC_TOPO_CLR
312+
uint32_t PART_FLAG_SCHED_FAILED
313+
uint32_t PART_FLAG_SCHED_CLEARED
311314
uint8_t RESERVE_FLAG_MAINT
312315
uint8_t RESERVE_FLAG_NO_MAINT
313316
uint8_t RESERVE_FLAG_DAILY
@@ -348,6 +351,7 @@ cdef extern from "slurm/slurm.h":
348351
uint64_t RESERVE_TRES_PER_NODE
349352
uint64_t RESERVE_FLAG_USER_DEL
350353
uint64_t RESERVE_FLAG_NO_USER_DEL
354+
uint64_t RESERVE_FLAG_SCHED_FAILED
351355
uint8_t DEBUG_FLAG_SELECT_TYPE
352356
uint8_t DEBUG_FLAG_STEPS
353357
uint8_t DEBUG_FLAG_TRIGGERS
@@ -357,7 +361,7 @@ cdef extern from "slurm/slurm.h":
357361
uint8_t DEBUG_FLAG_GRES
358362
uint8_t DEBUG_FLAG_MPI
359363
uint16_t DEBUG_FLAG_DATA
360-
uint16_t DEBUG_FLAG_WORKQ
364+
uint16_t DEBUG_FLAG_CONMGR
361365
uint16_t DEBUG_FLAG_NET
362366
uint16_t DEBUG_FLAG_PRIO
363367
uint16_t DEBUG_FLAG_BACKFILL
@@ -529,6 +533,8 @@ cdef extern from "slurm/slurm.h":
529533

530534
cdef extern from "slurm/slurm.h":
531535

536+
ctypedef uint64_t sluid_t
537+
532538
ctypedef sockaddr_storage slurm_addr_t
533539

534540
ctypedef slurmdb_cluster_rec slurmdb_cluster_rec_t
@@ -938,7 +944,6 @@ cdef extern from "slurm/slurm.h":
938944
CPU_BIND_TO_SOCKETS
939945
CPU_BIND_TO_LDOMS
940946
CPU_BIND_NONE
941-
CPU_BIND_RANK
942947
CPU_BIND_MAP
943948
CPU_BIND_MASK
944949
CPU_BIND_LDRANK
@@ -950,6 +955,7 @@ cdef extern from "slurm/slurm.h":
950955
CPU_AUTO_BIND_TO_SOCKETS
951956
SLURMD_OFF_SPEC
952957
CPU_BIND_OFF
958+
OOM_KILL_STEP
953959

954960
ctypedef cpu_bind_type cpu_bind_type_t
955961

@@ -1027,8 +1033,6 @@ cdef extern from "slurm/slurm.h":
10271033

10281034
void slurm_hostlist_uniq(hostlist_t* hl)
10291035

1030-
ctypedef xlist* List
1031-
10321036
ctypedef xlist list_t
10331037

10341038
ctypedef listIterator list_itr_t
@@ -1082,6 +1086,7 @@ cdef extern from "slurm/slurm.h":
10821086
uint32_t current_watts
10831087
uint64_t previous_consumed_energy
10841088
time_t poll_time
1089+
time_t slurmd_start_time
10851090

10861091
ctypedef acct_gather_energy acct_gather_energy_t
10871092

@@ -1153,6 +1158,7 @@ cdef extern from "slurm/slurm.h":
11531158
char* network
11541159
uint32_t nice
11551160
uint32_t num_tasks
1161+
uint16_t oom_kill_step
11561162
uint8_t open_mode
11571163
char* origin_cluster
11581164
uint16_t other_port
@@ -1312,6 +1318,7 @@ cdef extern from "slurm/slurm.h":
13121318
uint32_t num_cpus
13131319
uint32_t num_nodes
13141320
uint32_t num_tasks
1321+
uint16_t oom_kill_step
13151322
char* partition
13161323
char* prefer
13171324
uint64_t pn_min_memory
@@ -1322,7 +1329,7 @@ cdef extern from "slurm/slurm.h":
13221329
time_t pre_sus_time
13231330
uint32_t priority
13241331
uint32_t* priority_array
1325-
char* priority_array_parts
1332+
char* priority_array_names
13261333
uint32_t profile
13271334
char* qos
13281335
uint8_t reboot
@@ -1337,7 +1344,6 @@ cdef extern from "slurm/slurm.h":
13371344
char* sched_nodes
13381345
char* selinux_context
13391346
uint16_t shared
1340-
uint16_t show_flags
13411347
uint32_t site_factor
13421348
uint16_t sockets_per_board
13431349
uint16_t sockets_per_node
@@ -1411,6 +1417,26 @@ cdef extern from "slurm/slurm.h":
14111417

14121418
ctypedef job_info_msg job_info_msg_t
14131419

1420+
cdef struct listjobs_info:
1421+
uint32_t job_id
1422+
1423+
ctypedef listjobs_info listjobs_info_t
1424+
1425+
cdef struct listpids_info:
1426+
uint32_t global_task_id
1427+
uint32_t job_id
1428+
uint32_t local_task_id
1429+
pid_t pid
1430+
char* step_id
1431+
1432+
ctypedef listpids_info listpids_info_t
1433+
1434+
cdef struct liststeps_info:
1435+
uint32_t job_id
1436+
char* step_id
1437+
1438+
ctypedef liststeps_info liststeps_info_t
1439+
14141440
ctypedef struct job_state_response_job_t:
14151441
uint32_t job_id
14161442
uint32_t array_job_id
@@ -1465,6 +1491,7 @@ cdef extern from "slurm/slurm.h":
14651491
ctypedef slurm_step_layout slurm_step_layout_t
14661492

14671493
cdef struct slurm_step_id_msg:
1494+
sluid_t sluid
14681495
uint32_t job_id
14691496
uint32_t step_het_comp
14701497
uint32_t step_id
@@ -1631,6 +1658,7 @@ cdef extern from "slurm/slurm.h":
16311658
uint32_t spank_job_env_size
16321659
char* tres_bind
16331660
char* tres_freq
1661+
uint16_t oom_kill_step
16341662

16351663
ctypedef void (*_slurm_step_launch_callbacks_t_slurm_step_launch_callbacks_t_step_complete_ft)(srun_job_complete_msg_t*)
16361664

@@ -2088,8 +2116,11 @@ cdef extern from "slurm/slurm.h":
20882116
char* bcast_exclude
20892117
char* bcast_parameters
20902118
time_t boot_time
2119+
char* certmgr_params
2120+
char* certmgr_type
20912121
void* cgroup_conf
20922122
char* cli_filter_plugins
2123+
uint16_t cluster_id
20932124
char* cluster_name
20942125
char* comm_params
20952126
uint16_t complete_wait
@@ -2100,6 +2131,7 @@ cdef extern from "slurm/slurm.h":
21002131
uint32_t cpu_freq_def
21012132
uint32_t cpu_freq_govs
21022133
char* cred_type
2134+
char* data_parser_parameters
21032135
uint64_t debug_flags
21042136
uint64_t def_mem_per_cpu
21052137
char* dependency_params
@@ -2315,6 +2347,7 @@ cdef extern from "slurm/slurm.h":
23152347
cdef struct slurm_update_node_msg:
23162348
char* comment
23172349
uint32_t cpu_bind
2350+
char* cert_token
23182351
char* extra
23192352
char* features
23202353
char* features_act
@@ -2349,6 +2382,11 @@ cdef extern from "slurm/slurm.h":
23492382

23502383
ctypedef job_sbcast_cred_msg job_sbcast_cred_msg_t
23512384

2385+
cdef struct sbcast_cred_req_msg:
2386+
char* node_list
2387+
2388+
ctypedef sbcast_cred_req_msg sbcast_cred_req_msg_t
2389+
23522390
ctypedef struct token_request_msg_t:
23532391
uint32_t lifespan
23542392
char* username
@@ -2647,14 +2685,6 @@ cdef extern from "slurm/slurm.h":
26472685

26482686
int slurm_reset_statistics(stats_info_request_msg_t* req)
26492687

2650-
int slurm_job_cpus_allocated_on_node_id(job_resources_t* job_resrcs_ptr, int node_id)
2651-
2652-
int slurm_job_cpus_allocated_on_node(job_resources_t* job_resrcs_ptr, const char* node_name)
2653-
2654-
int slurm_job_cpus_allocated_str_on_node_id(char* cpus, size_t cpus_len, job_resources_t* job_resrcs_ptr, int node_id)
2655-
2656-
int slurm_job_cpus_allocated_str_on_node(char* cpus, size_t cpus_len, job_resources_t* job_resrcs_ptr, const char* node_name)
2657-
26582688
void slurm_free_job_info_msg(job_info_msg_t* job_buffer_ptr)
26592689

26602690
void slurm_free_job_state_response_msg(job_state_response_msg_t* msg)
@@ -2687,12 +2717,6 @@ cdef extern from "slurm/slurm.h":
26872717

26882718
int slurm_pid2jobid(pid_t job_pid, uint32_t* job_id_ptr)
26892719

2690-
void slurm_print_job_info(FILE* out, slurm_job_info_t* job_ptr, int one_liner)
2691-
2692-
void slurm_print_job_info_msg(FILE* out, job_info_msg_t* job_info_msg_ptr, int one_liner)
2693-
2694-
char* slurm_sprint_job_info(slurm_job_info_t* job_ptr, int one_liner)
2695-
26962720
int slurm_update_job(job_desc_msg_t* job_msg)
26972721

26982722
int slurm_update_job2(job_desc_msg_t* job_msg, job_array_resp_msg_t** resp)
@@ -2825,6 +2849,12 @@ cdef extern from "slurm/slurm.h":
28252849
long latency
28262850
int offset
28272851

2852+
ctypedef struct slurmdbd_ping_t:
2853+
char* hostname
2854+
bool pinged
2855+
long latency
2856+
int offset
2857+
28282858
int slurm_ping(int dest)
28292859

28302860
controller_ping_t* ping_all_controllers()

pyslurm/slurm/slurm_errno.h.pxi

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# * C-Macros are listed with their appropriate uint type
1010
# * Any definitions that cannot be translated are not included in this file
1111
#
12-
# Generated on 2024-07-12T16:21:51.735507
12+
# Generated on 2024-12-04T13:40:11.641040
1313
#
1414
# The Original Copyright notice from slurm_errno.h has been included
1515
# below:
@@ -72,6 +72,9 @@ cdef extern from "slurm/slurm_errno.h":
7272
SLURM_PLUGIN_NAME_INVALID
7373
SLURM_UNKNOWN_FORWARD_ADDR
7474
SLURM_COMMUNICATIONS_MISSING_SOCKET_ERROR
75+
SLURM_COMMUNICATIONS_INVALID_INCOMING_FD
76+
SLURM_COMMUNICATIONS_INVALID_OUTGOING_FD
77+
SLURM_COMMUNICATIONS_INVALID_FD
7578
SLURMCTLD_COMMUNICATIONS_CONNECTION_ERROR
7679
SLURMCTLD_COMMUNICATIONS_SEND_ERROR
7780
SLURMCTLD_COMMUNICATIONS_RECEIVE_ERROR
@@ -180,7 +183,6 @@ cdef extern from "slurm/slurm_errno.h":
180183
ESLURM_BURST_BUFFER_WAIT
181184
ESLURM_PARTITION_DOWN
182185
ESLURM_DUPLICATE_GRES
183-
ESLURM_JOB_SETTING_DB_INX
184186
ESLURM_RSV_ALREADY_STARTED
185187
ESLURM_SUBMISSIONS_DISABLED
186188
ESLURM_NOT_HET_JOB
@@ -255,6 +257,7 @@ cdef extern from "slurm/slurm_errno.h":
255257
ESLURM_RES_CORES_PER_GPU_TOPO
256258
ESLURM_RES_CORES_PER_GPU_NO
257259
ESLURM_MAX_POWERED_NODES
260+
ESLURM_REQUESTED_TOPO_CONFIG_UNAVAILABLE
258261
ESPANK_ERROR
259262
ESPANK_BAD_ARG
260263
ESPANK_NOT_TASK
@@ -294,6 +297,7 @@ cdef extern from "slurm/slurm_errno.h":
294297
SLURM_PROTOCOL_SOCKET_IMPL_TIMEOUT
295298
SLURM_PROTOCOL_SOCKET_ZERO_BYTES_SENT
296299
ESLURM_AUTH_CRED_INVALID
300+
ESLURM_AUTH_EXPIRED
297301
ESLURM_AUTH_BADARG
298302
ESLURM_AUTH_UNPACK
299303
ESLURM_AUTH_SKIP
@@ -366,6 +370,4 @@ cdef extern from "slurm/slurm_errno.h":
366370

367371
void slurm_seterrno(int errnum)
368372

369-
int slurm_get_errno()
370-
371373
void slurm_perror(const char* msg)

0 commit comments

Comments
 (0)