From a083f0ee7c84fbf8eaee2e0f1f19e845c57c5f5c Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Tue, 1 Aug 2023 14:29:41 +0300 Subject: [PATCH 1/2] Disable PMIx for OpenMPI4 and Slurm This is an attempt to pinpoint which change breaks the tests on openEuler and Leap Signed-off-by: Martin Tzvetanov Grigorov --- components/mpi-families/openmpi/SPECS/openmpi.spec | 2 +- components/rms/slurm/SPECS/slurm.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/mpi-families/openmpi/SPECS/openmpi.spec b/components/mpi-families/openmpi/SPECS/openmpi.spec index ffa07fb9cb..e22a0038d5 100644 --- a/components/mpi-families/openmpi/SPECS/openmpi.spec +++ b/components/mpi-families/openmpi/SPECS/openmpi.spec @@ -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} diff --git a/components/rms/slurm/SPECS/slurm.spec b/components/rms/slurm/SPECS/slurm.spec index b9cb358c04..6be47e5b7c 100644 --- a/components/rms/slurm/SPECS/slurm.spec +++ b/components/rms/slurm/SPECS/slurm.spec @@ -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 From 2006f7c609de71670b0cdb0c0f1ab7f9129da647 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Tue, 1 Aug 2023 15:17:21 +0300 Subject: [PATCH 2/2] Disable PMIx only for Slurm Signed-off-by: Martin Tzvetanov Grigorov --- components/mpi-families/openmpi/SPECS/openmpi.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/mpi-families/openmpi/SPECS/openmpi.spec b/components/mpi-families/openmpi/SPECS/openmpi.spec index e22a0038d5..35bebe9983 100644 --- a/components/mpi-families/openmpi/SPECS/openmpi.spec +++ b/components/mpi-families/openmpi/SPECS/openmpi.spec @@ -32,7 +32,8 @@ %{!?with_lustre: %define with_lustre 0} %{!?with_slurm: %define with_slurm 0} %{!?with_tm: %global with_tm 1} -%{!?with_pmix: %define with_pmix 0} + +%{!?with_pmix: %define with_pmix 1} %{!?with_ofi: %define with_ofi 1} %{!?with_ucx: %define with_ucx 1}