Skip to content

Commit

Permalink
Allow more recent FFmpeg in unittests
Browse files Browse the repository at this point in the history
  • Loading branch information
mthrok committed Jul 14, 2023
1 parent 86cb1e0 commit 9ec762b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/unittest-linux/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ printf "Installing PyTorch with %s\n" "${cudatoolkit}"
)

# 2. Install torchaudio
conda install --quiet -y 'ffmpeg>=4.1' ninja cmake
conda install --quiet -y ninja cmake

printf "* Installing torchaudio\n"
python setup.py install
Expand All @@ -75,7 +75,7 @@ fi
# Note: installing librosa via pip fail because it will try to compile numba.
(
set -x
conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} 'librosa==0.10.0' parameterized 'requests>=2.20'
conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} 'librosa==0.10.0' parameterized 'requests>=2.20' 'ffmpeg>=5,<7'
pip install kaldi-io SoundFile coverage pytest pytest-cov 'scipy==1.7.3' expecttest unidecode inflect Pillow sentencepiece pytorch-lightning 'protobuf<4.21.0' demucs tinytag pyroomacoustics flashlight-text git+https://github.com/kpu/kenlm
)
# Install fairseq
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/unittest-linux-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,11 @@ jobs:
"${CUDATOOLKIT}"
# Install torchaudio
conda install --quiet -y 'ffmpeg>=4.1' pkg-config
python3 -m pip --quiet install cmake>=3.18.0 ninja
conda install --quiet -y pkg-config 'cmake>=3.18.0' ninja
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'
conda install -y --quiet -c conda-forge -c numba/label/dev 'librosa==0.10.0' parameterized 'requests>=2.20' 'ffmpeg>=5,<7'
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
Expand Down

0 comments on commit 9ec762b

Please sign in to comment.