From 9c1039fee1bcd9d200935e356c07ed6db28f6cca Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Mon, 23 Dec 2024 11:49:42 +0100 Subject: [PATCH 1/5] New Ubuntu: libopenblas package changed --- .github/workflows/slycot-build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index 9fbd030d..10cfc0e6 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -261,7 +261,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 ;; From a7c0232bca5a2dd38cdfc47a1c0184262162097e Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Mon, 23 Dec 2024 12:14:36 +0100 Subject: [PATCH 2/5] Remove deprecated mambaforge --- .github/workflows/slycot-build-and-test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index 10cfc0e6..a5443aa6 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -154,13 +154,12 @@ jobs: fetch-depth: 0 submodules: 'recursive' - name: Setup Conda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: python-version: ${{ matrix.python }} activate-environment: build-env environment-file: .github/conda-env/build-env.yml miniforge-version: latest - miniforge-variant: Mambaforge channel-priority: strict auto-update-conda: false auto-activate-base: false @@ -333,11 +332,10 @@ jobs: if: matrix.os == 'macos' run: brew install coreutils - name: Setup Conda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: python-version: ${{ matrix.python }} miniforge-version: latest - miniforge-variant: Mambaforge activate-environment: test-env environment-file: slycot-src/.github/conda-env/test-env.yml channel-priority: strict From 85b6153c36e5873b147b612d3ef0b96ca3d82bf7 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Mon, 23 Dec 2024 14:09:21 +0100 Subject: [PATCH 3/5] Update bash command --- .github/workflows/slycot-build-and-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index a5443aa6..db656548 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -164,7 +164,7 @@ jobs: auto-update-conda: false auto-activate-base: false - name: Conda build - shell: bash -l {0} + shell: bash -el {0} run: | set -e conda mambabuild conda-recipe @@ -316,7 +316,7 @@ jobs: defaults: run: - shell: bash -l {0} + shell: bash -el {0} steps: - name: Checkout Slycot @@ -368,7 +368,7 @@ jobs: mamba install -c ./slycot-conda-pkgs slycot conda list - name: Slycot and python-control tests - run: JOBNAME="$JOBNAME" bash slycot-src/.github/scripts/run-tests.sh + run: JOBNAME="$JOBNAME" bash -el slycot-src/.github/scripts/run-tests.sh env: JOBNAME: conda ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: report coverage From d0b4fadbadfe3e8affa8461f5b8afd775a22a3d3 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Mon, 23 Dec 2024 14:13:44 +0100 Subject: [PATCH 4/5] replace mamba with conda Once again they broke something: https://github.com/conda-incubator/setup-miniconda/issues/371 --- .github/workflows/slycot-build-and-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index db656548..1c542d12 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -167,7 +167,7 @@ jobs: shell: bash -el {0} run: | set -e - conda mambabuild conda-recipe + conda build conda-recipe # preserve directory structure for custom conda channel find "${CONDA_PREFIX}/conda-bld" -maxdepth 2 -name 'slycot*.tar.bz2' | while read -r conda_pkg; do conda_platform=$(basename $(dirname "${conda_pkg}")) @@ -350,22 +350,22 @@ jobs: set -e case ${{ matrix.blas_lib }} in unset ) # the conda-forge default (os dependent) - mamba install libblas libcblas liblapack + conda install libblas libcblas liblapack ;; Generic ) - mamba install 'libblas=*=*netlib' 'libcblas=*=*netlib' 'liblapack=*=*netlib' + conda install 'libblas=*=*netlib' 'libcblas=*=*netlib' 'liblapack=*=*netlib' echo "libblas * *netlib" >> $CONDA_PREFIX/conda-meta/pinned ;; OpenBLAS ) - mamba install 'libblas=*=*openblas' openblas + conda install 'libblas=*=*openblas' openblas echo "libblas * *openblas" >> $CONDA_PREFIX/conda-meta/pinned ;; Intel10_64lp ) - mamba install 'libblas=*=*mkl' mkl + conda install 'libblas=*=*mkl' mkl echo "libblas * *mkl" >> $CONDA_PREFIX/conda-meta/pinned ;; esac - mamba install -c ./slycot-conda-pkgs slycot + conda install -c ./slycot-conda-pkgs slycot conda list - name: Slycot and python-control tests run: JOBNAME="$JOBNAME" bash -el slycot-src/.github/scripts/run-tests.sh From af3fe2ddf54b788e240d4c0a221f4f20759e1d94 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Mon, 23 Dec 2024 14:47:16 +0100 Subject: [PATCH 5/5] macos runners are now arm64. There is no Intel MKL on Arm --- .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 954480cb..2e0b9568 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'], }