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

Require hwloc-ohpc for all OSes #1851

Closed
wants to merge 11 commits into from
Closed

Require hwloc-ohpc for all OSes #1851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c714e4c
Require hwloc-ohpc for all OSes
martin-g Jul 27, 2023
9a3610b
Add BuildRequires for libevent-devel
martin-g Jul 27, 2023
8a31b74
Temporarily use mpirun to start jobs in tests
martin-g Jul 27, 2023
d8d6d33
Temporarily disable the changes for this PR
martin-g Jul 28, 2023
ff98626
Pass "--mpi=pmix" to srun in the tests
martin-g Jul 28, 2023
66f0724
Pass '--mpi=pmix' to srun via sbatch
martin-g Jul 28, 2023
b07a201
Use 'prun` - it has logic to detect PMIx
martin-g Jul 28, 2023
1c7ea49
Try with PMIx in SIMPLE_CI, to see what is the error
martin-g Jul 28, 2023
cfcf049
Disable PMIx for Slurm
martin-g Aug 1, 2023
994054c
Disable PMIx for OpenMPI
martin-g Aug 1, 2023
23c92ed
Disable PMIx for Slurm
martin-g Aug 1, 2023
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
2 changes: 1 addition & 1 deletion components/mpi-families/openmpi/SPECS/openmpi.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
%{!?with_lustre: %define with_lustre 0}
%{!?with_slurm: %define with_slurm 0}
%{!?with_tm: %global with_tm 1}
%{!?with_pmix: %define with_pmix 1}
%{!?with_pmix: %define with_pmix 0}
%{!?with_ofi: %define with_ofi 1}
%{!?with_ucx: %define with_ucx 1}

Expand Down
11 changes: 7 additions & 4 deletions components/rms/openpbs/SPECS/openpbs.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: libtool-ltdl-devel
BuildRequires: hwloc-ohpc
BuildRequires: hwloc%{PROJ_DELIM}
BuildRequires: libevent-devel
BuildRequires: pmix%{PROJ_DELIM}
BuildRequires: libX11-devel
BuildRequires: libXt-devel
BuildRequires: libedit-devel
Expand Down Expand Up @@ -139,8 +141,8 @@ Requires: insserv-compat
Requires: smtpdaemon
Requires: hostname
%endif
%if 0%{?rhel} >= 7
Requires: hwloc-ohpc
Requires: hwloc%{PROJ_DELIM}
%if 0%{?rhel} >= 7 || 0%{?openEuler}
Requires: chkconfig
%endif
Requires: libical
Expand Down Expand Up @@ -281,7 +283,8 @@ cd build
../configure CFLAGS="-fPIC" \
PBS_VERSION=%{pbs_version} \
--prefix=%{pbs_prefix} \
--with-hwloc=%{OHPC_LIBS}/hwloc \
--with-hwloc=%{OHPC_LIBS}/hwloc \
--with-pmix=%{OHPC_ADMIN}/pmix \
%if %{with ptl}
--enable-ptl \
%endif
Expand Down
2 changes: 1 addition & 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
1 change: 1 addition & 0 deletions tests/ci/setup_slurm_and_run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ while true; do
sleep "${retry_counter}"
done

srun --mpi=list
srun -N2 hostname

# Figure out which tests we need to run.
Expand Down
1 change: 1 addition & 0 deletions tests/common/functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ run_mpi_binary () {

if [ -z "$scalasca" ];then
mpi_launcher="prun"
#mpi_launcher="mpirun --mca plm_base_verbose 100"
else
mpi_launcher="scalasca -analyze prun"
fi
Expand Down
Loading