Skip to content

Commit 3c3e586

Browse files
tornariatornaria
committed
openblas: fix bug that affects numpy/scipy/octave/sagemath
See: OpenMathLib/OpenBLAS#3976 Include patches from upstream: - OpenMathLib/OpenBLAS#3978 - OpenMathLib/OpenBLAS#3980 - OpenMathLib/OpenBLAS#3984
1 parent c88ea0d commit 3c3e586

File tree

4 files changed

+162
-2
lines changed

4 files changed

+162
-2
lines changed

‎srcpkgs/openblas/patches/3978.patch

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From 12aabb9f9ba57a74a3feedfafd97b7aeecbac450 Mon Sep 17 00:00:00 2001
2+
From: Martin Kroeker <[email protected]>
3+
Date: Wed, 29 Mar 2023 09:44:33 +0200
4+
Subject: [PATCH] fix conditional
5+
6+
---
7+
lapack/getf2/zgetf2_k.c | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/lapack/getf2/zgetf2_k.c b/lapack/getf2/zgetf2_k.c
11+
index f3412f52ff..dbc78abc60 100644
12+
--- a/lapack/getf2/zgetf2_k.c
13+
+++ b/lapack/getf2/zgetf2_k.c
14+
@@ -107,7 +107,7 @@ blasint CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa,
15+
temp2 = *(b + jp * 2 + 1);
16+
17+
// if ((temp1 != ZERO) || (temp2 != ZERO)) {
18+
- if ((fabs(temp1) >= DBL_MIN) && (fabs(temp2) >= DBL_MIN)) {
19+
+ if ((fabs(temp1) >= DBL_MIN) || (fabs(temp2) >= DBL_MIN)) {
20+
21+
if (jp != j) {
22+
SWAP_K(j + 1, 0, 0, ZERO, ZERO, a + j * 2, lda,

‎srcpkgs/openblas/patches/3980.patch

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
From 6c431239da3e4480651480f91b3438d7ad1903e5 Mon Sep 17 00:00:00 2001
2+
From: Martin Kroeker <[email protected]>
3+
Date: Wed, 29 Mar 2023 22:14:21 +0200
4+
Subject: [PATCH] Split test condition in LU computation - non-denormal for
5+
computation, exact zero for reporting singularity
6+
7+
---
8+
lapack/getf2/getf2_k.c | 23 ++++++++++++--------
9+
lapack/getf2/zgetf2_k.c | 48 ++++++++++++++++++++++-------------------
10+
2 files changed, 40 insertions(+), 31 deletions(-)
11+
12+
diff --git a/lapack/getf2/getf2_k.c b/lapack/getf2/getf2_k.c
13+
index d29ed588e9..80c66dd7a6 100644
14+
--- a/lapack/getf2/getf2_k.c
15+
+++ b/lapack/getf2/getf2_k.c
16+
@@ -100,16 +100,21 @@ blasint CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa,
17+
jp--;
18+
temp1 = *(b + jp);
19+
20+
- //if (temp1 != ZERO) {
21+
+ if (temp1 != ZERO) {
22+
+#if defined(DOUBLE)
23+
if (fabs(temp1) >= DBL_MIN ) {
24+
- temp1 = dp1 / temp1;
25+
-
26+
- if (jp != j) {
27+
- SWAP_K(j + 1, 0, 0, ZERO, a + j, lda, a + jp, lda, NULL, 0);
28+
- }
29+
- if (j + 1 < m) {
30+
- SCAL_K(m - j - 1, 0, 0, temp1, b + j + 1, 1, NULL, 0, NULL, 0);
31+
- }
32+
+#else
33+
+ if (fabs(temp1) >= FLT_MIN ) {
34+
+#endif
35+
+ temp1 = dp1 / temp1;
36+
+
37+
+ if (jp != j) {
38+
+ SWAP_K(j + 1, 0, 0, ZERO, a + j, lda, a + jp, lda, NULL, 0);
39+
+ }
40+
+ if (j + 1 < m) {
41+
+ SCAL_K(m - j - 1, 0, 0, temp1, b + j + 1, 1, NULL, 0, NULL, 0);
42+
+ }
43+
+ }
44+
} else {
45+
if (!info) info = j + 1;
46+
}
47+
diff --git a/lapack/getf2/zgetf2_k.c b/lapack/getf2/zgetf2_k.c
48+
index dbc78abc60..e3d53c96f2 100644
49+
--- a/lapack/getf2/zgetf2_k.c
50+
+++ b/lapack/getf2/zgetf2_k.c
51+
@@ -106,30 +106,34 @@ blasint CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa,
52+
temp1 = *(b + jp * 2 + 0);
53+
temp2 = *(b + jp * 2 + 1);
54+
55+
- // if ((temp1 != ZERO) || (temp2 != ZERO)) {
56+
+ if ((temp1 != ZERO) || (temp2 != ZERO)) {
57+
+#if defined(DOUBLE)
58+
if ((fabs(temp1) >= DBL_MIN) || (fabs(temp2) >= DBL_MIN)) {
59+
-
60+
- if (jp != j) {
61+
- SWAP_K(j + 1, 0, 0, ZERO, ZERO, a + j * 2, lda,
62+
+#else
63+
+ if ((fabs(temp1) >= FLT_MIN) || (fabs(temp2) >= FLT_MIN)) {
64+
+#endif
65+
+ if (jp != j) {
66+
+ SWAP_K(j + 1, 0, 0, ZERO, ZERO, a + j * 2, lda,
67+
a + jp * 2, lda, NULL, 0);
68+
- }
69+
-
70+
- if (fabs(temp1) >= fabs(temp2)){
71+
- ratio = temp2 / temp1;
72+
- den = dp1 /(temp1 * ( 1 + ratio * ratio));
73+
- temp3 = den;
74+
- temp4 = -ratio * den;
75+
- } else {
76+
- ratio = temp1 / temp2;
77+
- den = dp1 /(temp2 * ( 1 + ratio * ratio));
78+
- temp3 = ratio * den;
79+
- temp4 = -den;
80+
- }
81+
-
82+
- if (j + 1 < m) {
83+
- SCAL_K(m - j - 1, 0, 0, temp3, temp4,
84+
- b + (j + 1) * 2, 1, NULL, 0, NULL, 0);
85+
- }
86+
+ }
87+
+
88+
+ if (fabs(temp1) >= fabs(temp2)){
89+
+ ratio = temp2 / temp1;
90+
+ den = dp1 /(temp1 * ( 1 + ratio * ratio));
91+
+ temp3 = den;
92+
+ temp4 = -ratio * den;
93+
+ } else {
94+
+ ratio = temp1 / temp2;
95+
+ den = dp1 /(temp2 * ( 1 + ratio * ratio));
96+
+ temp3 = ratio * den;
97+
+ temp4 = -den;
98+
+ }
99+
+
100+
+ if (j + 1 < m) {
101+
+ SCAL_K(m - j - 1, 0, 0, temp3, temp4,
102+
+ b + (j + 1) * 2, 1, NULL, 0, NULL, 0);
103+
+ }
104+
+ }
105+
} else {
106+
if (!info) info = j + 1;
107+
}

‎srcpkgs/openblas/patches/3984.patch

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 36fcb52094c4c99eec651a61311204c466b7f054 Mon Sep 17 00:00:00 2001
2+
From: Martin Kroeker <[email protected]>
3+
Date: Sat, 1 Apr 2023 00:02:54 +0200
4+
Subject: [PATCH] Fix logic - we want real OR imaginary part of X to be nonzero
5+
here
6+
7+
---
8+
driver/level2/zspr_k.c | 4 ++--
9+
1 file changed, 2 insertions(+), 2 deletions(-)
10+
11+
diff --git a/driver/level2/zspr_k.c b/driver/level2/zspr_k.c
12+
index d888a81ee2..7f0eefd6b3 100644
13+
--- a/driver/level2/zspr_k.c
14+
+++ b/driver/level2/zspr_k.c
15+
@@ -53,7 +53,7 @@ int CNAME(BLASLONG m, FLOAT alpha_r, FLOAT alpha_i,
16+
17+
for (i = 0; i < m; i++){
18+
#ifndef LOWER
19+
- if ((X[i * 2 + 0] != ZERO) && (X[i * 2 + 1] != ZERO)) {
20+
+ if ((X[i * 2 + 0] != ZERO) || (X[i * 2 + 1] != ZERO)) {
21+
AXPYU_K(i + 1, 0, 0,
22+
alpha_r * X[i * 2 + 0] - alpha_i * X[i * 2 + 1],
23+
alpha_i * X[i * 2 + 0] + alpha_r * X[i * 2 + 1],
24+
@@ -61,7 +61,7 @@ int CNAME(BLASLONG m, FLOAT alpha_r, FLOAT alpha_i,
25+
}
26+
a += (i + 1) * 2;
27+
#else
28+
- if ((X[i * 2 + 0] != ZERO) && (X[i * 2 + 1] != ZERO)) {
29+
+ if ((X[i * 2 + 0] != ZERO) || (X[i * 2 + 1] != ZERO)) {
30+
AXPYU_K(m - i, 0, 0,
31+
alpha_r * X[i * 2 + 0] - alpha_i * X[i * 2 + 1],
32+
alpha_i * X[i * 2 + 0] + alpha_r * X[i * 2 + 1],

‎srcpkgs/openblas/template

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Template file for 'openblas'
22
pkgname=openblas
3-
reverts="0.3.19_1"
43
version=0.3.22
5-
revision=1
4+
revision=2
65
build_style=gnu-makefile
76
make_build_args="HOSTCC=gcc USE_OPENMP=1"
87
make_install_args="OPENBLAS_INCLUDE_DIR=\$(PREFIX)/include/openblas"

0 commit comments

Comments
 (0)