Skip to content

Commit

Permalink
Fix CI by updating kaldi binary, install script and snips-nlu-parsers
Browse files Browse the repository at this point in the history
Also set CI image to 22.04 instead of latest.
Also remove setup rust as rust is bundled (and more up to date)
Also add setuptools_rust to fix builds on aarch64

Signed-off-by: Paul Guyot <[email protected]>
  • Loading branch information
pguyot committed May 3, 2024
1 parent 49a044a commit 1c3004f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
test_suite:
name: Run test suite
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
# Service containers
services:
postgres:
Expand Down Expand Up @@ -40,18 +40,13 @@ jobs:
with:
python-version: ${{ matrix.python }}

- name: Set up Rust
uses: hecrj/setup-rust-action@v1
with:
rust-version: 1.61.0

- name: Install dependencies
run: |
sudo apt update -y
sudo apt-get install -y libasound2-dev libmpg123-dev libatlas-base-dev curl
wget -q -O install_mkl.sh https://raw.githubusercontent.com/pguyot/kaldi/e4940d045d39deb86016bc176893303b5240ff59/tools/extras/install_mkl.sh
wget -q -O install_mkl.sh https://raw.githubusercontent.com/kaldi-asr/kaldi/aef1d98603b68e6cf3a973e9dcd71915e2a175fe/tools/extras/install_mkl.sh
sudo bash install_mkl.sh
wget -q -O - "https://github.com/pguyot/kaldi/releases/download/e4940d045/kaldi-e4940d045-linux_ubuntu20.04-x86_64.tar.xz" | sudo tar xJ -C /
wget -q -O - "https://github.com/pguyot/kaldi/releases/download/0ff452b/kaldi-0ff452b-linux_ubuntu22.04-x86_64.tar.xz" | sudo tar xJ -C /
sudo ldconfig
python -m pip install --upgrade pip
pip install Cython==0.29.30 numpy==1.21.4 setuptools_rust wheel
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,13 @@ https://github.com/pguyot/py-kaldi-asr/releases/download/v0.5.3/py_kaldi_asr-0.5
https://github.com/pguyot/py-kaldi-asr/releases/download/v0.5.3/py_kaldi_asr-0.5.3-cp39-cp39-linux_aarch64.whl; sys_platform == 'linux' and 'aarch64' in platform_machine and python_version == '3.9'
git+https://github.com/pguyot/[email protected]; sys_platform != 'linux' or ('armv6l' not in platform_machine and 'armv7l' not in platform_machine and 'aarch64' not in platform_machine) or (python_version != '3.7' and python_version != '3.9')

setuptools_rust==1.9.0; sys_platform != 'linux' or ('armv6l' not in platform_machine and 'armv7l' not in platform_machine) or (python_version != '3.7' and python_version != '3.9')
https://github.com/pguyot/snips-nlu-parsers/releases/download/v0.4.3/snips_nlu_parsers-0.4.3-cp37-cp37m-linux_armv6l.whl; sys_platform == 'linux' and 'armv6l' in platform_machine and python_version == '3.7'
https://github.com/pguyot/snips-nlu-parsers/releases/download/v0.4.3/snips_nlu_parsers-0.4.3-cp39-cp39-linux_armv6l.whl; sys_platform == 'linux' and 'armv6l' in platform_machine and python_version == '3.9'
https://github.com/pguyot/snips-nlu-parsers/releases/download/v0.4.3/snips_nlu_parsers-0.4.3-cp37-cp37m-linux_armv7l.whl; sys_platform == 'linux' and 'armv7l' in platform_machine and python_version == '3.7'
https://github.com/pguyot/snips-nlu-parsers/releases/download/v0.4.3/snips_nlu_parsers-0.4.3-cp39-cp39-linux_armv7l.whl; sys_platform == 'linux' and 'armv7l' in platform_machine and python_version == '3.9'
https://github.com/pguyot/snips-nlu-parsers/releases/download/v0.4.3/snips_nlu_parsers-0.4.3-cp39-cp39-linux_aarch64.whl; sys_platform == 'linux' and 'aarch64' in platform_machine and python_version == '3.9'
snips-nlu-parsers==0.4.3; sys_platform != 'linux' or ('armv6l' not in platform_machine and 'armv7l' not in platform_machine) or (python_version != '3.7' and python_version != '3.9')
git+https://github.com/pguyot/snips-nlu-parsers@0.4.3-2024#subdirectory=python; sys_platform != 'linux' or ('armv6l' not in platform_machine and 'armv7l' not in platform_machine) or (python_version != '3.7' and python_version != '3.9')

https://github.com/pguyot/snips-nlu-utils/releases/download/v0.9.1/snips_nlu_utils-0.9.1-cp37-cp37m-linux_armv6l.whl; sys_platform == 'linux' and 'armv6l' in platform_machine and python_version == '3.7'
https://github.com/pguyot/snips-nlu-utils/releases/download/v0.9.1/snips_nlu_utils-0.9.1-cp39-cp39-linux_armv6l.whl; sys_platform == 'linux' and 'armv6l' in platform_machine and python_version == '3.9'
Expand Down

0 comments on commit 1c3004f

Please sign in to comment.