Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rms/slurm: re-enable pmix in slurm #1850

Merged
merged 1 commit into from
Jul 24, 2023
Merged

rms/slurm: re-enable pmix in slurm #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion components/rms/slurm/SPECS/slurm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

%include %{_sourcedir}/OHPC_macros
%global _with_mysql 1
#global _with_pmix --with-pmix=%{OHPC_ADMIN}/pmix
%global _with_pmix --with-pmix=%{OHPC_ADMIN}/pmix
%global _with_hwloc 1
%global _with_numa 1
%global _with_slurmrestd 1
Expand Down Expand Up @@ -393,6 +393,9 @@ select information.
%if 0%{?rhel} || 0%{?openEuler}
export PATH="$PWD/bin:$PATH"
%endif
%if %{with pmix}
module load hwloc
%endif
%configure \
%{?_without_debug:--disable-debug} \
%{?_with_pam_dir} \
Expand Down
2 changes: 2 additions & 0 deletions tests/common/functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@ run_mpi_binary () {
if [ "$RESOURCE_MANAGER" = "slurm" ]; then
if [ ! -z "$SIMPLE_CI" ]; then
timeout=5 # default job timeout (in minutes)
# Do not use pmix in the SIMPLE_CI case (GitHub Actions)
unset OHPC_MPI_LAUNCHERS
else
timeout=2 # default job timeout (in minutes)
fi
Expand Down
Loading