apply upstream fix to https://github.com/Reference-LAPACK/lapack/issues/763

2023-06-03 14:48:32 -04:00 · 2023-06-03 14:48:32 -04:00 · c59ead43a4
commit c59ead43a4
parent ef4ebeab80
2 changed files with 156 additions and 1 deletions
--- a/765.patch
+++ b/765.patch
@ -0,0 +1,148 @@
+From 5d8a3a804befd179a28c5e4c7845e982b8d1922e Mon Sep 17 00:00:00 2001
+From: Weslley S Pereira <weslley.spereira@gmail.com>
+Date: Tue, 22 Nov 2022 18:19:33 -0700
+Subject: [PATCH] Check for NaNs in xGECON
+
+---
+ SRC/cgecon.f | 7 ++++---
+ SRC/dgecon.f | 7 ++++---
+ SRC/sgecon.f | 7 ++++---
+ SRC/zgecon.f | 7 ++++---
+ 4 files changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/SRC/cgecon.f b/SRC/cgecon.f
+index 48f409b68..6f426c2ab 100644
+--- a/SRC/cgecon.f
+++ b/SRC/cgecon.f
+@@ -106,6 +106,7 @@
+ *>          INFO is INTEGER
+ *>          = 0:  successful exit
+ *>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          =-5:  if ANORM is NAN or negative.
+ *> \endverbatim
+ *
+ *  Authors:
+@@ -153,10 +154,10 @@ SUBROUTINE CGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
+       INTEGER            ISAVE( 3 )
+ *     ..
+ *     .. External Functions ..
+-      LOGICAL            LSAME
+      LOGICAL            LSAME, SISNAN
+       INTEGER            ICAMAX
+       REAL               SLAMCH
+-      EXTERNAL           LSAME, ICAMAX, SLAMCH
+      EXTERNAL           LSAME, ICAMAX, SLAMCH, SISNAN
+ *     ..
+ *     .. External Subroutines ..
+       EXTERNAL           CLACN2, CLATRS, CSRSCL, XERBLA
+@@ -182,7 +183,7 @@ SUBROUTINE CGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
+          INFO = -2
+       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+          INFO = -4
+-      ELSE IF( ANORM.LT.ZERO ) THEN
+      ELSE IF( ANORM.LT.ZERO .OR. SISNAN( ANORM ) ) THEN
+          INFO = -5
+       END IF
+       IF( INFO.NE.0 ) THEN
+diff --git a/SRC/dgecon.f b/SRC/dgecon.f
+index aa10dee9a..1ad302ae3 100644
+--- a/SRC/dgecon.f
+++ b/SRC/dgecon.f
+@@ -106,6 +106,7 @@
+ *>          INFO is INTEGER
+ *>          = 0:  successful exit
+ *>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          =-5:  if ANORM is NAN or negative.
+ *> \endverbatim
+ *
+ *  Authors:
+@@ -152,10 +153,10 @@ SUBROUTINE DGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
+       INTEGER            ISAVE( 3 )
+ *     ..
+ *     .. External Functions ..
+-      LOGICAL            LSAME
+      LOGICAL            LSAME, DISNAN
+       INTEGER            IDAMAX
+       DOUBLE PRECISION   DLAMCH
+-      EXTERNAL           LSAME, IDAMAX, DLAMCH
+      EXTERNAL           LSAME, IDAMAX, DLAMCH, DISNAN
+ *     ..
+ *     .. External Subroutines ..
+       EXTERNAL           DLACN2, DLATRS, DRSCL, XERBLA
+@@ -175,7 +176,7 @@ SUBROUTINE DGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
+          INFO = -2
+       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+          INFO = -4
+-      ELSE IF( ANORM.LT.ZERO ) THEN
+      ELSE IF( ANORM.LT.ZERO .OR. DISNAN( ANORM ) ) THEN
+          INFO = -5
+       END IF
+       IF( INFO.NE.0 ) THEN
+diff --git a/SRC/sgecon.f b/SRC/sgecon.f
+index a284b094b..86aeea73b 100644
+--- a/SRC/sgecon.f
+++ b/SRC/sgecon.f
+@@ -106,6 +106,7 @@
+ *>          INFO is INTEGER
+ *>          = 0:  successful exit
+ *>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          =-5:  if ANORM is NAN or negative.
+ *> \endverbatim
+ *
+ *  Authors:
+@@ -152,10 +153,10 @@ SUBROUTINE SGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
+       INTEGER            ISAVE( 3 )
+ *     ..
+ *     .. External Functions ..
+-      LOGICAL            LSAME
+      LOGICAL            LSAME, SISNAN
+       INTEGER            ISAMAX
+       REAL               SLAMCH
+-      EXTERNAL           LSAME, ISAMAX, SLAMCH
+      EXTERNAL           LSAME, ISAMAX, SLAMCH, SISNAN
+ *     ..
+ *     .. External Subroutines ..
+       EXTERNAL           SLACN2, SLATRS, SRSCL, XERBLA
+@@ -175,7 +176,7 @@ SUBROUTINE SGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, IWORK,
+          INFO = -2
+       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+          INFO = -4
+-      ELSE IF( ANORM.LT.ZERO ) THEN
+      ELSE IF( ANORM.LT.ZERO .OR. SISNAN( ANORM ) ) THEN
+          INFO = -5
+       END IF
+       IF( INFO.NE.0 ) THEN
+diff --git a/SRC/zgecon.f b/SRC/zgecon.f
+index 3d3127f9d..9cbfe35bc 100644
+--- a/SRC/zgecon.f
+++ b/SRC/zgecon.f
+@@ -106,6 +106,7 @@
+ *>          INFO is INTEGER
+ *>          = 0:  successful exit
+ *>          < 0:  if INFO = -i, the i-th argument had an illegal value
+*>          =-5:  if ANORM is NAN or negative.
+ *> \endverbatim
+ *
+ *  Authors:
+@@ -153,10 +154,10 @@ SUBROUTINE ZGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
+       INTEGER            ISAVE( 3 )
+ *     ..
+ *     .. External Functions ..
+-      LOGICAL            LSAME
+      LOGICAL            LSAME, DISNAN
+       INTEGER            IZAMAX
+       DOUBLE PRECISION   DLAMCH
+-      EXTERNAL           LSAME, IZAMAX, DLAMCH
+      EXTERNAL           LSAME, IZAMAX, DLAMCH, DISNAN
+ *     ..
+ *     .. External Subroutines ..
+       EXTERNAL           XERBLA, ZDRSCL, ZLACN2, ZLATRS
+@@ -182,7 +183,7 @@ SUBROUTINE ZGECON( NORM, N, A, LDA, ANORM, RCOND, WORK, RWORK,
+          INFO = -2
+       ELSE IF( LDA.LT.MAX( 1, N ) ) THEN
+          INFO = -4
+-      ELSE IF( ANORM.LT.ZERO ) THEN
+      ELSE IF( ANORM.LT.ZERO .OR. DISNAN( ANORM ) ) THEN
+          INFO = -5
+       END IF
+       IF( INFO.NE.0 ) THEN
--- a/lapack.spec
+++ b/lapack.spec
@ -13,13 +13,14 @@
 Summary: Numerical linear algebra package libraries
 Name: lapack
 Version: %{mediumver}.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD-3-Clause-Open-MPI
 URL: http://www.netlib.org/lapack/
 Source0: https://github.com/Reference-LAPACK/lapack/archive/v%{mediumver}.tar.gz
 Source1: http://www.netlib.org/lapack/manpages.tgz
 Source4: http://www.netlib.org/lapack/lapackqref.ps
 Source5: http://www.netlib.org/blas/blasqr.ps
+Patch0: https://patch-diff.githubusercontent.com/raw/Reference-LAPACK/lapack/pull/765.patch
 BuildRequires: gcc-gfortran, gawk
 BuildRequires: make, cmake
 Requires: blas%{?_isa} = %{version}-%{release}
@ -110,6 +111,9 @@ This build has 64bit INTEGER support and a symbol name suffix.

 %prep
 %setup -q -n %{name}-%{mediumver}
+
+%patch -P0 -p1 -b .NaNfix
+
 %setup -q -n %{name}-%{mediumver} -D -T -a1

 mkdir manpages
@ -393,6 +397,9 @@ cp -f manpages/man/man3/* ${RPM_BUILD_ROOT}%{_mandir}/man3
 %endif

 %changelog
+* Thu Jun  1 2023 Tom Callaway <spot@fedoraproject.org> - 3.11.0-4
+- apply upstream fix to https://github.com/Reference-LAPACK/lapack/issues/763
+
 * Fri May 19 2023 Iñaki Úcar <iucar@fedoraproject.org> - 3.11.0-3
 - Adapt license tag to SPDX