diff --git a/load-pmix-major-version.patch b/load-pmix-major-version.patch deleted file mode 100644 index 8ae282e..0000000 --- a/load-pmix-major-version.patch +++ /dev/null @@ -1,33 +0,0 @@ -From dfc32b8dd2e5899b191cf680105a52748d8ea359 Mon Sep 17 00:00:00 2001 -From: Christian Goll -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 - diff --git a/slurm-2.4.4-init.patch b/slurm-2.4.4-init.patch deleted file mode 100644 index 6468db2..0000000 --- a/slurm-2.4.4-init.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -aruN slurm-2.4.4.orig/etc/init.d.slurmdbd.in slurm-2.4.4/etc/init.d.slurmdbd.in ---- slurm-2.4.4.orig/etc/init.d.slurmdbd.in 2012-11-02 17:46:12.000000000 +0100 -+++ slurm-2.4.4/etc/init.d.slurmdbd.in 2012-11-17 19:00:06.079651971 +0100 -@@ -15,7 +15,7 @@ - # Required-Stop: $remote_fs $syslog $network munge - # Should-Start: $named - # Should-Stop: $named --# Default-Start: 2 3 4 5 -+# Default-Start: 2 3 5 - # Default-Stop: 0 1 6 - # Short-Description: SLURM database daemon - # Description: Start slurm to provide database server for SLURM -diff -aruN slurm-2.4.4.orig/etc/init.d.slurm.in slurm-2.4.4/etc/init.d.slurm.in ---- slurm-2.4.4.orig/etc/init.d.slurm.in 2012-11-02 17:46:12.000000000 +0100 -+++ slurm-2.4.4/etc/init.d.slurm.in 2012-11-17 18:59:51.799652475 +0100 -@@ -19,7 +19,7 @@ - # Required-Stop: $remote_fs $syslog $network munge - # Should-Start: $named - # Should-Stop: $named --# Default-Start: 2 3 4 5 -+# Default-Start: 2 3 5 - # Default-Stop: 0 1 6 - # Short-Description: slurm daemon management - # Description: Start slurm to provide resource management diff --git a/slurm-21.08.8.tar.bz2 b/slurm-21.08.8.tar.bz2 deleted file mode 100644 index 0d268d3..0000000 --- a/slurm-21.08.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ec10bc5c7b718df23d28aeaef9965d619fd341a755be1d08339b11649b154ea -size 6747681 diff --git a/slurm-22.05.0.tar.bz2 b/slurm-22.05.0.tar.bz2 new file mode 100644 index 0000000..a823419 --- /dev/null +++ b/slurm-22.05.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f710734066e480c974fc9d57982112eeb92a431b49cb6d0dab24348759228f64 +size 7007971 diff --git a/slurm.changes b/slurm.changes index 28c61cf..c561f4b 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue May 31 12:56:05 UTC 2022 - Christian Goll + +- update to 22.05.0 with following changes: +- Support for dynamic node addition and removal +- Support for native Linux cgroup v2 operation +- Newly added plugins to support HPE Slingshot 11 networks + (switch/hpe_slingshot), and Intel Xe GPUs (gpu/oneapi) +- Added new acct_gather_interconnect/sysfs plugin to collect statistics + from arbitrary network interfaces. +- Expanded and synced set of environment variables available in the + Prolog/Epilog/PrologSlurmctld/EpilogSlurmctld scripts. +- New "--prefer" option to job submissions to allow for a "soft + constraint" request to influence node selection. +- Optional support for license planning in the backfill scheduler with + "bf_licenses" option in SchedulerParameters. +- removed file slurm-2.4.4-init.patch as sysvinit is now realy deprecated +- removed file load-pmix-major-version.patch as fixed upstream + ------------------------------------------------------------------- Tue May 10 10:26:02 UTC 2022 - Egbert Eich diff --git a/slurm.spec b/slurm.spec index a4c9217..9ad0ae9 100644 --- a/slurm.spec +++ b/slurm.spec @@ -17,9 +17,9 @@ # Check file META in sources: update so_version to (API_CURRENT - API_AGE) -%define so_version 37 -%define ver 21.08.8 -%define _ver _21_08 +%define so_version 38 +%define ver 22.05.0 +%define _ver _22_05 %define dl_ver %{ver} # so-version is 0 and seems to be stable %define pmi_so 0 @@ -147,9 +147,7 @@ Source10: https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slu Source11: https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmctld.xml Source12: https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmdbd.xml Patch0: Remove-rpath-from-build.patch -Patch1: slurm-2.4.4-init.patch Patch2: pam_slurm-Initialize-arrays-and-pass-sizes.patch -Patch3: load-pmix-major-version.patch %{?upgrade:Provides: %{pname} = %{version}} %{?upgrade:Conflicts: %{pname}} @@ -213,6 +211,7 @@ BuildRequires: rrdtool-devel %{?have_sysuser:BuildRequires: sysuser-tools} %{?systemd_ordering} BuildRequires: dejagnu +BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(systemd) %else Requires(post): %insserv_prereq %fillup_prereq @@ -560,17 +559,19 @@ Contains also cray specific documentation. %prep %setup -q -n %{pname}-%{dl_ver} %patch0 -p1 -%patch1 -p1 +#%%patch1 -p1 %patch2 -p1 -%patch3 -p1 +#%%patch3 -p1 %if 0%{?python_ver} < 3 # Workaround for wrongly flagged python3 to keep SLE-11-SP4 building mkdir -p mybin; ln -s /usr/bin/python2 mybin/python3 %endif %build +# needed as slurm works that way bsc#1200030 +export SUSE_ZNOW=0 + autoreconf -%define _lto_cflags %{nil} [ -e $(pwd)/mybin ] && PATH=$(pwd)/mybin:$PATH %configure --enable-shared \ --disable-static \ @@ -766,7 +767,6 @@ EOF # Temporary - remove when build is fixed upstream. %if !0%{?build_slurmrestd} rm -f %{buildroot}/%{_mandir}/man8/slurmrestd.* -rm -f %{buildroot}/%{_libdir}/slurm/openapi_* %endif %check @@ -1093,9 +1093,11 @@ exit 0 %{_libdir}/slurm/accounting_storage_none.so %{_libdir}/slurm/accounting_storage_slurmdbd.so %{_libdir}/slurm/acct_gather_energy_pm_counters.so +%{_libdir}/slurm/acct_gather_energy_gpu.so %{_libdir}/slurm/acct_gather_energy_ibmaem.so %{_libdir}/slurm/acct_gather_energy_none.so %{_libdir}/slurm/acct_gather_energy_rapl.so +%{_libdir}/slurm/acct_gather_interconnect_sysfs.so %{_libdir}/slurm/acct_gather_filesystem_lustre.so %{_libdir}/slurm/acct_gather_filesystem_none.so %{_libdir}/slurm/acct_gather_interconnect_none.so @@ -1103,6 +1105,7 @@ exit 0 %{_libdir}/slurm/burst_buffer_lua.so %{?have_json_c:%{_libdir}/slurm/burst_buffer_datawarp.so} %{_libdir}/slurm/cgroup_v1.so +%{_libdir}/slurm/cgroup_v2.so %{_libdir}/slurm/core_spec_none.so %{_libdir}/slurm/cli_filter_none.so %{_libdir}/slurm/cli_filter_lua.so @@ -1114,6 +1117,7 @@ exit 0 %{_libdir}/slurm/gres_gpu.so %{_libdir}/slurm/gres_mps.so %{_libdir}/slurm/gres_nic.so +%{_libdir}/slurm/gres_shard.so %{_libdir}/slurm/hash_k12.so %{_libdir}/slurm/jobacct_gather_cgroup.so %{_libdir}/slurm/jobacct_gather_linux.so @@ -1222,12 +1226,14 @@ exit 0 %{?comp_at} %{_sbindir}/slurmrestd %{_mandir}/man8/slurmrestd.* +%{_libdir}/slurm/openapi_dbv0_0_38.so +%{_libdir}/slurm/openapi_v0_0_38.so %{_libdir}/slurm/openapi_dbv0_0_37.so %{_libdir}/slurm/openapi_v0_0_37.so %{_libdir}/slurm/openapi_dbv0_0_36.so -%{_libdir}/slurm/openapi_v0_0_35.so +#%{_libdir}/slurm/openapi_v0_0_35.so %{_libdir}/slurm/openapi_v0_0_36.so -%{_libdir}/slurm/rest_auth_jwt.so +#%{_libdir}/slurm/rest_auth_jwt.so %{_libdir}/slurm/rest_auth_local.so %endif @@ -1280,6 +1286,7 @@ exit 0 %{_mandir}/man5/topology.* %{_mandir}/man5/knl.conf.5.* %{_mandir}/man5/job_container.conf.5.* +%{_mandir}/man5/mpi.conf.5.* %if 0%{?have_hdf5} %files hdf5