Skip to content

Commit a657ab7

Browse files
authored
Merge branch 'main' into fix/lsun_err_msg
2 parents 1c4636d + 1752fe6 commit a657ab7

File tree

93 files changed

+1529
-861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1529
-861
lines changed

.github/scripts/run-clang-format.py

Lines changed: 0 additions & 331 deletions
This file was deleted.

.github/scripts/setup-env.sh

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ case $(uname) in
2323
esac
2424

2525
echo '::group::Create build environment'
26-
# See https://github.com/pytorch/vision/issues/7296 for ffmpeg
2726
conda 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
3533
conda activate ci
3634
conda install --quiet --yes libjpeg-turbo -c pytorch
3735
pip install --progress-bar=off --upgrade setuptools==72.1.0
@@ -80,22 +78,8 @@ if [[ $GPU_ARCH_TYPE == 'cuda' ]]; then
8078
fi
8179
echo '::endgroup::'
8280

83-
echo '::group::Install third party dependencies prior to TorchVision install'
84-
# Installing with `easy_install`, e.g. `python setup.py install` or `python setup.py develop`, has some quirks when
85-
# when pulling in third-party dependencies. For example:
86-
# - On Windows, we often hit an SSL error although `pip` can install just fine.
87-
# - It happily pulls in pre-releases, which can lead to more problems down the line.
88-
# `pip` does not unless explicitly told to do so.
89-
# Thus, we use `easy_install` to extract the third-party dependencies here and install them upfront with `pip`.
90-
python setup.py egg_info
91-
# The requires.txt cannot be used with `pip install -r` directly. The requirements are listed at the top and the
92-
# optional dependencies come in non-standard syntax after a blank line. Thus, we just extract the header.
93-
sed -e '/^$/,$d' *.egg-info/requires.txt | tee requirements.txt
94-
pip install --progress-bar=off -r requirements.txt
95-
echo '::endgroup::'
96-
9781
echo '::group::Install TorchVision'
98-
python setup.py develop
82+
pip install -e . -v --no-build-isolation
9983
echo '::endgroup::'
10084

10185
echo '::group::Install torchvision-extra-decoders'

0 commit comments

Comments
 (0)