From 43df2be295a395e617bdf5246961b3778843cea0 Mon Sep 17 00:00:00 2001 From: Pavel Simovec Date: Tue, 19 Nov 2024 14:01:28 +0100 Subject: [PATCH] Update to 0.3.28 Resolves: BZ#2273704 Resolves: RHEL-54180 --- openblas-0.3.28-zgemm-cgemm.patch | 22 ++++++++++++++++++++++ openblas.spec | 15 ++++++++++----- sources | 2 +- 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 openblas-0.3.28-zgemm-cgemm.patch diff --git a/openblas-0.3.28-zgemm-cgemm.patch b/openblas-0.3.28-zgemm-cgemm.patch new file mode 100644 index 0000000..125b531 --- /dev/null +++ b/openblas-0.3.28-zgemm-cgemm.patch @@ -0,0 +1,22 @@ +From 8a1710dd0da445d76e6eaeb35b180d24efac0919 Mon Sep 17 00:00:00 2001 +From: Martin Kroeker +Date: Sun, 6 Oct 2024 20:03:32 +0200 +Subject: [PATCH] don't apply switch_ratio to tail of loop + +--- + driver/level3/level3_thread.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/driver/level3/level3_thread.c b/driver/level3/level3_thread.c +index ddb39abd66..3d56c45a99 100644 +--- a/driver/level3/level3_thread.c ++++ b/driver/level3/level3_thread.c +@@ -742,7 +742,7 @@ static int gemm_driver(blas_arg_t *args, BLASLONG *range_m, BLASLONG + num_parts = 0; + while (n > 0){ + width = blas_quickdivide(n + nthreads - num_parts - 1, nthreads - num_parts); +- if (width < switch_ratio) { ++ if (width < switch_ratio && width > 1) { + width = switch_ratio; + } + width = round_up(n, width, GEMM_PREFERED_SIZE); diff --git a/openblas.spec b/openblas.spec index 9c2ac78..394808d 100644 --- a/openblas.spec +++ b/openblas.spec @@ -14,8 +14,8 @@ # "obsoleted" features are still kept in the spec. Name: openblas -Version: 0.3.26 -Release: 7%{?dist} +Version: 0.3.28 +Release: 1%{?dist} Summary: An optimized BLAS library based on GotoBLAS2 License: BSD-3-Clause @@ -30,8 +30,8 @@ Patch1: openblas-0.2.5-libname.patch Patch2: openblas-0.2.15-constructor.patch # Supply the proper flags to the test makefile Patch3: openblas-0.3.11-tests.patch -# Fix incompatible pointer types (causes FTBFS on ppc64le) -Patch4: openblas-0.3.26-incompatibletypes.patch +# https://github.com/OpenMathLib/OpenBLAS/issues/49172 +Patch4: openblas-0.3.28-zgemm-cgemm.patch BuildRequires: make BuildRequires: gcc @@ -245,7 +245,7 @@ cd OpenBLAS-%{version} %patch 2 -p1 -b .constructor %endif %patch 3 -p1 -b .tests -%patch 4 -p1 -b .incompatibletypes +%patch 4 -p1 -b .gemm # Fix source permissions find -name \*.f -exec chmod 644 {} \; @@ -651,6 +651,11 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig %endif %changelog +* Tue Nov 19 2024 Pavel Simovec - 0.3.28-1 +- Update to 0.3.28 + Resolves: BZ#2273704 + Resolves: RHEL-54180 + * Tue Oct 29 2024 Troy Dawson - 0.3.26-7 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 diff --git a/sources b/sources index 554f56c..15772e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenBLAS-0.3.26.tar.gz) = 01d3a536fbfa62f276fd6b1ad0e218fb3d91f41545fc83ddc74979fa26372d8389f0baa20334badfe0adacd77bd944c50a47ac920577373fcc1d495553084373 +SHA512 (OpenBLAS-0.3.28.tar.gz) = 358301c8a60bedf920c07a110c772feb639e52412bd783789741fd2fd0686aac97e6b17ebcdf01ce48a2a15841058f82df0fee551af952f6e70b58140c055133