8000 BLD: change default of the `allow-noblas` option to true. · charris/numpy@0035b44 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0035b44

Browse files
rgommerscharris
rgommers
authored and
charris
committed
BLD: change default of the allow-noblas option to true.
Having it set to false caused more disruption and complaints than the silent performance regressions for `true` ever did. So now that the dust has settled a bit on the transition to Meson, go back to the more permissive default. The warning that is emitted when BLAS and/or LAPACK are not found is already much more visible than it was with distutils, so this new situation is still an improvement over where we were until 1.25.x. Closes numpygh-24703.
1 parent 249b5be commit 0035b44

File tree

4 files changed

+17
-17
lines changed
  • meson_options.txt
  • pyproject.toml

    • 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
    @@ -93,7 +93,7 @@ jobs:
    9393
    env:
    9494
    TERM: xterm-256color
    9595
    run:
    96-
    spin build -- --werror
    96+
    spin build -- --werror -Dallow-noblas=false
    9797

    9898
    - name: Check build-internal dependencies
    9999
    run:
    @@ -135,15 +135,15 @@ jobs:
    135135
    pip install pytest hypothesis typing_extensions
    136136
    137137
    - name: Build (LP64)
    138-
    run: spin build -- -Dblas=openblas -Dlapack=openblas -Ddisable-optimization=true
    138+
    run: spin build -- -Dblas=openblas -Dlapack=openblas -Ddisable-optimization=true -Dallow-noblas=false
    139139

    140140
    - name: Test
    141141
    run: spin test -- numpy/linalg
    142142

    143143
    - name: Build (ILP64)
    144144
    run: |
    145145
    rm -rf build
    146-
    spin build -- -Duse-ilp64=true -Ddisable-optimization=true
    146+
    spin build -- -Duse-ilp64=true -Ddisable-optimization=true -Dallow-noblas=false
    147147
    148148
    - name: Test
    149149
    run: spin test -- numpy/linalg
    @@ -170,15 +170,15 @@ jobs:
    170170
    pip install pytest hypothesis typing_extensions
    171171
    172172
    - name: Build
    173-
    run: spin build -- -Ddisable-optimization=true
    173+
    run: spin build -- -Ddisable-optimization=true -Dallow-noblas=false
    174174

    175175
    - name: Test
    176176
    run: spin test -- numpy/linalg
    177177

    178178
    - name: Build (ILP64)
    179179
    run: |
    180180
    rm -rf build
    181-
    spin build -- -Ddisable-optimization=true -Duse-ilp64=true
    181+
    spin build -- -Ddisable-optimization=true -Duse-ilp64=true -Dallow-noblas=false
    182182
    183183
    - name: Test (ILP64)
    184184
    run: spin test -- numpy/linalg
    @@ -205,7 +205,7 @@ jobs:
    205205
    sudo apt-get remove pkg-config
    206206
    207207
    - name: Build
    208-
    run: spin build -- -Ddisable-optimization=true
    208+
    run: spin build -- -Ddisable-optimization=true -Dallow-noblas=false
    209209

    210210
    - name: Test
    211211
    run: spin test -j auto -- numpy/linalg
    @@ -231,7 +231,7 @@ jobs:
    231231
    232232
    - name: Build
    233233
    run: |
    234-
    spin build -- -Ddisable-optimization=true
    234+
    spin build -- -Ddisable-optimization=true -Dallow-noblas=false
    235235
    236236
    - name: Test
    237237
    run: |
    @@ -307,7 +307,7 @@ jobs:
    307307
    - name: Build with defaults (LP64)
    308308
    run: |
    309309
    pkg-config --libs mkl-dynamic-lp64-seq # check link flags
    310-
    spin build -- -Ddisable-optimization=true
    310+
    spin build -- -Ddisable-optimization=true -Dallow-noblas=false
    311311
    312312
    - name: Test
    313313
    run: spin test -- numpy/linalg
    @@ -316,7 +316,7 @@ jobs:
    316316
    run: |
    317317
    git clean -xdf > /dev/null
    318318
    pkg-config --libs mkl-dynamic-ilp64-seq
    319-
    spin build -- -Duse-ilp64=true -Ddisable-optimization=true
    319+
    spin build -- -Duse-ilp64=true -Ddisable-optimization=true -Dallow-noblas=false
    320320
    321321
    - name: Test
    322322
    run: spin test -- numpy/linalg
    @@ -328,7 +328,7 @@ jobs:
    328328
    rm mkl*.pc
    329329
    popd
    330330
    export MKLROOT=$Python3_ROOT_DIR
    331-
    spin build -- -Ddisable-optimization=true
    331+
    spin build -- -Ddisable-optimization=true -Dallow-noblas=false
    332332
    333333
    - name: Test
    334334
    run: spin test -- numpy/linalg
    @@ -363,7 +363,7 @@ jobs:
    363363
    pkg-config --cflags blis
    364364
    365365
    - name: Build
    366-
    run: spin build -- -Dblas=blis -Ddisable-optimization=true
    366+
    run: spin build -- -Dblas=blis -Ddisable-optimization=true -Dallow-noblas=false
    367367

    368368
    - name: Test
    369369
    run: spin test -- numpy/linalg
    @@ -388,7 +388,7 @@ jobs:
    388388
    sudo apt-get install libatlas-base-dev pkg-config
    389389
    390390
    - name: Build
    391-
    run: spin build -- -Dblas 628C =blas-atlas -Dlapack=lapack-atlas -Ddisable-optimization=true
    391+
    run: spin build -- -Dblas=blas-atlas -Dlapack=lapack-atlas -Ddisable-optimization=true -Dallow-noblas=false
    392392

    393393
    - name: Test
    394394
    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
    @@ -153,7 +153,7 @@ tracker = "https://github.com/numpy/numpy/issues"
    153153
    skip = "cp36-* cp37-* cp-38* pp37-* pp38-* *-manylinux_i686 *_ppc64le *_s390x"
    154154
    build-verbosity = "3"
    155155
    before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
    156-
    config-settings = "setup-args=-Duse-ilp64=true setup-args=-Dblas=openblas setup-args=-Dlapack=openblas setup-args=-Dblas-symbol-suffix=64_"
    156+
    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"
    157157
    # meson has a hard dependency on ninja, and we need meson to build
    158158
    # c-extensions in tests. There is a ninja PyPI package used in
    159159
    # build_requirements.txt for macOS, windows, linux but it cannot be in

    0 commit comments

    Comments
     (0)
    0