From a3d3aec24d3ebae436bbe6094ee235f6b2843b09 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Mon, 23 Dec 2024 14:53:40 +0100 Subject: [PATCH 1/2] Remove MKL form macos tests --- .github/scripts/set-conda-test-matrix.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/scripts/set-conda-test-matrix.py b/.github/scripts/set-conda-test-matrix.py index 954480cb0..2e0b95688 100644 --- 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'], } From a38b70c12257f8dfd77216b0ef13adda905755cc Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Mon, 23 Dec 2024 15:14:23 +0100 Subject: [PATCH 2/2] Ubuntu no longer has libopenblas-base transition package --- .github/workflows/os-blas-test-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/os-blas-test-matrix.yml b/.github/workflows/os-blas-test-matrix.yml index 4b0bb0394..2b8790395 100644 --- 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 ;;