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

Refactor CI Builds and tests to make our lives easier #2263

Closed
wants to merge 88 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
57fe9e2
fix cpu count
NanoNabla May 12, 2022
ad600fb
Add generate_scorer_batch for batch creating LMs
HarikalarKutusu Jun 24, 2022
fd7f3ba
Merge branch 'coqui-ai:main' into main
HarikalarKutusu Jun 24, 2022
5e60418
Fixes for batch LM
HarikalarKutusu Jun 24, 2022
3dc2efc
Add some enhancements
HarikalarKutusu Jun 24, 2022
b9da8e6
Merge branch 'coqui-ai:main' into main
HarikalarKutusu Jul 3, 2022
22c8cd5
Reimpl özden batch lm gen
wasertech Jul 4, 2022
e6af942
Better output managment
wasertech Jul 4, 2022
155090b
Added units
wasertech Jul 4, 2022
38b1643
improve rendering date
wasertech Jul 4, 2022
2792c00
rm unused code in test
wasertech Jul 4, 2022
4ad8527
Merge branch 'batch-lm-gen-fix' into fix_mp_cpucount
wasertech Jul 5, 2022
559acb7
use accurate cpu count stt-wide
wasertech Jul 5, 2022
2b112c0
fix the universe and everything
wasertech Jul 5, 2022
ff2e131
rm unused import
wasertech Jul 5, 2022
51388ee
rm unused import II
wasertech Jul 5, 2022
a6438f5
Build and test aarch64 python3.10
wasertech Jul 17, 2022
fe2de2e
Updated boostrap conf
wasertech Jul 17, 2022
6667000
Use sid suite
wasertech Jul 17, 2022
8b9f9a8
Disable auth
wasertech Jul 17, 2022
066c61b
Update and enable auth
wasertech Jul 17, 2022
d15c645
Bring back debian-archive-keyring
wasertech Jul 17, 2022
8e645ab
Explicitly install gpgv2
wasertech Jul 17, 2022
af9032b
Explicitly install gpgv2 (in test-chroot-aarch64)
wasertech Jul 17, 2022
04a2295
Downgrade to buster
wasertech Jul 17, 2022
8aea6ec
Downgrade to libstdc++-8-dev
wasertech Jul 17, 2022
f35130a
Upgrade to testing
wasertech Jul 17, 2022
28f077b
Upgrade to libstdc++-10-dev
wasertech Jul 17, 2022
684c577
Disable auth
wasertech Jul 17, 2022
fe7a355
Add missing keys
wasertech Jul 17, 2022
06f4902
Unexplicit suite specification
wasertech Jul 17, 2022
ec32091
Thank lissyx for is work
wasertech Jul 17, 2022
df93ab4
Use ftp
wasertech Jul 17, 2022
de14d67
Fix missing keys
wasertech Jul 17, 2022
9e3299a
Using suite testing-updates
wasertech Jul 17, 2022
27e9884
have no idea what you are doing
wasertech Jul 17, 2022
2e71351
Upodate keys manually
wasertech Jul 18, 2022
b58eb44
sudo pretty please
wasertech Jul 18, 2022
647d314
after mount but before apt update
wasertech Jul 18, 2022
b7b369d
ok...
wasertech Jul 18, 2022
a5657d5
This will work 🤞
wasertech Jul 18, 2022
90db853
🤞
wasertech Jul 18, 2022
aaa3bde
🤞🤞
wasertech Jul 18, 2022
97ce2b2
Create files struct before extracting
wasertech Jul 18, 2022
1687962
Try with ubuntu:21.10 as uses multistrap 2.2.11
wasertech Jul 20, 2022
fd239f4
Fix source url and python version for Build
wasertech Jul 20, 2022
803626e
Rollback to Python 3.9
wasertech Jul 20, 2022
026e30b
Back to ubuntu 20.04
wasertech Jul 20, 2022
bf36f78
No trailing slpah after linek path
wasertech Jul 20, 2022
5a3f8d8
Added -pthread
wasertech Jul 20, 2022
3e6357b
mv multistrap_armbian64_buster.conf multistrap_armbian64_bullseye.conf
wasertech Jul 20, 2022
bb99ddb
Added math lib
wasertech Jul 20, 2022
f679f69
fix conf name
wasertech Jul 20, 2022
8f6c9f0
Use the correct order
wasertech Jul 20, 2022
5c98519
Use the correct order II
wasertech Jul 20, 2022
b926a3e
Use the correct order III
wasertech Jul 20, 2022
5369751
Use the correct order IIII
wasertech Jul 20, 2022
ab5d113
Use in EXTRA_LIBS?
wasertech Jul 20, 2022
de3117d
Added -lrt before -lm
wasertech Jul 21, 2022
addca35
Specify complete path to libm.so
wasertech Jul 21, 2022
4cf5a95
Set correct path to libm
wasertech Jul 21, 2022
49b22ba
Include /usr/include/aarch64-linux-gnu
wasertech Jul 21, 2022
241fa92
Fix tmp root path for amrbian64-bullseye
wasertech Jul 21, 2022
11722a7
Fix sysconfigdata module's name
wasertech Jul 21, 2022
2d98d4e
Merge branch 'coqui-ai:main' into aarch64-py310
wasertech Jul 21, 2022
dbdf08e
Streamline armv7 and aarch64
wasertech Jul 21, 2022
4815c26
Update armv7 config to bullseye
wasertech Jul 21, 2022
3080866
Enjoy the fact that it work?
wasertech Jul 21, 2022
6ee34c5
Almost
wasertech Jul 21, 2022
81fae47
Fix toolchain path
wasertech Jul 21, 2022
443404a
Fix toolchain relative path for armv7
wasertech Jul 21, 2022
0f0bbef
Added explicit path to librt
wasertech Jul 22, 2022
c6c4706
fix buster remanent and fix cflag isys extra rasbian includes
wasertech Jul 22, 2022
9281837
Added -L flag for librt and updated docs
wasertech Jul 22, 2022
15d9af8
renamed to
wasertech Jul 22, 2022
a1ae27b
Include pthread manually
wasertech Jul 22, 2022
15075d3
let the compiler find librt and libthread
wasertech Jul 22, 2022
ac41424
Merge remote-tracking branch 'origin/fix_mp_cpucount' into aarch64-py310
wasertech Jul 22, 2022
b287021
Include libcpuinfo manually
wasertech Jul 22, 2022
d76e627
Add libcpuinfo-dev to packge list in multistrap configs
wasertech Jul 22, 2022
48bf656
Fix generate_lm_batch
wasertech Jul 22, 2022
7e44a1f
fix libcpuinfo
wasertech Jul 23, 2022
b80cf99
set absolute path
wasertech Jul 23, 2022
72d38e5
fix gen batch lm line
wasertech Jul 23, 2022
d65aa87
use the correct lib
wasertech Jul 24, 2022
581cc2a
fix fix fix
wasertech Jul 29, 2022
259114f
rm unused libs refs
wasertech Jul 29, 2022
8284e23
fix arpa_order index for batch lm gen
wasertech Jul 29, 2022
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
4 changes: 2 additions & 2 deletions .github/actions/multistrap/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ runs:

multistrap_conf=""
if [ "${{ inputs.arch }}" = "armv7" ]; then
multistrap_conf=multistrap_raspbian_buster.conf
multistrap_conf=multistrap_raspbian_bullseye.conf
wget http://archive.raspbian.org/raspbian/pool/main/r/raspbian-archive-keyring/raspbian-archive-keyring_20120528.2_all.deb && sudo dpkg -i raspbian-archive-keyring_20120528.2_all.deb
fi
if [ "${{ inputs.arch }}" = "aarch64" ]; then
multistrap_conf=multistrap_armbian64_buster.conf
multistrap_conf=multistrap_armbian64_bullseye.conf
fi

# Retry 2 times because Rasbian mirrors are often failing
Expand Down
23 changes: 13 additions & 10 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -850,6 +850,9 @@ jobs:
# Test FLAC input
time ./bin/run-ci-ldc93s1-flac.sh --epochs 1

# Test LM gen
time ./bin/run-ci-lm-gen-batch.sh

# Test LM opt
time ./bin/run-ci-lm-opt.sh
training-sdb-tests:
Expand Down Expand Up @@ -2808,7 +2811,7 @@ jobs:
runs-on: ubuntu-20.04
env:
SYSTEM_TARGET: rpi3
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-raspbian-buster
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-raspbian-bullseye
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -2837,15 +2840,15 @@ jobs:
runs-on: ubuntu-20.04
env:
SYSTEM_TARGET: rpi3-armv8
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-armbian64-buster
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-armbian64-bullseye
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: 'recursive'
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.9"
- name: Install chroot
uses: ./.github/actions/multistrap
with:
Expand All @@ -2871,7 +2874,7 @@ jobs:
env:
DEBIAN_FRONTEND: "noninteractive"
SYSTEM_TARGET: rpi3
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-raspbian-buster
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-raspbian-bullseye
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -2930,7 +2933,7 @@ jobs:
needs: [build-lib-LinuxArmv7, swig_Linux]
env:
SYSTEM_TARGET: rpi3
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-raspbian-buster
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-raspbian-bullseye
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -2996,11 +2999,11 @@ jobs:
needs: [build-lib-LinuxAarch64, swig_Linux]
strategy:
matrix:
python-version: [3.7]
python-version: [3.9]
env:
DEBIAN_FRONTEND: "noninteractive"
SYSTEM_TARGET: rpi3-armv8
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-armbian64-buster
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-armbian64-bullseye
steps:
- run: |
sudo apt-get install -y --no-install-recommends
Expand Down Expand Up @@ -3061,7 +3064,7 @@ jobs:
needs: [build-lib-LinuxAarch64, swig_Linux]
env:
SYSTEM_TARGET: rpi3-armv8
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-armbian64-buster
SYSTEM_RASPBIAN: ${{ github.workspace }}/multistrap-armbian64-bullseye
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -3214,7 +3217,7 @@ jobs:
strategy:
matrix:
arch: [ "armv7", "aarch64" ]
python-version: [3.7]
python-version: [3.9]
models: ["test", "prod"]
samplerate: ["8000", "16000"]
env:
Expand Down Expand Up @@ -3440,7 +3443,7 @@ jobs:
submodules: 'recursive'
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.9"
- uses: actions/setup-java@v2
with:
distribution: "temurin"
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile.train
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ RUN apt-get update && \
libvorbisfile3 \
libopusfile0 \
libsndfile1 \
libboost-program-options-dev \
libboost-thread-dev \
sox \
libsox-fmt-mp3 \
python3-venv \
Expand Down
24 changes: 24 additions & 0 deletions bin/run-ci-lm-gen-batch.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/sh

# This test optimizes the scorer for testing purposes

set -xe

lm_path="./data/lm"
sources_lm_filepath="./data/smoke_test/vocab.txt"

# Force only one visible device because we have a single-sample dataset
# and when trying to run on multiple devices (like GPUs), this will break

python data/lm/generate_lm_batch.py \
--input_txt "${sources_lm_filepath}" \
--output_dir "${lm_path}" \
--top_k_list 30000 \
--arpa_order_list "4" \
--max_arpa_memory "85%" \
--arpa_prune_list "0|0|2" \
--binary_a_bits 255 \
--binary_q_bits 8 \
--binary_type trie \
--kenlm_bins /code/kenlm/build/bin/ \
-j 1
Empty file modified data/lm/generate_lm.py
100644 → 100755
Empty file.
Loading