[rpms/intel-mpi-benchmarks] epel10: Update to upstream release 2021.8

[rpms/intel-mpi-benchmarks] epel10: Update to upstream release 2021.8

[Michal Schmidt]

            A new commit has been pushed.

            Repo   : rpms/intel-mpi-benchmarks
            Branch : epel10
            Commit : 62bf709270d0b1e3d82f3a3861f0363411b470bb
            Author : Michal Schmidt <mschmidt@redhat.com>
            Date   : 2024-08-07T16:40:57+02:00
            Stats  : +116/-23 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/intel-mpi-benchmarks/c/62bf709270d0b1e3d82f3a3861f0363411b470bb?branch=epel10

            Log:
            Update to upstream release 2021.8

Upstream changed its license to the 3-Clause BSD license.
Add patches to fix the build.
 - Patches 1, 2 are from upstream git.
 - Patch 3 is Fedora-specific.
Exclude the whole package on i686.

---
diff --git a/.gitignore b/.gitignore
index 6e2a599..5158ef1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /IMB_2017-clean.tar.xz
 /v2018.0.tar.gz
 /IMB-v2021.3.tar.gz
+/IMB-v2021.8.tar.gz

diff --git a/0001-fix-compiler-warnings-for-gcc.patch b/0001-fix-compiler-warnings-for-gcc.patch
new file mode 100644
index 0000000..08a4489
--- /dev/null
+++ b/0001-fix-compiler-warnings-for-gcc.patch
@@ -0,0 +1,47 @@
+From 038e82acfb289293255a43993d05d2e4f00939b3 Mon Sep 17 00:00:00 2001
+From: Y <julia.roznova@intel.com>
+Date: Thu, 27 Jun 2024 05:52:13 -0500
+Subject: [PATCH 1/3] fix compiler warnings for gcc
+
+(cherry picked from commit 89d769f295d860824e57a3973a2038bcca8a5f33)
+---
+ src_c/IMB_chk_diff.c | 6 ++++--
+ src_c/IMB_output.c   | 4 ++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src_c/IMB_chk_diff.c b/src_c/IMB_chk_diff.c
+index da0b8986620a..899cf7700f68 100644
+--- a/src_c/IMB_chk_diff.c
++++ b/src_c/IMB_chk_diff.c
+@@ -1062,8 +1062,10 @@ Output variables:
+         if (pos2 - pos1 + 1 == lengths[i])
+             c_info->reccnt[rank]++;
+         else if (i < Npos) {
+-            if (ranks[i + 1] == rank && pos2 - pos1 + 1 == (lengths[i] + (lengths[i + 1])))
+-                c_info->reccnt[rank]++; i++;
++            if (ranks[i + 1] == rank && ((pos2 - pos1 + 1) == (lengths[i] + lengths[i + 1]))) {
++                c_info->reccnt[rank]++;
++                i++;
++            }
+         }
+ 
+         i++;
+diff --git a/src_c/IMB_output.c b/src_c/IMB_output.c
+index bad342b15920..c5eba8159cb6 100644
+--- a/src_c/IMB_output.c
++++ b/src_c/IMB_output.c
+@@ -343,9 +343,9 @@ Input variables:
+ 
+             case SAMPLE_FAILED_INT_OVERFLOW:
+ #ifdef MPI1
+-                sprintf(aux_string + offset, " int-overflow; The production rank*size caused int overflow for given sample; use flag \"-data_type double\"");
++                sprintf(aux_string + offset, " int-overflow; The production rank*size caused int overflow; use \"-data_type double\"");
+ #else
+-                sprintf(aux_string + offset, " int-overflow; The production rank*size caused int overflow for given sample");
++                sprintf(aux_string + offset, " int-overflow; The production rank*size caused int overflow;");
+ #endif
+                 break;
+             case SAMPLE_FAILED_TIME_OUT:
+-- 
+2.45.2
+

diff --git a/0002-remove-Werror-flag.patch b/0002-remove-Werror-flag.patch
new file mode 100644
index 0000000..edd9b29
--- /dev/null
+++ b/0002-remove-Werror-flag.patch
@@ -0,0 +1,28 @@
+From 07093dab5110229117e23690ebd005a2f6f729b0 Mon Sep 17 00:00:00 2001
+From: Y <julia.roznova@intel.com>
+Date: Thu, 11 Jul 2024 04:57:19 -0500
+Subject: [PATCH 2/3] remove -Werror flag
+
+(cherry picked from commit 2eaae5c45d441b4a36c1dc3a76cb028063d8e414)
+---
+ src_cpp/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src_cpp/Makefile b/src_cpp/Makefile
+index 15fbe2ae1178..0007e237c398 100644
+--- a/src_cpp/Makefile
++++ b/src_cpp/Makefile
+@@ -60,8 +60,8 @@ ifeq ($(origin CXX),default)
+ CXX=mpiicpx
+ endif
+ override CPPFLAGS += -I.
+-override CFLAGS += -g -O0 -Wall -Werror
+-override CXXFLAGS += -g -O0 -Wall -Wextra -Werror
++override CFLAGS += -g -O0 -Wall
++override CXXFLAGS += -g -O0 -Wall -Wextra
+ ifdef WITH_OPENMP
+ ifeq ("$(CXX)",$(filter "$(CXX)", "mpiicpx" "icpx"))
+ override CXXFLAGS += -qopenmp
+-- 
+2.45.2
+

diff --git a/0003-do-not-override-optimization-flags.patch b/0003-do-not-override-optimization-flags.patch
new file mode 100644
index 0000000..a8b0957
--- /dev/null
+++ b/0003-do-not-override-optimization-flags.patch
@@ -0,0 +1,28 @@
+From 6a3d1baf742a0fb8830a44a21d1a09c82e4e7e0d Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt@redhat.com>
+Date: Wed, 7 Aug 2024 15:35:03 +0200
+Subject: [PATCH 3/3] do not override optimization flags
+
+"-O0" is incompatible with _FORTIFY_SOURCE.
+---
+ src_cpp/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src_cpp/Makefile b/src_cpp/Makefile
+index 0007e237c398..8266efccadc3 100644
+--- a/src_cpp/Makefile
++++ b/src_cpp/Makefile
+@@ -60,8 +60,8 @@ ifeq ($(origin CXX),default)
+ CXX=mpiicpx
+ endif
+ override CPPFLAGS += -I.
+-override CFLAGS += -g -O0 -Wall
+-override CXXFLAGS += -g -O0 -Wall -Wextra
++override CFLAGS += -g -Wall
++override CXXFLAGS += -g -Wall -Wextra
+ ifdef WITH_OPENMP
+ ifeq ("$(CXX)",$(filter "$(CXX)", "mpiicpx" "icpx"))
+ override CXXFLAGS += -qopenmp
+-- 
+2.45.2
+

diff --git a/intel-mpi-benchmarks.spec b/intel-mpi-benchmarks.spec
index 43cf69b..f94dd91 100644
--- a/intel-mpi-benchmarks.spec
+++ b/intel-mpi-benchmarks.spec
@@ -1,24 +1,16 @@
-%if 0%{?fedora} >= 40
-%ifarch %{ix86}
-%bcond_with openmpi
-%else
-%bcond_without openmpi
-%endif
-%else
-%bcond_without openmpi
-%endif
-
 Summary: Intel MPI benchmarks
 Name:    intel-mpi-benchmarks
-Version: 2021.3
+Version: 2021.8
 Release: %autorelease
-# Automatically converted from old format: CPL - review is highly recommended.
-License: CPL-1.0
+License: BSD-3-Clause
 URL:     https://software.intel.com/en-us/articles/intel-mpi-benchmarks
 Source0: https://github.com/intel/mpi-benchmarks/archive/IMB-v%{version}.tar.gz
 BuildRequires: make
 BuildRequires: gcc
 BuildRequires: gcc-c++
+# https://bugzilla.redhat.com/show_bug.cgi?id=2303465
+# Not worth fixing. Open MPI is no longer built on ix86.
+ExcludeArch: %{ix86}
 
 %global desc The Intel MPI Benchmarks perform a set of MPI performance measurements for\
 point-to-point and global communication operations for a range of message\
@@ -36,7 +28,6 @@ BuildArch: noarch
 %description license
 This package contains the license of Intel MPI benchmarks.
 
-%if %{with openmpi}
 %package openmpi
 Summary: Intel MPI benchmarks compiled against openmpi
 BuildRequires: openmpi-devel
@@ -47,7 +38,6 @@ Requires: %{name}-license = %{version}-%{release}
 %{desc}
 
 This package was built against the Open MPI implementation of MPI.
-%endif
 
 %package mpich
 Summary: Intel MPI benchmarks compiled against mpich
@@ -60,8 +50,13 @@ Requires: %{name}-license = %{version}-%{release}
 
 This package was built against the MPICH implementation of MPI.
 
+%patchlist
+0001-fix-compiler-warnings-for-gcc.patch
+0002-remove-Werror-flag.patch
+0003-do-not-override-optimization-flags.patch
+
 %prep
-%setup -q -n mpi-benchmarks-IMB-v%{version}
+%autosetup -p1 -n mpi-benchmarks-IMB-v%{version}
 
 %build
 do_build() {
@@ -76,11 +71,9 @@ do_build() {
 }
 
 # do N builds, one for each mpi stack
-%if %{with openmpi}
 %{_openmpi_load}
 do_build
 %{_openmpi_unload}
-%endif
 
 %{_mpich_load}
 do_build
@@ -97,11 +90,9 @@ do_install() {
 }
 
 # do N installs, one for each mpi stack
-%if %{with openmpi}
 %{_openmpi_load}
 do_install
 %{_openmpi_unload}
-%endif
 
 %{_mpich_load}
 do_install
@@ -110,10 +101,8 @@ do_install
 %files license
 %license license/{,use-of-trademark-}license.txt
 
-%if %{with openmpi}
 %files openmpi
 %{_libdir}/openmpi/bin/IMB-{MPI1,EXT,IO,NBC,RMA,MT,P2P}_openmpi
-%endif
 
 %files mpich
 %{_libdir}/mpich/bin/IMB-{MPI1,EXT,IO,NBC,RMA,MT,P2P}_mpich

diff --git a/sources b/sources
index 4fcfdde..4c2f8d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (IMB-v2021.3.tar.gz) = fdb1a2426b5999c58c5d15228c64a80f28f4051d438e86a132f0fc42c3cda88f0e1bbcb792316617864d0f4d07d89143a96f3824bd4806fc8cde3c2dcb1d4094
+SHA512 (IMB-v2021.8.tar.gz) = db5052e43ac00b0d18ccab261933920678bd0ef29d1a7dce972bf825c26beccd915dd0b6c55d87100795bfa6dbd097ef49d34ec11fb58b77c6c561ea44fb6d69