Skip to content

Commit 826a378

Browse files
committed
CI: set flags where we don't need BLAS, improve Azure failure reporting
1 parent 7b1083f commit 826a378

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
. venv/bin/activate
6464
pip install --progress-bar=off -r test_requirements.txt
6565
pip install --progress-bar=off -r doc_requirements.txt
66-
pip install .
66+
pip install . --config-settings=setup-args="-Dallow-noblas=true"
6767
6868
- run:
6969
name: create release notes

.github/workflows/wheels.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,13 @@ jobs:
186186
python-version: "3.9"
187187
- name: Build sdist
188188
run: |
189-
python setup.py sdist
189+
python -m pip install -U pip build
190+
python -m build --sdist -Csetup-args=-Dallow-noblas=true
190191
- name: Test the sdist
191192
run: |
192193
# TODO: Don't run test suite, and instead build wheels from sdist
193194
# Depends on pypa/cibuildwheel#1020
194-
python -m pip install dist/*.gz
195+
python -m pip install dist/*.gz -Csetup-args=-Dallow-noblas=true
195196
pip install ninja
196197
pip install -r test_requirements.txt
197198
cd .. # Can't import numpy within numpy src directory

azure-steps-windows.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,30 @@ steps:
2828
mkdir C:/opt/openblas/openblas_dll
2929
mkdir C:/opt/32/lib/pkgconfig
3030
mkdir C:/opt/64/lib/pkgconfig
31-
# TBD: support 32 bit testing
3231
$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)")
3332
unzip -o -d c:/opt/ $target
3433
echo "##vso[task.setvariable variable=PKG_CONFIG_PATH]c:/opt/64/lib/pkgconfig"
3534
copy C:/opt/64/bin/*.dll C:/opt/openblas/openblas_dll
3635
displayName: 'Download / Install OpenBLAS'
3736

3837
- powershell: |
38+
# Note: ensure the `pip install .` command remains the last one here, to
39+
# avoid "green on failure" issues
3940
python -c "from tools import openblas_support; openblas_support.make_init('numpy')"
4041
If ( Test-Path env:NPY_USE_BLAS_ILP64 ) {
4142
python -m pip install . -Csetup-args="--vsenv" -Csetup-args="-Duse-ilp64=true" -Csetup-args="-Dblas-symbol-suffix=64_"
4243
} else {
4344
python -m pip install . -Csetup-args="--vsenv"
4445
}
46+
displayName: 'Build NumPy'
47+
48+
- powershell: |
4549
# copy from c:/opt/openblas/openblas_dll to numpy/.libs to ensure it can
4650
# get loaded when numpy is imported (no RPATH on Windows)
4751
$target = $(python -c "import sysconfig; print(sysconfig.get_path('platlib'))")
4852
mkdir $target/numpy/.libs
4953
copy C:/opt/openblas/openblas_dll/*.dll $target/numpy/.libs
50-
displayName: 'Build NumPy'
54+
displayName: 'Copy OpenBLAS DLL to site-packages'
5155

5256
- script: |
5357
python -m pip install threadpoolctl

tools/ci/cirrus_macosx_arm64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ macos_arm64_test_task:
5353
pip install -r build_requirements.txt
5454
pip install pytest pytest-xdist hypothesis typing_extensions
5555
56-
spin build
56+
spin build -- -Dallow-noblas=true
5757
spin test -j auto

0 commit comments

Comments
 (0)