packages/lapack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!57 Update to 3.11.0

Browse Source 
From: @wk333 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
This commit is contained in:
openeuler-ci-bot 2023-06-14 07:35:11 +00:00 committed by Gitee
commit 5e5e210876
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 155 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
0002-Fix-out-of-bounds-read-in-slarrv.patch
View File

@ -1,81 +0,0 @@
From 0631b6beaed60ba118b0b027c0f8d35397bf5df0 Mon Sep 17 00:00:00 2001
From: Keno Fischer <keno@juliacomputing.com>
Date: Thu, 30 Sep 2021 03:51:23 -0400
Subject: [PATCH] Fix out of bounds read in slarrv
This was originally reported as https://github.com/JuliaLang/julia/issues/42415.
I've tracked this down to an our of bounds read on the following line:
https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L423
In the crashing example, `M` is `0`, causing `slarrv` to read uninitialized
memory from the work array. I believe the `0` for `M` is correct and indeed,
the documentation above supports that `M` may be zero:
https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L113-L116
I believe it may be sufficient to early-out this function as suggested
in this PR. However, I have limited context for the full routine here,
so I would appreciate a sanity check.
---
SRC/clarrv.f | 2 +-
SRC/dlarrv.f | 2 +-
SRC/slarrv.f | 2 +-
SRC/zlarrv.f | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SRC/clarrv.f b/SRC/clarrv.f
index 1f09e4d..42f7107 100644
--- a/SRC/clarrv.f
+++ b/SRC/clarrv.f
@@ -348,7 +348,7 @@
*
* Quick return if possible
*
- IF( N.LE.0 ) THEN
+ IF( (N.LE.0).OR.(M.LE.0) ) THEN
RETURN
END IF
*
diff --git a/SRC/dlarrv.f b/SRC/dlarrv.f
index b036c1e..2994303 100644
--- a/SRC/dlarrv.f
+++ b/SRC/dlarrv.f
@@ -350,7 +350,7 @@
*
* Quick return if possible
*
- IF( N.LE.0 ) THEN
+ IF( (N.LE.0).OR.(M.LE.0) ) THEN
RETURN
END IF
*
diff --git a/SRC/slarrv.f b/SRC/slarrv.f
index 9d72b33..95f94fd 100644
--- a/SRC/slarrv.f
+++ b/SRC/slarrv.f
@@ -350,7 +350,7 @@
*
* Quick return if possible
*
- IF( N.LE.0 ) THEN
+ IF( (N.LE.0).OR.(M.LE.0) ) THEN
RETURN
END IF
*
diff --git a/SRC/zlarrv.f b/SRC/zlarrv.f
index 51ec558..e4be63e 100644
--- a/SRC/zlarrv.f
+++ b/SRC/zlarrv.f
@@ -348,7 +348,7 @@
*
* Quick return if possible
*
- IF( N.LE.0 ) THEN
+ IF( (N.LE.0).OR.(M.LE.0) ) THEN
RETURN
END IF
*
--
1.8.3.1

148
765.patch Normal file
View File

@ -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

10
lapack.spec
View File

@ -1,10 +1,10 @@
%global shortver 3
%global mediumver %{shortver}.10
%global mediumver %{shortver}.11
Name: lapack
Version: %{mediumver}.0
Release: 5
Release: 1
Summary: The LAPACK libraries for numerical linear algebra.
License: BSD
URL: http://www.netlib.org/lapack/
@ -12,7 +12,8 @@ Source0: https://github.com/Reference-LAPACK/lapack/archive/v%{version}.tar.gz
Source1: http://www.netlib.org/lapack/manpages.tgz
Patch1: 0001-fix-lapack-devel-build-error.patch
Patch2: 0002-Fix-out-of-bounds-read-in-slarrv.patch
# https://github.com/Reference-LAPACK/lapack/issues/763
Patch2: https://patch-diff.githubusercontent.com/raw/Reference-LAPACK/lapack/pull/765.patch
BuildRequires: gcc-gfortran
Provides: blas = %{version}-%{release}
@ -207,6 +208,9 @@ sed -i 's|@LAPACK_VERSION@|%{version}|g' %{buildroot}%{_libdir}/pkgconfig/lapack
%endif
%changelog
* Wed Jun 14 2023 wangkai <13474090681@163.com> - 3.11.0-1
- Update to 3.11.0
* Fri Sep 16 2022 Wenyu Liu <liuwenyu7@huawei.com> - 3.10.0-5
- Add the FS compiler options for gcc.

BIN
v3.10.0.tar.gz → v3.11.0.tar.gz
View File

Binary file not shown.