Merge pull request #1083 from bnavigator/osx-no-mkl

murrayrm · web-flow · commit a2c3b4c8db55 · 2024-12-23T08:55:33.000-08:00
CI: Remove MKL from macOS tests, fix Ubuntu openBLAS install
diff --git a/.github/scripts/set-conda-test-matrix.py b/.github/scripts/set-conda-test-matrix.py
@@ -10,10 +10,8 @@
          'win': 'windows',
          }
 
-blas_implementations = ['unset', 'Generic', 'OpenBLAS', 'Intel10_64lp']
-
-combinations = {'ubuntu': blas_implementations,
-                'macos': blas_implementations,
+combinations = {'ubuntu': ['unset', 'Generic', 'OpenBLAS', 'Intel10_64lp'],
+                'macos': ['unset', 'Generic', 'OpenBLAS'],
                 'windows': ['unset', 'Intel10_64lp'],
                }
 
diff --git a/.github/workflows/os-blas-test-matrix.yml b/.github/workflows/os-blas-test-matrix.yml
@@ -226,7 +226,7 @@ jobs:
           sudo apt-get -y update
           case ${{ matrix.blas_lib }} in
             Generic )  sudo apt-get -y install libblas3 liblapack3 ;;
-            unset | OpenBLAS        ) sudo apt-get -y install libopenblas-base ;;
+            unset | OpenBLAS ) sudo apt-get -y install libopenblas0 ;;
             *)
               echo "BLAS ${{ matrix.blas_lib }} not supported for wheels on Ubuntu"
               exit 1 ;;

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,8 @@`
`10`	`10`	`'win': 'windows',`
`11`	`11`	`}`
`12`	`12`
`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'],`
`17`	`15`	`'windows': ['unset', 'Intel10_64lp'],`
`18`	`16`	`}`
`19`	`17`