Avoid build failure for i636

Resolves: rhbz#2220941
Signed-off-by: Kamal Heib <kheib@redhat.com>
This commit is contained in:
Kamal Heib 2023-07-10 22:23:06 -04:00
parent 25560a22e0
commit 7a0d8c1700
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From 37a4deab051d89b95159c4a3559dd084ec7df1c4 Mon Sep 17 00:00:00 2001
From: Kamal Heib <kheib@redhat.com>
Date: Mon, 10 Jul 2023 13:15:27 -0400
Subject: [PATCH] Avoid build failure for i686
Signed-off-by: Kamal Heib <kheib@redhat.com>
---
c/util/osu_util_validation.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/c/util/osu_util_validation.c b/c/util/osu_util_validation.c
index c2cd1fa14c1c..f04ed3c1d958 100644
--- a/c/util/osu_util_validation.c
+++ b/c/util/osu_util_validation.c
@@ -299,8 +299,10 @@ static int atom_binary_compare(MPI_Datatype dtype, void *a, void *b)
return COMPARE_AS_TYPE(__int32_t, a, b);
case 8:
return COMPARE_AS_TYPE(__int64_t, a, b);
+#ifndef __i686__
case 16:
return COMPARE_AS_TYPE(__int128_t, a, b);
+#endif
}
return 0;
}
--
2.41.0

View File

@ -3,7 +3,7 @@
Summary: MPI Benchmarks and tests
Name: mpitests
Version: 7.1
Release: 1%{?dist}
Release: 2%{?dist}
License: CPL and BSD
Group: Applications/Engineering
# These days we get the benchmark soucres from Intel and OSU directly
@ -14,6 +14,7 @@ Source0: https://github.com/intel/mpi-benchmarks/archive/%{intel_mpi_bench_vers}
Source1: http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-%{osu_micro_bench_vers}.tar.gz
# Only for old openmpi
#Patch101: OMB-disable-collective-async.patch
Patch0001: 0001-Avoid-build-failure-for-i686.patch
BuildRequires: hwloc-devel, libibmad-devel, rdma-core-devel
BuildRequires: automake, autoconf, libtool
BuildRequires: gcc, gcc-c++
@ -69,6 +70,7 @@ MPI test suite compiled against the mvapich2 package using OmniPath
%setup -c
%setup -T -D -a 1
cd osu-micro-benchmarks-7.1-1
%patch0001 -p1
cd ..
%build
@ -172,6 +174,10 @@ do_install
%endif
%changelog
* Tue Jul 11 2023 Kamal Heib <kheib@redhat.com> - 7.1-2
- Avoid build failure for i636
- Resolves: rhbz#2220941
* Thu Jul 06 2023 Kamal Heib <kheib@redhat.com> - 7.1-1
- Update OSU benchmarks to upstream release 7.1
- Resolves: rhbz#2220941