From 428d517926d3ae805ab4eae7a2a36811588d292036e301080fbcd030bfd8c955 Mon Sep 17 00:00:00 2001 From: Nicolas Morey Date: Fri, 31 Oct 2025 19:39:42 +0100 Subject: [PATCH 1/3] Update IMB to 2021.10 Signed-off-by: Nicolas Morey --- IMB-v2021.10.tar.gz | 3 +++ IMB-v2021.3.tar.gz | 3 --- imb-cpp-flags.patch | 20 ++++++++++---------- mpitests.changes | 13 +++++++++++++ mpitests.spec | 13 +++++++------ 5 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 IMB-v2021.10.tar.gz delete mode 100644 IMB-v2021.3.tar.gz diff --git a/IMB-v2021.10.tar.gz b/IMB-v2021.10.tar.gz new file mode 100644 index 0000000..b0b4028 --- /dev/null +++ b/IMB-v2021.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:286a5a10009355a61ed4a499ab4cb81bade41e6930a651a92928228343ff4a82 +size 221662 diff --git a/IMB-v2021.3.tar.gz b/IMB-v2021.3.tar.gz deleted file mode 100644 index 5ba65a3..0000000 --- a/IMB-v2021.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b58a4a7eef7c0c877513152340948402fd87cb06270d2d81308dc2ef740f4c7 -size 221038 diff --git a/imb-cpp-flags.patch b/imb-cpp-flags.patch index d0006ba..549808d 100644 --- a/imb-cpp-flags.patch +++ b/imb-cpp-flags.patch @@ -1,13 +1,13 @@ ---- mpi-benchmarks-IMB-v2021.3.orig/src_cpp/Makefile 2021-10-01 15:09:19.000000000 +0200 -+++ mpi-benchmarks-IMB-v2021.3/src_cpp/Makefile 2022-09-30 11:15:13.866410222 +0200 -@@ -77,8 +77,8 @@ - CXX=mpiicpc +--- mpi-benchmarks-IMB-v2021.10.orig/src_cpp/Makefile 2021-10-01 15:09:19.000000000 +0200 ++++ mpi-benchmarks-IMB-v2021.10/src_cpp/Makefile 2022-09-30 11:15:13.866410222 +0200 +@@ -60,8 +60,8 @@ + CXX=mpiicpx endif override CPPFLAGS += -I. --override CFLAGS += -g -O0 -Wall -Wno-long-long --override CXXFLAGS += -g -O0 -Wall -Wextra -pedantic -Wno-long-long -+override CFLAGS += -Wno-long-long -+override CXXFLAGS += -Wno-long-long +-override CFLAGS += -g -O0 -Wall -Werror +-override CXXFLAGS += -g -O0 -Wall -Wextra -Werror ++override CFLAGS += ++override CXXFLAGS += ifdef WITH_OPENMP - override CFLAGS += -fopenmp - override CXXFLAGS += -fopenmp + ifeq ("$(CXX)",$(filter "$(CXX)", "mpiicpx" "icpx")) + override CXXFLAGS += -qopenmp diff --git a/mpitests.changes b/mpitests.changes index 10b7160..6379e77 100644 --- a/mpitests.changes +++ b/mpitests.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Oct 31 18:37:34 UTC 2025 - Nicolas Morey + +- Update IMB to 2021.10 + - Add IMB-RMA-GPU Technical Preview + - Add IMB-MPI4 persistent collectives + - Migration to icx,icpx compiler + - IMB-MPI1: FP16/BF16 data_type support + - Change default value for mem_alloc_type to device + - Bug fixes +- Refresh imb-cpp-flags.patch against latest sources + + ------------------------------------------------------------------- Fri Aug 1 13:21:10 UTC 2025 - Nicolas Morey diff --git a/mpitests.spec b/mpitests.spec index 50dc152..c310ac2 100644 --- a/mpitests.spec +++ b/mpitests.spec @@ -40,11 +40,11 @@ %endif %define osu_ver 6.1 -%define imb_ver 2021.3 +%define imb_ver 2021.10 %define imb_dir mpi-benchmarks-IMB-v%{imb_ver} %define osu_dir osu-micro-benchmarks-%{osu_ver} -%define mpi_home %{hpc_mpi_home %flavor} +%define mpi_home %{hpc_mpi_home} %define implem_list_dir %{_datadir}/mpitests/implem.d/ %define sles_pre_or_15 (0%{?sle_version} > 120000 && 0%{?sle_version} <= 150000) %define sles_pre_16 (0%{?sle_version} > 120000 && 0%{?sle_version} < 160000) @@ -127,6 +127,7 @@ Set of popular MPI benchmarks: IMB v%{imb_ver} OSU benchmarks ver %{osu_ver} %if "%{flavor}" != "" %build + echo echo %{mpi_home} . %{mpi_home}/bin/mpivars.sh @@ -135,13 +136,13 @@ export CXXFLAGS="%{optflags}" export LDFLAGS="%{optflags}" # IMB Build -make CC=%{mpi_home}/bin/mpicc CXX=%{mpi_home}/bin/mpicxx \ - -C %{imb_dir}/ all +make CC=mpicc CXX=mpicxx \ + -C %{imb_dir}/ all WITH_OPENMP=1 # OSU Build ( cd %{osu_dir} && \ - ./configure CC=%{mpi_home}/bin/mpicc CXX=%{mpi_home}/bin/mpicxx && - make all ) + ./configure CC=mpicc CXX=mpicxx && + make all) %install # IMB -- 2.51.1 From 35881bd33af35f8ce32d3cfe447e75048a737b0ddf5992ec0713e20de1d7bb44 Mon Sep 17 00:00:00 2001 From: Nicolas Morey Date: Fri, 31 Oct 2025 19:46:17 +0100 Subject: [PATCH 2/3] Update osu-micro-benchmarks to 7.5.1 Signed-off-by: Nicolas Morey --- mpitests.changes | 4 +++- mpitests.spec | 9 ++++----- osu-fix-bad-return-values.patch | 29 ----------------------------- osu-micro-benchmarks-6.1.tar.gz | 3 --- osu-micro-benchmarks-7.5.1.tar.gz | 3 +++ 5 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 osu-fix-bad-return-values.patch delete mode 100644 osu-micro-benchmarks-6.1.tar.gz create mode 100644 osu-micro-benchmarks-7.5.1.tar.gz diff --git a/mpitests.changes b/mpitests.changes index 6379e77..0891acf 100644 --- a/mpitests.changes +++ b/mpitests.changes @@ -8,8 +8,10 @@ Fri Oct 31 18:37:34 UTC 2025 - Nicolas Morey - IMB-MPI1: FP16/BF16 data_type support - Change default value for mem_alloc_type to device - Bug fixes +- Update osu-micro-benchmarks to 7.5.1 + - See: https://mvapich.cse.ohio-state.edu/static/media/mvapich/CHANGES-OMB.txt - Refresh imb-cpp-flags.patch against latest sources - +- Drop patch fixed upstream: osu-fix-bad-return-values.patch ------------------------------------------------------------------- Fri Aug 1 13:21:10 UTC 2025 - Nicolas Morey diff --git a/mpitests.spec b/mpitests.spec index c310ac2..05cb27b 100644 --- a/mpitests.spec +++ b/mpitests.spec @@ -39,7 +39,7 @@ %endif -%define osu_ver 6.1 +%define osu_ver 7.5.1 %define imb_ver 2021.10 %define imb_dir mpi-benchmarks-IMB-v%{imb_ver} %define osu_dir osu-micro-benchmarks-%{osu_ver} @@ -69,8 +69,7 @@ Source4: mpitests-run.sh Source100: mpitests-rpmlintrc Source101: _multibuild Source102: README.md -Patch1: osu-fix-bad-return-values.patch -Patch2: imb-cpp-flags.patch +Patch1: imb-cpp-flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dos2unix BuildRequires: gcc-c++ @@ -122,8 +121,8 @@ Set of popular MPI benchmarks: IMB v%{imb_ver} OSU benchmarks ver %{osu_ver} %prep %setup -c -q %setup -T -D -a 1 -q -%patch -P 1 -p0 -%patch -P 2 -p0 +%autopatch -p0 + %if "%{flavor}" != "" %build diff --git a/osu-fix-bad-return-values.patch b/osu-fix-bad-return-values.patch deleted file mode 100644 index 406782b..0000000 --- a/osu-fix-bad-return-values.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- osu-micro-benchmarks-6.1.orig/c/util/osu_util_mpi.c 2022-09-19 15:48:03.000000000 +0200 -+++ osu-micro-benchmarks-6.1/c/util/osu_util_mpi.c 2022-09-30 10:51:18.683964260 +0200 -@@ -211,7 +211,7 @@ - bad_usage.message = "Please pass a ddt" - " type[cont,vect,indx]\n"; - bad_usage.optarg = optarg; -- return PO_BAD_USAGE; -+ return; - } - option = strtok(optarg, ":"); - if (0 == strncasecmp(optarg, "vect", 4)) { -@@ -236,7 +236,7 @@ - bad_usage.message = "Invalid ddt type. Valid ddt" - " types[cont,vect,indx]\n"; - bad_usage.optarg = optarg; -- return PO_BAD_USAGE; -+ return; - } - } - -@@ -2006,7 +2006,7 @@ - int displacements[OMB_DDT_INDEXED_MAX_LENGTH] = {0}; - - if (0 == options.omb_enable_ddt) { -- return; -+ return 0; - } - switch (options.ddt_type) { - case OMB_DDT_CONTIGUOUS: diff --git a/osu-micro-benchmarks-6.1.tar.gz b/osu-micro-benchmarks-6.1.tar.gz deleted file mode 100644 index 82a21e3..0000000 --- a/osu-micro-benchmarks-6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ecccedc868264f75db4d9529af79005419a2775113c7fae8f4e4a8434362e4a7 -size 787880 diff --git a/osu-micro-benchmarks-7.5.1.tar.gz b/osu-micro-benchmarks-7.5.1.tar.gz new file mode 100644 index 0000000..2327deb --- /dev/null +++ b/osu-micro-benchmarks-7.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:160d0d5e3c3cb022520ecb247e9875bb0973b1d3cadccd6c17624f8407c52e22 +size 987852 -- 2.51.1 From e297f2c84e4dd4374d12d458bc6b39e0912f19bd01f825fb8c5c66e96f967676 Mon Sep 17 00:00:00 2001 From: Nicolas Morey Date: Fri, 31 Oct 2025 21:52:57 +0100 Subject: [PATCH 3/3] exclude 32b builds Signed-off-by: Nicolas Morey --- mpitests.changes | 1 + mpitests.spec | 20 ++------------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/mpitests.changes b/mpitests.changes index 0891acf..3f4f0c4 100644 --- a/mpitests.changes +++ b/mpitests.changes @@ -12,6 +12,7 @@ Fri Oct 31 18:37:34 UTC 2025 - Nicolas Morey - See: https://mvapich.cse.ohio-state.edu/static/media/mvapich/CHANGES-OMB.txt - Refresh imb-cpp-flags.patch against latest sources - Drop patch fixed upstream: osu-fix-bad-return-values.patch +- Disable 32b builds ------------------------------------------------------------------- Fri Aug 1 13:21:10 UTC 2025 - Nicolas Morey diff --git a/mpitests.spec b/mpitests.spec index 05cb27b..bd88164 100644 --- a/mpitests.spec +++ b/mpitests.spec @@ -80,38 +80,22 @@ Requires: %{flavor} BuildRequires: mpitests = %{version} Requires: mpitests = %{version} %endif - -%if "%{flavor}" == "mvapich2" -ExcludeArch: %{arm} -%endif +ExcludeArch: %{arm} %ix86 %if "%{flavor}" == "mvapich2-psm2" ExclusiveArch: x86_64 %endif -%if "%{flavor}" == "mvapich3-ofi" -ExcludeArch: %{arm} %ix86 -%endif - -%if "%{flavor}" == "mvapich3-ucx" -ExcludeArch: %{arm} %ix86 -%endif - %if "%{flavor}" == "openmpi4" -%if %{sles_pre_or_15} -# Disable openmpi4 builds for SLES up to (including) 15 -ExclusiveArch: do_not_build -%else ExcludeArch: ppc64 %endif -%endif %if "%{flavor}" == "openmpi5" %if %{sles_pre_16} # Disable openmpi5 builds for SLES < 16 ExclusiveArch: do_not_build %else -ExcludeArch: ppc64 %{arm} %ix86 +ExcludeArch: ppc64 %endif %endif -- 2.51.1