8000 Merge pull request #25063 from rgommers/allow-noblas-again · numpy/numpy@5dfe4cb · GitHub
[go: up one dir, main page]
Skip to content

Commit 5dfe4cb

Browse files
charrischarris
authored
Merge pull request #25063 from rgommers/allow-noblas-again
BLD: change default of the `allow-noblas` option to true
2 parents c350500 + 1059da9 commit 5dfe4cb

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

‎.github/workflows/linux_blas.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
env:
9090
TERM: xterm-256color
9191
run:
92-
spin build -- --werror
92+
spin build -- --werror -Dallow-noblas=false
9393

9494
- name: Check build-internal dependencies
9595
run:
@@ -131,15 +131,15 @@ jobs:
131131
pip install pytest hypothesis typing_extensions
132132
133133
- name: Build (LP64)
134-
run: spin build -- -Dblas=openblas -Dlapack=openblas -Ddisable-optimization=true
134+
run: spin build -- -Dblas=openblas -Dlapack=openblas -Ddisable-optimization=true -Dallow-noblas=false
135135

136136
- name: Test
137137
run: spin test -- numpy/linalg
138138

139139
- name: Build (ILP64)
140140
run: |
141141
rm -rf build
142-
spin build -- -Duse-ilp64=true -Ddisable-optimization=true
142+
spin build -- -Duse-ilp64=true -Ddisable-optimization=true -Dallow-noblas=false
143143
144144
- name: Test
145145
run: spin test -- numpy/linalg
@@ -166,15 +166,15 @@ jobs:
166166
pip install pytest hypothesis typing_extensions
167167
168168
- name: Build
169-
run: spin build -- -Ddisable-optimization=true
169+
run: spin build -- -Ddisable-optimization=true -Dallow-noblas=false
170170

171171
- name: Test
172172
run: spin test -- numpy/linalg
173173

174174
- name: Build (ILP64)
175175
run: |
176176
rm -rf build
177-
spin build -- -Ddisable-optimization=true -Duse-ilp64=true
177+
spin build -- -Ddisable-optimization=true -Duse-ilp64=true -Dallow-noblas=false
178178
179179
- name: Test (ILP64)
180180
run: spin test -- numpy/linalg
@@ -201,7 +201,7 @@ jobs:
201201
sudo apt-get remove pkg-config
202202
203203
- name: Build
204-
run: spin build -- -Ddisable-optimization=true
204+
run: spin build -- -Ddisable-optimization=true -Dallow-noblas=false
205205

206206
- name: Test
207207
run: spin test -j auto -- numpy/linalg
@@ -227,7 +227,7 @@ jobs:
227227
228228
- name: Build
229229
run: |
230-
spin build -- -Ddisable-optimization=true
230+
spin build -- -Ddisable-optimization=true -Dallow-noblas=false
231231
232232
- name: Test
233233
run: |
@@ -303,7 +303,7 @@ jobs:
303303
- name: Build with defaults (LP64)
304304
run: |
305305
pkg-config --libs mkl-dynamic-lp64-seq # check link flags
306-
spin build -- -Ddisable-optimization=true
306+
spin build -- -Ddisable-optimization=true -Dallow-noblas=false
307307
308308
- name: Test
309309
run: spin test -- numpy/linalg
@@ -312,7 +312,7 @@ jobs:
312312
run: |
313313
git clean -xdf > /dev/null
314314
pkg-config --libs mkl-dynamic-ilp64-seq
315-
spin build -- -Duse-ilp64=true -Ddisable-optimization=true
315+
spin build -- -Duse-ilp64=true -Ddisable-optimization=true -Dallow-noblas=false
316316
317317
- name: Test
318318
run: spin test -- numpy/linalg
@@ -324,7 +324,7 @@ jobs:
324324
rm mkl*.pc
325325
popd
326326
export MKLROOT=$Python3_ROOT_DIR
327-
spin build -- -Ddisable-optimization=true
327+
spin build -- -Ddisable-optimization=true -Dallow-noblas=false
328328
329329
- name: Test
330330
run: spin test -- numpy/linalg
@@ -359,7 +359,7 @@ jobs:
359359
pkg-config --cflags blis
360360
361361
- name: Build
362-
run: spin build -- -Dblas=blis -Ddisable-optimization=true
362+
run: spin build -- -Dblas=blis -Ddisable-optimization=true -Dallow-noblas=false
363363

364364
- name: Test
365365
run: spin test -- numpy/linalg
@@ -384,7 +384,7 @@ jobs:
384384
sudo apt-get install libatlas-base-dev pkg-config
385385
386386
- name: Build
387-
run: spin build -- -Dblas=blas-atlas -Dlapack=lapack-atlas -Ddisable-optimization=true
387+
run: spin build -- -Dblas=blas-atlas -Dlapack=lapack-atlas -Ddisable-optimization=true -Dallow-noblas=false
388388

389389
- name: Test
390390
run: spin test -- numpy/linalg

‎.github/workflows/macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
shell: bash -l {0}
8585
run: |
8686
conda activate numpy-dev
87-
CC="ccache $CC" spin build -j2
87+
CC="ccache $CC" spin build -j2 -- -Dallow-noblas=false
8888
8989
- name: Run test suite (full)
9090
shell: bash -l {0}
@@ -123,14 +123,14 @@ jobs:
123123
pip install pytest pytest-xdist hypothesis
124124
125125
- name: Build against Accelerate (LP64)
126-
run: spin build -- -Ddisable-optimization=true
126+
run: spin build -- -Ddisable-optimization=true -Dallow-noblas=false
127127

128128
- name: Test (linalg only)
129129
run: spin test -j2 -- numpy/linalg
130130

131131
- name: Build NumPy against Accelerate (ILP64)
132132
run: |
133-
spin build -- -Duse-ilp64=true
133+
spin build -- -Duse-ilp64=true -Dallow-noblas=false
134134
135135
- name: Test (fast tests)
136136
run: spin test -j2

‎meson_options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ option('blas', type: 'string', value: 'auto',
22
description: 'Option for BLAS library selection. By default, try to find any in the order given by `blas-order`')
33
option('lapack', type: 'string', value: 'auto',
44
description: 'Option for LAPACK library selection. By default, try to find any in the order given by `lapack-order`')
5-
option('allow-noblas', type: 'boolean', value: false,
5+
option('allow-noblas', type: 'boolean', value: true,
66
description: 'If set to true, allow building with (slow!) internal fallback routines')
77
option('blas-order', type: 'array',
88
value: ['mkl', 'accelerate', 'openblas', 'flexiblas', 'blis', 'blas'])

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ tracker = "https://github.com/numpy/numpy/issues"
143143
skip = "cp36-* cp37-* cp-38* pp37-* *-manylinux_i686 *_ppc64le *_s390x"
144144
build-verbosity = "3"
145145
before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
146-
config-settings = "setup-args=-Duse-ilp64=true setup-args=-Dblas=openblas setup-args=-Dlapack=openblas setup-args=-Dblas-symbol-suffix=64_"
146+
config-settings = "setup-args=-Duse-ilp64=true setup-args=-Dblas=openblas setup-args=-Dlapack=openblas setup-args=-Dblas-symbol-suffix=64_ setup-args=-Dallow-noblas=false"
147147
# meson has a hard dependency on ninja, and we need meson to build
148148
# c-extensions in tests. There is a ninja PyPI package used in
149149
# build_requirements.txt for macOS, windows, linux but it cannot be in

0 commit comments

Comments
 (0)
0