mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-06 21:20:33 +02:00
* gnu/packages/patches/slurm-drmaa-25.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/parallel.scm (slurm-drmaa)[source]: Add patch. Change-Id: Ieca80af78f34d3bd136a8108d1eaeae4c2b32df3
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
Taken from https://patch-diff.githubusercontent.com/raw/natefoo/slurm-drmaa/pull/96.patch
|
|
|
|
diff --git a/slurm_drmaa/job.c b/slurm_drmaa/job.c
|
|
index 362c6dc..249f396 100644
|
|
--- a/slurm_drmaa/job.c
|
|
+++ b/slurm_drmaa/job.c
|
|
@@ -522,7 +522,22 @@ slurmdrmaa_job_on_missing( fsd_job_t *self )
|
|
job_cond->step_list = slurm_list_create(slurmdb_destroy_selected_step);
|
|
#endif
|
|
|
|
+#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(24,11,0)
|
|
+ /* slurm_addto_step_list() was removed in SLURM 24.11.0+ */
|
|
+ {
|
|
+ slurm_selected_step_t *selected_step;
|
|
+ fsd_calloc(selected_step, 1, slurm_selected_step_t);
|
|
+ selected_step->array_bitmap = NULL;
|
|
+ selected_step->array_task_id = NO_VAL;
|
|
+ selected_step->het_job_offset = NO_VAL;
|
|
+ selected_step->step_id.job_id = atoi(self->job_id);
|
|
+ selected_step->step_id.step_id = NO_VAL;
|
|
+ selected_step->step_id.step_het_comp = NO_VAL;
|
|
+ slurm_list_append(job_cond->step_list, selected_step);
|
|
+ }
|
|
+#else
|
|
slurm_addto_step_list(job_cond->step_list, self->job_id);
|
|
+#endif
|
|
job_cond->usage_end = time(NULL);
|
|
acct_db_conn = slurmdb_connection_get(NULL);
|
|
jobs = slurmdb_jobs_get(acct_db_conn, job_cond);
|