8000 Merge pull request #25240 from charris/show-openblas-failure · numpy/numpy@af5a399 · GitHub
[go: up one dir, main page]

Skip to content
Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit af5a399

Browse files
authored
Merge pull request #25240 from charris/show-openblas-failure
Revert "MAINT: Pin scipy-openblas version."
2 parents 455cc92 + f9b6c2f commit af5a399

File tree

3 files changed

+13
-33
lines changed

3 files changed

+13
-33
lines changed

.github/workflows/linux_musl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
python -m venv test_env
5656
source test_env/bin/activate
5757
58-
pip install "scipy-openblas64<=0.3.23.293.2"
58+
pip install scipy-openblas64
5959
6060
pip install -r build_requirements.txt -r test_requirements.txt
6161

.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
env:
5252
PKG_CONFIG_PATH: ${{ github.workspace }}/.openblas
5353
run: |
54-
python -m pip install "scipy-openblas32<=0.3.23.293.2"
54+
python -m pip install scipy-openblas32
5555
spin build --with-scipy-openblas=32 -j2 -- --vsenv
5656
5757
- name: Install NumPy (Clang-cl)
@@ -60,7 +60,7 @@ jobs:
6060
PKG_CONFIG_PATH: ${{ github.workspace }}/.openblas
6161
run: |
6262
"[binaries]","c = 'clang-cl'","cpp = 'clang-cl'","ar = 'llvm-lib'","c_ld = 'lld-link'","cpp_ld = 'lld-link'" | Out-File $PWD/clang-cl-build.ini -Encoding ascii
63-
python -m pip install "scipy-openblas32<=0.3.23.293.2"
63+
python -m pip install scipy-openblas32
6464
spin build --with-scipy-openblas=32 -j2 -- --vsenv --native-file=$PWD/clang-cl-build.ini
6565
6666
- name: Meson Log

azure-steps-windows.yml

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,46 +24,26 @@ steps:
2424
displayName: 'Install utilities'
2525

2626
- powershell: |
27-
$ErrorActionPreference = "Stop"
28-
mkdir C:/opt/openblas/openblas_dll
29-
mkdir C:/opt/32/lib/pkgconfig
30-
mkdir C:/opt/64/lib/pkgconfig
31-
$target=$(python -c "import tools.openblas_support as obs; plat=obs.get_plat(); ilp64=obs.get_ilp64(); target=f'openblas_{plat}.zip'; obs.download_openblas(target, plat, ilp64);print(target)")
32-
unzip -o -d c:/opt/ $target
33-
echo "##vso[task.setvariable variable=PKG_CONFIG_PATH]c:/opt/64/lib/pkgconfig"
34-
copy C:/opt/64/bin/*.dll C:/opt/openblas/openblas_dll
35-
displayName: 'Download / Install OpenBLAS'
36-
37-
- powershell: |
38-
# Note: ensure the `pip install .` command remains the last one here, to
39-
# avoid "green on failure" issues
40-
python -c "from tools import openblas_support; openblas_support.make_init('numpy')"
27+
# Note: ensure the `pip install .` command remains the last one here,
28+
# to avoid "green on failure" issues
4129
If ( Test-Path env:DISABLE_BLAS ) {
4230
python -m pip install . -v -Csetup-args="--vsenv" -Csetup-args="-Dblas=none" -Csetup-args="-Dlapack=none" -Csetup-args="-Dallow-noblas=true"
4331
}
4432
elseif ( Test-Path env:NPY_USE_BLAS_ILP64 ) {
45-
python -m pip install "scipy-openblas64<=0.3.23.293.2" spin
33+
python -m pip install scipy-openblas64 spin
4634
spin config-openblas --with-scipy-openblas=64
4735
$env:PKG_CONFIG_PATH="$pwd/.openblas"
48-
python -m pip install . -v -Csetup-args="--vsenv" -Csetup-args="-Duse-ilp64=true"
49-
} else {
36+
# use-ilp64 is no longer needed with scipy-openblas > 0.3.24.95.0
37+
# python -m pip install . -v -Csetup-args="--vsenv" -Csetup-args="-Duse-ilp64=true"
5038
python -m pip install . -v -Csetup-args="--vsenv"
39+
} else {
40+
python -m pip install scipy-openblas32 spin
41+
spin config-openblas --with-scipy-openblas=32
42+
$env:PKG_CONFIG_PATH="$pwd/.openblas"
43+
python -m pip install . -v -Csetup-args="--vsenv"
5144
}
5245
displayName: 'Build NumPy'
5346

54-
- powershell: |
55-
# copy from c:/opt/openblas/openblas_dll to numpy/../numpy.libs to ensure it can
56-
# get loaded when numpy is imported (no RPATH on Windows)
57-
$target = $(python -c "import sysconfig; print(sysconfig.get_path('platlib'))")
58-
mkdir $target/numpy.libs
59-
copy C:/opt/openblas/openblas_dll/*.dll $target/numpy.libs
60-
displayName: 'Copy OpenBLAS DLL to site-packages'
61-
62-
- script: |
63-
python -m pip install threadpoolctl
64-
python tools/openblas_support.py --check_version
65-
displayName: 'Check OpenBLAS version'
66-
6747
- powershell: |
6848
cd tools # avoid root dir to not pick up source tree
6949
# Get a gfortran onto the path for f2py tests

0 commit comments

Comments
 (0)
0