Skip to content

Commit c22cd16

Browse files
mthrokfacebook-github-bot
authored andcommitted
Use upstream flashlight-text in CI unittest (#3225)
Summary: Initial step to migrate to upstream CTC decoder. https://circleci.com/api/v1.1/project/github/pytorch/audio/1174432/output/107/0?file=true&allocation-id=642636c6eaaa102ce75beb8e-0-build%2FB77C8AB Pull Request resolved: #3225 Reviewed By: nateanl Differential Revision: D44581338 Pulled By: mthrok fbshipit-source-id: 1517fa0cd5e4ba001d136eb0dfc2a9349afcd2da
1 parent a403624 commit c22cd16

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

.circleci/unittest/linux/scripts/install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ printf "Installing PyTorch with %s\n" "${cudatoolkit}"
5858

5959
# 2. Install torchaudio
6060
printf "* Installing torchaudio\n"
61-
python setup.py install
61+
BUILD_CTC_DECODER=0 python setup.py install
6262

6363
# 3. Install Test tools
6464
printf "* Installing test tools\n"
@@ -72,7 +72,7 @@ fi
7272
(
7373
set -x
7474
conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} 'librosa==0.10.0' parameterized 'requests>=2.20'
75-
pip install kaldi-io SoundFile coverage pytest pytest-cov 'scipy==1.7.3' transformers expecttest unidecode inflect Pillow sentencepiece pytorch-lightning 'protobuf<4.21.0' demucs tinytag pyroomacoustics
75+
pip install kaldi-io SoundFile coverage pytest pytest-cov 'scipy==1.7.3' transformers expecttest unidecode inflect Pillow sentencepiece pytorch-lightning 'protobuf<4.21.0' demucs tinytag pyroomacoustics flashlight-text git+https://github.com/kpu/kenlm
7676
)
7777
# Install fairseq
7878
git clone https://github.com/pytorch/fairseq

.circleci/unittest/windows/scripts/install.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ fi
5050

5151
# 2. Install torchaudio
5252
printf "* Installing torchaudio\n"
53+
export BUILD_CTC_DECODER=0
5354
"$root_dir/packaging/vc_env_helper.bat" python setup.py install
5455

5556
# 3. Install Test tools
@@ -91,7 +92,9 @@ esac
9192
'protobuf<4.21.0' \
9293
demucs \
9394
tinytag \
94-
pyroomacoustics
95+
pyroomacoustics \
96+
flashlight-text \
97+
git+https://github.com/kpu/kenlm/
9598
)
9699
# Install fairseq
97100
git clone https://github.com/pytorch/fairseq

.github/workflows/build_docs.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ jobs:
7272
# TODO: Enable NVDec/NVEnc
7373
conda install --quiet -y 'ffmpeg>=4.1' pkg-config
7474
pip --quiet install cmake>=3.18.0 ninja
75-
USE_FFMPEG=1 pip install --progress-bar off -v -e . --no-use-pep517
75+
BUILD_CTC_DECODER=0 USE_FFMPEG=1 pip install --progress-bar off -v -e . --no-use-pep517
76+
77+
# Install runtime dependencies
78+
pip --quiet install git+https://github.com/kpu/kenlm/ flashlight-text
7679
7780
# Install build tools
7881
conda install --quiet -y -c conda-forge pandoc doxygen pysoundfile

.github/workflows/unittest-linux-gpu.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ jobs:
5757
# Install torchaudio
5858
conda install --quiet -y 'ffmpeg>=4.1' pkg-config
5959
python3 -m pip --quiet install cmake>=3.18.0 ninja
60-
USE_FFMPEG=1 python3 -m pip install -v -e . --no-use-pep517
60+
BUILD_CTC_DECODER=0 USE_FFMPEG=1 python3 -m pip install -v -e . --no-use-pep517
6161
6262
# Install test tools
6363
conda install -y --quiet -c conda-forge -c numba/label/dev 'librosa==0.10.0' parameterized 'requests>=2.20'
64-
python3 -m pip install --quiet kaldi-io SoundFile coverage pytest pytest-cov 'scipy==1.7.3' transformers expecttest unidecode inflect Pillow sentencepiece pytorch-lightning 'protobuf<4.21.0' demucs tinytag
64+
python3 -m pip install --quiet kaldi-io SoundFile coverage pytest pytest-cov 'scipy==1.7.3' transformers expecttest unidecode inflect Pillow sentencepiece pytorch-lightning 'protobuf<4.21.0' demucs tinytag flashlight-text git+https://github.com/kpu/kenlm/
6565
python3 -m pip install --quiet git+https://github.com/pytorch/fairseq.git@e47a4c8
6666
6767
# Run tests

0 commit comments

Comments
 (0)