Ilp64 openblas

.github/CODEOWNERS

@@ -57,7 +57,6 @@ benchmarks/asv.conf.json  @larsoner
 # CI config
 .circleci/  @larsoner
 .github/workflows/  @larsoner @andyfaff
-.cirrus.star  @larsoner @andyfaff
 
 # Doc
 requirements/doc.txt  @tupui

.github/label-globs.yml

@@ -156,7 +156,6 @@ CI:
     - .circleci/**
     - .github/workflows/**
     - ci/**
-    - .cirrus.star
 
 DX:
 - changed-files:

.github/workflows/linux.yml

@@ -285,7 +285,7 @@ jobs:
   #################################################################################
   prerelease_deps_coverage_64bit_blas:
     # TODO: re-enable ILP64 build.
-    name: Prerelease deps & coverage report, full, py3.11/npMin & py3.11/npPre, dev.py
+    name: Prerelease deps & coverage report, full, py3.11/npMin & py3.11/npPre, dev.py, SCIPY_ARRAY_API=1
     needs: get_commit_message
     if: >
       needs.get_commit_message.outputs.message == 1
@@ -362,6 +362,7 @@ jobs:
     - name: Test SciPy
       run: |
         export OPENBLAS_NUM_THREADS=1
+        export SCIPY_ARRAY_API=1
         python dev.py --no-build test --coverage -j2 --mode full -- --cov --cov-report term-missing
 
   #################################################################################
@@ -508,7 +509,6 @@ jobs:
       if: ${{ matrix.parallel == '1'}}
       env:
         # Excluded modules:
-        # - scipy.special and scipy.stats are waiting on special.errstate being made thread-safe
         # - scipy.spatial has multiple issues  in kdtree/qhull, and gh-20655 is pending.
         TEST_SUBMODULES: >-
           -t scipy.cluster
@@ -527,6 +527,8 @@ jobs:
           -t scipy.optimize
           -t scipy.signal
           -t scipy.sparse
+          -t scipy.special
+          -t scipy.stats
       run: |
         # Note: only fast tests; full test suite is unlikely to uncover anything more,
         #       and it'll be quite slow with pytest-run-parallel

.github/workflows/linux_blas_ilp64.yml

@@ -0,0 +1,129 @@
+name: BLAS tests (Linux)
+
+# This file is meant for testing different BLAS/LAPACK flavors and build
+# options on Linux. All other yml files for Linux will only test without BLAS
+# (mostly because that's easier and faster to build) or with the same 64-bit
+# OpenBLAS build that is used in the wheel jobs.
+#
+# Jobs and their purpose:
+#
+#   - mkl:
+#         Tests MKL installed from PyPI (because easiest/fastest, if broken) in
+#         3 ways: both LP64 and ILP64 via pkg-config, and then using the
+#         Single Dynamic Library (SDL, or `libmkl_rt`).
+#
+#    - scipy-openblas64:
+#         Test ILP64-enabled build with scipy-openblas32 and scipy-openblas64.
+#
+
+on:
+  pull_request:
+    branches:
+      - main
+      - maintenance/**
+
+defaults:
+  run:
+    shell: bash
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+
+  mkl-lp64:
+    runs-on: ubuntu-latest
+    name: "MKL LP64"
+    steps:
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+      with:
+        python-version: '3.11'
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gfortran
+        pip install cython numpy pybind11 pythran pytest hypothesis pytest-xdist pooch
+        pip install -r requirements/dev.txt
+        pip install git+https://github.com/numpy/meson.git@main-numpymeson
+        pip install mkl mkl-devel
+
+    - name: Build with defaults (LP64)
+      run: |
+        pkg-config --libs mkl-dynamic-lp64-seq  # check link flags
+        python dev.py build -C-Dblas=mkl
+
+    - name: Test
+      run: python dev.py test -j 2
+
+
+  mkl-ilp64:
+    runs-on: ubuntu-latest
+    name: "MKL ILP64"
+    steps:
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+      with:
+        python-version: '3.11'
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gfortran
+        pip install cython numpy pybind11 pythran pytest hypothesis pytest-xdist pooch
+        pip install -r requirements/dev.txt
+        pip install git+https://github.com/numpy/meson.git@main-numpymeson
+        pip install mkl mkl-devel
+
+    - name: Build with ILP64
+      run: |
+        pkg-config --libs mkl-dynamic-ilp64-seq  # check link flags
+        python dev.py build -C-Dblas=mkl -C-Duse-ilp64=true
+
+    - name: Test
+      run: python dev.py test -j 2
+
+
+  scipy-openblas-ilp64:
+    runs-on: ubuntu-latest
+    name: "scipy-openblas ILP64"
+    steps:
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+      with:
+        python-version: '3.11'
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gfortran
+        pip install cython numpy pybind11 pythran pytest hypothesis pytest-xdist pooch
+        pip install -r requirements/dev.txt
+        pip install git+https://github.com/numpy/meson.git@main-numpymeson
+        pip install scipy-openblas32 scipy-openblas64
+        # dev.py does this for scipy-openblas32
+        python -c'import scipy_openblas64 as so64; print(so64.get_pkg_config())' > scipy-openblas64.pc
+        export PKG_CONFIG_PATH=`pwd`
+
+    - name: Build with ILP64
+      run: |
+        python dev.py build --with-scipy-openblas -C-Duse-ilp64=true
+
+    - name: Test
+      run: python dev.py test -j 2
+
+

.github/workflows/macos.yml

@@ -217,3 +217,4 @@ jobs:
 
         pip install pooch pytest hypothesis
         python dev.py -n test
+

doc/source/dev/contributor/continuous_integration.rst

@@ -56,12 +56,6 @@ CircleCI
 * ``run_benchmarks``: verify how the changes impact performance
 * ``refguide_check``: doctests from examples and benchmarks
 
-CirrusCI
---------
-* ``Tests``: test suite for specific architecture like
-  ``musllinux, arm, aarch``
-* ``Wheels``: build and upload some wheels
-
 .. _skip-ci:
 
 Skipping
@@ -79,7 +73,6 @@ Skipping CI can be achieved by adding a special text in the commit message:
 
 * ``[skip actions]``: will skip GitHub Actions
 * ``[skip circle]``: will skip CircleCI
-* ``[skip cirrus]``: will skip CirrusCI
 * ``[docs only]``: will skip *all but* the CircleCI checks and the linter
 * ``[lint only]``: will skip *all but* the linter
 * ``[skip ci]``: will skip *all* CI
@@ -88,7 +81,7 @@ Of course, you can combine these to skip multiple workflows.
 
 This skip information should be placed on a new line. In this example, we
 just updated a ``.rst`` file in the documentation and ask to skip all but the
-relevant docs checks (skip Cirrus and GitHub Actions' workflows)::
+relevant docs checks (skip GitHub Actions' workflows)::
 
     DOC: improve QMCEngine examples.
 

meson.options

@@ -2,6 +2,12 @@ option('blas', type: 'string', value: 'openblas',
         description: 'option for BLAS library switching')
 option('lapack', type: 'string', value: 'openblas',
         description: 'option for LAPACK library switching')
+option('use-ilp64', type: 'boolean', value: false,
+       description: 'Use ILP64 (64-bit integer) BLAS and LAPACK interfaces')
+option('blas-symbol-suffix', type: 'string', value: 'auto',
+        description: 'BLAS and LAPACK symbol suffix to use, if any')
+option('mkl-threading', type: 'string', value: 'auto',
+        description: 'MKL threading method, one of: `seq`, `iomp`, `gomp`, `tbb`')
 option('use-g77-abi', type: 'boolean', value: false,
         description: 'If set to true, forces using g77 compatibility wrappers ' +
                      'for LAPACK functions. The default is to use gfortran ' +

mypy.ini

@@ -120,7 +120,7 @@ ignore_missing_imports = True
 [mypy-scipy.optimize._bglu_dense]
 ignore_missing_imports = True
 
-[mypy-scipy.optimize._slsqp]
+[mypy-scipy.optimize._slsqplib]
 ignore_missing_imports = True
 
 [mypy-scipy.interpolate._dfitpack]

pyproject.toml

@@ -82,7 +82,7 @@ test = [
     "scikit-umfpack",
     "pooch",
     "hypothesis>=6.30",
-    "array-api-strict>=2.3",
+    "array-api-strict>=2.3.1",
     "Cython",
     "meson",
     'ninja; sys_platform != "emscripten"',

requirements/test.txt

@@ -11,7 +11,7 @@ threadpoolctl
 # scikit-umfpack  # circular dependency issues
 pooch
 hypothesis>=6.30
-array-api-strict>=2.0,<2.1.1
+array-api-strict>=2.3.1
 Cython
 meson
 ninja; sys_platform != "emscripten"

scipy/_build_utils/int64.f2cmap.in

@@ -0,0 +1 @@
+{'integer': {'': '@int64_name@'}, 'logical': {'': '@int64_name@'}}

scipy/_build_utils/src/npy_cblas.h

@@ -26,6 +26,21 @@ enum CBLAS_SIDE {CblasLeft=141, CblasRight=142};
 
 #define CBLAS_INDEX size_t  /* this may vary between platforms */
 
+#ifdef ACCELERATE_NEW_LAPACK
+    #if __MAC_OS_X_VERSION_MAX_ALLOWED < 130300
+        #ifdef HAVE_BLAS_ILP64
+            #error "Accelerate ILP64 support is only available with macOS 13.3 SDK or later"
+        #endif
+    #else
+       /* #define NO_APPEND_FORTRAN */
+        #ifdef HAVE_BLAS_ILP64
+            #define BLAS_SYMBOL_SUFFIX $NEWLAPACK$ILP64
+        #else
+            #define BLAS_SYMBOL_SUFFIX $NEWLAPACK
+        #endif
+    #endif
+#endif
+
 #ifdef NO_APPEND_FORTRAN
 #define BLAS_FORTRAN_SUFFIX
 #else
@@ -50,7 +65,6 @@ enum CBLAS_SIDE {CblasLeft=141, CblasRight=142};
 #define BLAS_FUNC_CONCAT(name,prefix,suffix,suffix2) prefix ## name ## suffix ## suffix2
 #define BLAS_FUNC_EXPAND(name,prefix,suffix,suffix2) BLAS_FUNC_CONCAT(name,prefix,suffix,suffix2)
 
-#define CBLAS_FUNC(name) BLAS_FUNC_EXPAND(name,BLAS_SYMBOL_PREFIX,,BLAS_SYMBOL_SUFFIX)
 /*
  * Use either the OpenBLAS scheme with the `64_` suffix behind the Fortran
  * compiler symbol mangling, or the MKL scheme (and upcoming
@@ -62,6 +76,12 @@ enum CBLAS_SIDE {CblasLeft=141, CblasRight=142};
 #define BLAS_FUNC(name) BLAS_FUNC_EXPAND(name,BLAS_SYMBOL_PREFIX,BLAS_SYMBOL_SUFFIX,BLAS_FORTRAN_SUFFIX)
 #endif
 
+/*
+ * Note that CBLAS doesn't include Fortran compiler symbol mangling, so ends up
+ * being the same in both schemes
+ */
+#define CBLAS_FUNC(name) BLAS_FUNC_EXPAND(name,BLAS_SYMBOL_PREFIX,,BLAS_SYMBOL_SUFFIX)
+
 #ifdef HAVE_BLAS_ILP64
 #define CBLAS_INT npy_int64
 #define CBLAS_INT_MAX NPY_MAX_INT64