Skip to content

Commit

Permalink
Use upstream flashlight-text in CI unittest (#3225)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mthrok authored and facebook-github-bot committed Apr 3, 2023
1 parent a403624 commit c22cd16
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .circleci/unittest/linux/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ printf "Installing PyTorch with %s\n" "${cudatoolkit}"

# 2. Install torchaudio
printf "* Installing torchaudio\n"
python setup.py install
BUILD_CTC_DECODER=0 python setup.py install

# 3. Install Test tools
printf "* Installing test tools\n"
Expand All @@ -72,7 +72,7 @@ fi
(
set -x
conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} 'librosa==0.10.0' parameterized 'requests>=2.20'
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
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
)
# Install fairseq
git clone https://github.com/pytorch/fairseq
Expand Down
5 changes: 4 additions & 1 deletion .circleci/unittest/windows/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ fi

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

# 3. Install Test tools
Expand Down Expand Up @@ -91,7 +92,9 @@ esac
'protobuf<4.21.0' \
demucs \
tinytag \
pyroomacoustics
pyroomacoustics \
flashlight-text \
git+https://github.com/kpu/kenlm/
)
# Install fairseq
git clone https://github.com/pytorch/fairseq
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ jobs:
# TODO: Enable NVDec/NVEnc
conda install --quiet -y 'ffmpeg>=4.1' pkg-config
pip --quiet install cmake>=3.18.0 ninja
USE_FFMPEG=1 pip install --progress-bar off -v -e . --no-use-pep517
BUILD_CTC_DECODER=0 USE_FFMPEG=1 pip install --progress-bar off -v -e . --no-use-pep517
# Install runtime dependencies
pip --quiet install git+https://github.com/kpu/kenlm/ flashlight-text
# Install build tools
conda install --quiet -y -c conda-forge pandoc doxygen pysoundfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unittest-linux-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ jobs:
# Install torchaudio
conda install --quiet -y 'ffmpeg>=4.1' pkg-config
python3 -m pip --quiet install cmake>=3.18.0 ninja
USE_FFMPEG=1 python3 -m pip install -v -e . --no-use-pep517
BUILD_CTC_DECODER=0 USE_FFMPEG=1 python3 -m pip install -v -e . --no-use-pep517
# Install test tools
conda install -y --quiet -c conda-forge -c numba/label/dev 'librosa==0.10.0' parameterized 'requests>=2.20'
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
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/
python3 -m pip install --quiet git+https://github.com/pytorch/fairseq.git@e47a4c8
# Run tests
Expand Down

0 comments on commit c22cd16

Please sign in to comment.