Skip to content

Commit 124dfa4

Browse files
authored
Remove quiet option from pre_build_script. Install libjpeg-turbo and ffmpeg in 2 separate steps (#8950)
1 parent dcd1e42 commit 124dfa4

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

packaging/pre_build_script.sh

+7-6
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ if [[ "$(uname)" == Darwin ]]; then
99
brew uninstall --ignore-dependencies --force $pkg || true
1010
done
1111

12-
conda install -yq wget
12+
conda install -y wget
1313
fi
1414

1515
if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" ]]; then
16-
conda install libpng libwebp -yq
16+
conda install libpng libwebp -y
1717
# Installing webp also installs a non-turbo jpeg, so we uninstall jpeg stuff
1818
# before re-installing them
1919
conda uninstall libjpeg-turbo libjpeg -y
20-
conda install -yq ffmpeg=4.2 libjpeg-turbo -c pytorch
20+
conda install -y ffmpeg=4.2 -c pytorch
21+
conda install -y libjpeg-turbo -c pytorch
2122

2223
# Copy binaries to be included in the wheel distribution
2324
if [[ "$OSTYPE" == "msys" ]]; then
@@ -28,11 +29,11 @@ if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" ]]; then
2829
else
2930

3031
if [[ "$ARCH" == "aarch64" ]]; then
31-
conda install libpng -yq
32-
conda install -yq ffmpeg=4.2 libjpeg-turbo -c pytorch-nightly
32+
conda install libpng -y
33+
conda install -y ffmpeg=4.2 libjpeg-turbo -c pytorch-nightly
3334
fi
3435

35-
conda install libwebp -yq
36+
conda install libwebp -y
3637
conda install libjpeg-turbo -c pytorch
3738
yum install -y freetype gnutls
3839
pip install auditwheel

0 commit comments

Comments
 (0)