Skip to content

Commit beb4b6e

Browse files
authored
Merge branch 'main' into patch-1
2 parents 340e677 + b208f7f commit beb4b6e

Some content is hidden

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

64 files changed

+652
-726
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: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,8 @@ if [[ $GPU_ARCH_TYPE == 'cuda' ]]; then
8080
fi
8181
echo '::endgroup::'
8282

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-
9783
echo '::group::Install TorchVision'
98-
python setup.py develop
84+
pip install -e . -v --no-build-isolation
9985
echo '::endgroup::'
10086

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

.github/workflows/lint.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -40,36 +40,6 @@ jobs:
4040
exit 1
4141
fi
4242
43-
# c-source:
44-
# uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
45-
# permissions:
46-
# id-token: write
47-
# contents: read
48-
# with:
49-
# repository: pytorch/vision
50-
# test-infra-ref: main
51-
# script: |
52-
# set -euo pipefail
53-
54-
# echo '::group::Setup environment'
55-
# CONDA_PATH=$(which conda)
56-
# eval "$(${CONDA_PATH} shell.bash hook)"
57-
# conda create --name ci --quiet --yes -c conda-forge python=3.9 clang-format
58-
# conda activate ci
59-
# echo '::endgroup::'
60-
61-
62-
# echo '::group::Lint C source'
63-
# set +e
64-
# ./.github/scripts/run-clang-format.py -r torchvision/csrc --exclude "torchvision/csrc/io/image/cpu/giflib/*"
65-
66-
# if [ $? -ne 0 ]; then
67-
# git --no-pager diff
68-
# exit 1
69-
# fi
70-
# echo '::endgroup::'
71-
72-
7343
python-types:
7444
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
7545
permissions:

0 commit comments

Comments
 (0)