8000 Merge pull request #27140 from mattip/scipy-openblas-0.3.27.44.4 · numpy/numpy@69e2845 · GitHub
[go: up one dir, main page]
Skip to content

Commit 69e2845

Browse files
MousiusMousius
authored
Merge pull request #27140 from mattip/scipy-openblas-0.3.27.44.4
Scipy openblas 0.3.27.44.4
2 parents 73a1e4d + eec44a2 commit 69e2845

File tree

6 files changed

+25
-31
lines changed

6 files changed

+25
-31
lines changed

‎numpy/linalg/tests/test_regression.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,18 @@ def test_matrix_rank_rtol_argument(self, rtol):
161161
x = np.zeros((4, 3, 2))
162162
res = np.linalg.matrix_rank(x, rtol=rtol)
163163
assert res.shape == (4,)
164+
165+
def test_openblas_threading(self):
166+
# gh-27036
167+
# Test whether matrix multiplication involving a large matrix always
168+
# gives the same (correct) answer
169+
x = np.arange(500000, dtype=np.float64)
170+
src = np.vstack((x, -10*x)).T
171+
matrix = np.array([[0, 1], [1, 0]])
172+
expected = np.vstack((-10*x, x)).T # src @ matrix
173+
for i in range(200):
174+
result = src @ matrix
175+
mismatches = (~np.isclose(result, expected)).sum()
176+
if mismatches != 0:
177+
assert False, ("unexpected result from matmul, "
178+
"probably due to OpenBLAS threading issues")

‎requirements/ci32_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
spin
22
# Keep this in sync with ci_requirements.txt
3-
scipy-openblas32==0.3.27.44.3
3+
scipy-openblas32==0.3.27.44.4

‎requirements/ci_requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
spin
22
# Keep this in sync with ci32_requirements.txt
3-
scipy-openblas32==0.3.27.44.3
4-
scipy-openblas64==0.3.27.44.3
3+
scipy-openblas32==0.3.27.44.4
4+
scipy-openblas64==0.3.27.44.4

‎tools/wheels/LICENSE_linux.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This binary distribution of NumPy also bundles the following software:
55

66

77
Name: OpenBLAS
8-
Files: numpy.libs/libopenblas*.so
8+
Files: numpy.libs/libscipy_openblas*.so
99
Description: bundled as a dynamically linked library
1010
Availability: https://github.com/OpenMathLib/OpenBLAS/
1111
License: BSD-3-Clause
@@ -41,7 +41,7 @@ License: BSD-3-Clause
4141

4242

4343
Name: LAPACK
44-
Files: numpy.libs/libopenblas*.so
44+
Files: numpy.libs/libscipy_openblas*.so
4545
Description: bundled in OpenBLAS
4646
Availability: https://github.com/OpenMathLib/OpenBLAS/
4747
License: BSD-3-Clause-Attribution

‎tools/wheels/LICENSE_osx.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
This binary distribution of NumPy also bundles the following software:
55

66
Name: OpenBLAS
7-
Files: numpy/.dylibs/libopenblas*.so
7+
Files: numpy/.dylibs/libscipy_openblas*.so
88
Description: bundled as a dynamically linked library
99
Availability: https://github.com/OpenMathLib/OpenBLAS/
1010
License: BSD-3-Clause
@@ -40,7 +40,7 @@ License: BSD-3-Clause
4040

4141

4242
Name: LAPACK
43-
Files: numpy/.dylibs/libopenblas*.so
43+
Files: numpy/.dylibs/libscipy_openblas*.so
4444
Description: bundled in OpenBLAS
4545
Availability: https://github.com/OpenMathLib/OpenBLAS/
4646
License: BSD-3-Clause-Attribution

‎tools/wheels/LICENSE_win32.txt

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This binary distribution of NumPy also bundles the following software:
55

66

77
Name: OpenBLAS
8-
Files: numpy.libs\libopenblas*.dll
8+
Files: numpy.libs\libscipy_openblas*.dll
99
Description: bundled as a dynamically linked library
1010
Availability: https://github.com/OpenMathLib/OpenBLAS/
1111
License: BSD-3-Clause
@@ -41,7 +41,7 @@ License: BSD-3-Clause
4141

4242

4343
Name: LAPACK
44-
Files: numpy.libs\libopenblas*.dll
44+
Files: numpy.libs\libscipy_openblas*.dll
4545
Description: bundled in OpenBLAS
4646
Availability: https://github.com/OpenMathLib/OpenBLAS/
4747
License: BSD-3-Clause-Attribution
@@ -96,7 +96,7 @@ License: BSD-3-Clause-Attribution
9696

9797

9898
Name: GCC runtime library
99-
Files: numpy.libs\libgfortran*.dll
99+
Files: numpy.libs\libscipy_openblas*.dll
100100
Description: statically linked to files compiled with gcc
101101
Availability: https://gcc.gnu.org/git/?p=gcc.git;a=tree;f=libgfortran
102102
License: GPL-3.0-with-GCC-exception
@@ -879,24 +879,3 @@ the library. If this is what you want to do, use the GNU Lesser General
879879
Public License instead of this License. But first, please read
880880
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
881881

882-
Name: libquadmath
883-
Files: numpy.libs\libopenb*.dll
884-
Description: statically linked to files compiled with gcc
885-
Availability: https://gcc.gnu.org/git/?p=gcc.git;a=tree;f=libquadmath
886-
License: LGPL-2.1-or-later
887-
888-
GCC Quad-Precision Math Library
889-
Copyright (C) 2010-2019 Free Software Foundation, Inc.
890-
Written by Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
891-
892-
This file is part of the libquadmath library.
893-
Libquadmath is free software; you can redistribute it and/or
894-
modify it under the terms of the GNU Library General Public
895-
License as published by the Free Software Foundation; either
896-
version 2.1 of the License, or (at your option) any later version.
897-
898-
Libquadmath is distributed in the hope that it will be useful,
899-
but WITHOUT ANY WARRANTY; without even the implied warranty of
900-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
901-
Lesser General Public License for more details.
902-
https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html

0 commit comments

Comments
 (0)
0