Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some CI errors #244

Merged
merged 5 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/scripts/set-conda-test-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
}

Expand Down
26 changes: 12 additions & 14 deletions .github/workflows/slycot-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,21 +154,20 @@ 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
- name: Conda build
shell: bash -l {0}
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}"))
Expand Down Expand Up @@ -261,7 +260,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 ;;
Expand Down Expand Up @@ -317,7 +316,7 @@ jobs:

defaults:
run:
shell: bash -l {0}
shell: bash -el {0}

steps:
- name: Checkout Slycot
Expand All @@ -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
Expand All @@ -352,25 +350,25 @@ 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 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
Expand Down
Loading