forked from pool/slurm
Christian Goll
927cd6ab24
- Udpate to 20.11.04 * Fix node selection for advanced reservations with features. * mpi/pmix: Handle pipe failure better when using ucx. * mpi/pmix: include PMIX_NODEID for each process entry. * Fix job getting rejected after being requeued on same node that died. * job_submit/lua - add "network" field. * Fix situations when a reoccuring reservation could erroneously skip a period. * Ensure that a reservations [pro|epi]log are ran on reoccuring reservations. * Fix threads-per-core memory allocation issue when using CR_CPU_MEMORY. * Fix scheduling issue with --gpus. * Fix gpu allocations that request --cpus-per-task. * mpi/pmix: fixed print messages for all PMIXP_* macros * Add mapping for XCPU to --signal option. * Fix regression in 20.11 that prevented a full pass of the main scheduler from ever executing. * Work around a glibc bug in which "0" is incorrectly printed as "nan" which will result in corrupted association state on restart. * Fix regression in 20.11 which made slurmd incorrectly attempt to find the parent slurmd address when not applicable and send incorrect reverse*tree info to the slurmstepd. * Fix cgroup ns detection when using containers (e.g. LXC or Docker). * scrontab - change temporary file handling to work with emacs. - Removed check-for-lipmix.so.MAJOR.patch - Added: load-pmix-major-version.patch OBS-URL: https://build.opensuse.org/request/show/874647 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=173
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From dfc32b8dd2e5899b191cf680105a52748d8ea359 Mon Sep 17 00:00:00 2001
|
|
From: Christian Goll <cgoll@suse.de>
|
|
Date: Tue, 23 Feb 2021 13:45:11 +0100
|
|
Subject: [PATCH] load pmix major version
|
|
|
|
---
|
|
src/plugins/mpi/pmix/mpi_pmix.c | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c
|
|
index 69c5191112..bdbf011162 100644
|
|
--- a/src/plugins/mpi/pmix/mpi_pmix.c
|
|
+++ b/src/plugins/mpi/pmix/mpi_pmix.c
|
|
@@ -112,10 +112,14 @@ static void *_libpmix_open(void)
|
|
xstrfmtcat(full_path, "%s/", PMIXP_V2_LIBPATH);
|
|
#elif defined PMIXP_V3_LIBPATH
|
|
xstrfmtcat(full_path, "%s/", PMIXP_V3_LIBPATH);
|
|
+#define PMIX_SO_STRING ".2"
|
|
#endif
|
|
xstrfmtcat(full_path, "libpmix.so");
|
|
-
|
|
- lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
|
|
+#ifdef PMIX_SO_STRING
|
|
+ lib_plug = dlopen("libpmix.so"PMIX_SO_STRING, RTLD_LAZY | RTLD_GLOBAL);
|
|
+ if(!lib_plug)
|
|
+#endif
|
|
+ lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
|
|
xfree(full_path);
|
|
|
|
if (lib_plug && (HAVE_PMIX_VER != pmixp_lib_get_version())) {
|
|
--
|
|
2.26.2
|
|
|