Skip to content

Commit 987cdcc

Browse files
committed
update macos numpy build
1 parent 99c6041 commit 987cdcc

File tree

1 file changed

+9
-23
lines changed

1 file changed

+9
-23
lines changed

.github/workflows/numpy.yml

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,36 +49,22 @@ jobs:
4949
with:
5050
python-version: ${{ matrix.python_version }}
5151

52-
- name: Install gfortran (macOS)
53-
run: |
54-
source repo/tools/wheels/gfortran_utils.sh
55-
install_gfortran
56-
if: matrix.os == 'macos-latest'
57-
58-
- name: Install dependencies and scipy-openblas
52+
- name: Install dependencies
5953
run: |
6054
cd repo
6155
python -m pip install --upgrade pip
6256
python -m pip install ninja
63-
python -m pip install -r requirements/test_requirements.txt spin scipy-openblas32
64-
spin config-openblas --with-scipy-openblas=32
57+
python -m pip install -r requirements/test_requirements.txt spin
58+
python -m pip install -r requirements/build_requirements.txt
59+
# Use a newer cython
60+
python -m pip install git+https://github.com/cython/cython.git
6561
66-
- name: Install NumPy
67-
env:
68-
PKG_CONFIG_PATH: ${{ github.workspace }}/repo/.openblas
62+
- name: Install NumPy (use Accelerate)
6963
run: |
7064
cd repo
71-
python -c "import os; print('PKG_CONFIG_PATH', os.environ['PKG_CONFIG_PATH'])"
72-
# python -m pip install . -v -Csetup-args="--vsenv"
73-
# Use a newer cython
74-
python -m pip install -r requirements/build_requirements.txt
75-
python -m pip install git+https://github.com/cython/cython.git
76-
python -m pip install --no-build-isolation . -v -Csetup-args="--vsenv"
65+
spin build -- -Ddisable-optimization=true -Dallow-noblas=false
7766
7867
- name: Test
79-
shell: bash
8068
run: |
81-
# do not cd into the repo directory so we can import numpy
82-
cp repo/pytest.ini .
83-
export LIBRARY_PATH="$LIBRARY_PATH:/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib"
84-
pytest --pyargs numpy -rsx
69+
cd repo
70+
spin test -j2 -- --timeout=600 --durations=10

0 commit comments

Comments
 (0)