8000 Merge pull request #1083 from bnavigator/osx-no-mkl · python-control/python-control@a2c3b4c · GitHub
[go: up one dir, main page]
Skip to content

Commit a2c3b4c

Browse files
murrayrmmurrayrm
authored
Merge pull request #1083 from bnavigator/osx-no-mkl
CI: Remove MKL from macOS tests, fix Ubuntu openBLAS install
2 parents 9fa4aac + a38b70c commit a2c3b4c

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

‎.github/scripts/set-conda-test-matrix.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
'win': 'windows',
1111
}
1212

13-
blas_implementations = ['unset', 'Generic', 'OpenBLAS', 'Intel10_64lp']
14-
15-
combinations = {'ubuntu': blas_implementations,
16-
'macos': blas_implementations,
13+
combinations = {'ubuntu': ['unset', 'Generic', 'OpenBLAS', 'Intel10_64lp'],
14+
'macos': ['unset', 'Generic', 'OpenBLAS'],
1715
'windows': ['unset', 'Intel10_64lp'],
1816
}
1917

‎.github/workflows/os-blas-test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ jobs:
226226
sudo apt-get -y update
227227
case ${{ matrix.blas_lib }} in
228228
Generic ) sudo apt-get -y install libblas3 liblapack3 ;;
229-
unset | OpenBLAS ) sudo apt-get -y install libopenblas-base ;;
229+
unset | OpenBLAS ) sudo apt-get -y install libopenblas0 ;;
230230
*)
231231
echo "BLAS ${{ matrix.blas_lib }} not supported for wheels on Ubuntu"
232232
exit 1 ;;

0 commit comments

Comments
 (0)
0