Skip to content
Snippets Groups Projects
Commit fa2e22c8 authored by Daniel Letai's avatar Daniel Letai Committed by Tim Wickberg
Browse files

slurm.spec - allow --with-ucx in rpmbuild.

And require the compute nodes to have an identical installation version
to avoid issues with mismatched libraries.

Bug 6598.
parent 35bb9afb
No related branches found
No related tags found
No related merge requests found
...@@ -30,12 +30,14 @@ Source: %{slurm_source_dir}.tar.bz2 ...@@ -30,12 +30,14 @@ Source: %{slurm_source_dir}.tar.bz2
# --with numa %_with_numa 1 require NUMA support # --with numa %_with_numa 1 require NUMA support
# --without pam %_without_pam 1 don't require pam-devel RPM to be installed # --without pam %_without_pam 1 don't require pam-devel RPM to be installed
# --without x11 %_without_x11 1 disable internal X11 support # --without x11 %_without_x11 1 disable internal X11 support
# --with ucx %_with_ucx path require ucx support
# --with pmix %_with_pmix path require pmix support # --with pmix %_with_pmix path require pmix support
# Options that are off by default (enable with --with <opt>) # Options that are off by default (enable with --with <opt>)
%bcond_with cray %bcond_with cray
%bcond_with cray_network %bcond_with cray_network
%bcond_with multiple_slurmd %bcond_with multiple_slurmd
%bcond_with ucx
# These options are only here to force there to be these on the build. # These options are only here to force there to be these on the build.
# If they are not set they will still be compiled if the packages exist. # If they are not set they will still be compiled if the packages exist.
...@@ -123,6 +125,11 @@ BuildRequires: pmix ...@@ -123,6 +125,11 @@ BuildRequires: pmix
%global pmix %(rpm -q pmix --qf "%{VERSION}") %global pmix %(rpm -q pmix --qf "%{VERSION}")
%endif %endif
%if %{with ucx}
BuildRequires: ucx-devel
%global ucx_version %(rpm -q ucx-devel --qf "%{VERSION}")
%endif
# Allow override of sysconfdir via _slurm_sysconfdir. # Allow override of sysconfdir via _slurm_sysconfdir.
# Note 'global' instead of 'define' needed here to work around apparent # Note 'global' instead of 'define' needed here to work around apparent
# bug in rpm macro scoping (or something...) # bug in rpm macro scoping (or something...)
...@@ -211,6 +218,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} ...@@ -211,6 +218,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%if %{with pmix} %if %{with pmix}
Requires: pmix = %{pmix_version} Requires: pmix = %{pmix_version}
%endif %endif
%if %{with ucx}
Requires: ucx = %{ucx_version}
%endif
%description slurmd %description slurmd
Slurm compute node daemon. Used to launch jobs on compute nodes Slurm compute node daemon. Used to launch jobs on compute nodes
...@@ -309,6 +319,7 @@ notifies slurm about failed nodes. ...@@ -309,6 +319,7 @@ notifies slurm about failed nodes.
%{?_with_hdf5} \ %{?_with_hdf5} \
%{?_with_shared_libslurm} \ %{?_with_shared_libslurm} \
%{?_without_x11:--disable-x11} \ %{?_without_x11:--disable-x11} \
%{?_with_ucx} \
%{?_with_cflags} %{?_with_cflags}
make %{?_smp_mflags} make %{?_smp_mflags}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment