Reduce list of libraries to check; add ATLAS CI job

rgommers · Oct 9, 2023 · b686389 · b686389
1 parent c29d5d9
commit b686389
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/linux_blas.yml b/.github/workflows/linux_blas.yml
@@ -241,16 +241,7 @@ jobs:
         pushd $Python3_ROOT_DIR/lib/pkgconfig
         rm mkl*.pc
         popd
-        ls $Python3_ROOT_DIR
-        ls $Python3_ROOT_DIR/lib
-        ls /usr/bin/include/mkl*.h
-        pkg-config --libs blas # DEBUG
-        pkg-config --cflags blas
-        pkg-config --libs lapack
-        pkg-config --cflags lapack
-        dpkg --get-selections | grep blas
-        dpkg --get-selections | grep lapack  # END DEBUG
-        export MKLROOT=$Python3_ROOT_DIR/lib
+        export MKLROOT=$Python3_ROOT_DIR
         spin build -- -Ddisable-optimization=true
 
     - name: Test
@@ -291,11 +282,28 @@ jobs:
     - name: Test
       run: spin test -- numpy/linalg
 
-    - name: Check ATLAS
+  atlas:
+    if: "github.repository == 'rgommers/numpy'"
+    runs-on: ubuntu-latest
+    name: "ATLAS"
+    steps:
+    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
+      with:
+        python-version: '3.11'
+
+    - name: Install dependencies
       run: |
-        sudo apt-get install libatlas-base-dev
-        pkg-config --cflags blas-atlas
-        pkg-config --cflags lapack-atlas
-        pkg-config --libs blas-atlas
-        pkg-config --libs lapack-atlas
+        pip install -r build_requirements.txt
+        pip install pytest pytest-xdist hypothesis typing_extensions
+        sudo apt-get install libatlas-base-dev pkg-config
+
+    - name: Build
+      run: spin build -- -Dblas=blas-atlas -Dlapack=lapack-atlas -Ddisable-optimization=true
+
+    - name: Test
+      run: spin test -- numpy/linalg
 
diff --git a/meson_options.txt b/meson_options.txt
@@ -5,9 +5,9 @@ option('lapack', type: 'string', value: 'auto',
 option('allow-noblas', type: 'boolean', value: false,
         description: 'If set to true, allow building with (slow!) internal fallback routines')
 option('blas-order', type: 'array',
-        value: ['mkl', 'openblas', 'accelerate', 'blis', 'armpl', 'atlas', 'ssl2', 'blas'])
+        value: ['mkl', 'accelerate', 'openblas', 'blis', 'armpl', 'blas'])
 option('lapack-order', type: 'array',
-        value: ['mkl', 'openblas', 'accelerate', 'libflame', 'armpl', 'atlas', 'ssl2', 'lapack'])
+        value: ['mkl', 'accelerate', 'openblas', 'accelerate', 'armpl', 'lapack'])
 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',