File tree Expand file tree Collapse file tree 3 files changed +4
-7
lines changed Expand file tree Collapse file tree 3 files changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -23,15 +23,13 @@ case $(uname) in
2323esac
2424
2525echo ' ::group::Create build environment'
26- # See https://github.com/pytorch/vision/issues/7296 for ffmpeg
2726conda create \
2827 --name ci \
2928 --quiet --yes \
3029 python=" ${PYTHON_VERSION} " pip \
3130 ninja cmake \
3231 libpng \
33- libwebp \
34- ' ffmpeg<4.3'
32+ libwebp
3533conda activate ci
3634conda install --quiet --yes libjpeg-turbo -c pytorch
3735pip install --progress-bar=off --upgrade setuptools==72.1.0
Original file line number Diff line number Diff line change @@ -17,7 +17,6 @@ if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" ]]; then
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 -y ffmpeg=4.2 -c pytorch
2120 conda install -y libjpeg-turbo -c pytorch
2221
2322 # Copy binaries to be included in the wheel distribution
3029
3130 if [[ " $ARCH " == " aarch64" ]]; then
3231 conda install libpng -y
33- conda install -y ffmpeg=4.2 libjpeg-turbo -c pytorch-nightly
32+ conda install -y libjpeg-turbo -c pytorch-nightly
3433 fi
3534
3635 conda install libwebp -y
Original file line number Diff line number Diff line change 2828# video decoding backends in torchvision. I'm renaming this to "gpu video
2929# decoder" where possible, keeping user facing names (like the env var below) to
3030# the old scheme for BC.
31- USE_GPU_VIDEO_DECODER = os .getenv ("TORCHVISION_USE_VIDEO_CODEC" , "1 " ) == "1"
31+ USE_GPU_VIDEO_DECODER = os .getenv ("TORCHVISION_USE_VIDEO_CODEC" , "0 " ) == "1"
3232# Same here: "use ffmpeg" was used to denote "use cpu video decoder".
33- USE_CPU_VIDEO_DECODER = os .getenv ("TORCHVISION_USE_FFMPEG" , "1 " ) == "1"
33+ USE_CPU_VIDEO_DECODER = os .getenv ("TORCHVISION_USE_FFMPEG" , "0 " ) == "1"
3434
3535TORCHVISION_INCLUDE = os .environ .get ("TORCHVISION_INCLUDE" , "" )
3636TORCHVISION_LIBRARY = os .environ .get ("TORCHVISION_LIBRARY" , "" )
You can’t perform that action at this time.
0 commit comments