Skip to content

Commit 80f2fdf

Browse files
NicolasHugNicolasHug
authored
Merge branch 'main' into aefjnalefjnaljef
2 parents 1e08009 + 29066f5 commit 80f2fdf

Some content is hidden

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

67 files changed

+1188
-675
lines changed

‎.github/scripts/setup-env.sh‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ echo '::endgroup::'
4545

4646
if [[ "${OS_TYPE}" == windows && "${GPU_ARCH_TYPE}" == cuda ]]; then
4747
echo '::group::Install VisualStudio CUDA extensions on Windows'
48-
if [[ "${VC_YEAR:-}" == "2022" ]]; then
49-
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Microsoft/VC/v170/BuildCustomizations"
50-
else
51-
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Microsoft/VC/v160/BuildCustomizations"
52-
fi
48+
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Microsoft/VC/v170/BuildCustomizations"
5349
mkdir -p "${TARGET_DIR}"
5450
cp -r "${CUDA_HOME}/MSBuildExtensions/"* "${TARGET_DIR}"
5551
echo '::endgroup::'
@@ -104,7 +100,13 @@ echo '::endgroup::'
104100

105101
echo '::group::Install torchvision-extra-decoders'
106102
# This can be done after torchvision was built
107-
pip install torchvision-extra-decoders
103+
if [[ "$(uname)" == "Linux" && "$(uname -m)" != "aarch64" ]]; then
104+
extra_decoders_channel="--pre --index-url https://download.pytorch.org/whl/nightly/cpu"
105+
else
106+
extra_decoders_channel=""
107+
fi
108+
109+
pip install torchvision-extra-decoders $extra_decoders_channel
108110
echo '::endgroup::'
109111

110112
echo '::group::Collect environment information'

‎.github/scripts/unittest.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ echo '::endgroup::'
1515
python test/smoke_test.py
1616

1717
# We explicitly ignore the video tests until we resolve https://github.com/pytorch/vision/issues/8162
18-
pytest --ignore-glob="*test_video*" --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25
18+
pytest --ignore-glob="*test_video*" --ignore-glob="*test_onnx*" --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 -k "not TestFxFeatureExtraction"

‎.github/workflows/build-cmake.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ jobs:
2121
gpu-arch-version: "11.8"
2222
fail-fast: false
2323
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
24+
permissions:
25+
id-token: write
26+
contents: read
2427
with:
2528
repository: pytorch/vision
2629
runner: ${{ matrix.runner }}

‎.github/workflows/build-conda-linux.yml‎

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

‎.github/workflows/build-conda-m1.yml‎

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

‎.github/workflows/build-conda-windows.yml‎

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

‎.github/workflows/docs.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ on:
1515
jobs:
1616
build:
1717
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
18+
permissions:
19+
id-token: write
20+
contents: read
1821
with:
1922
repository: pytorch/vision
2023
upload-artifact: docs
@@ -79,9 +82,10 @@ jobs:
7982
needs: build
8083
if: github.repository == 'pytorch/vision' && github.event_name == 'push' &&
8184
((github.ref_type == 'branch' && github.ref_name == 'main') || github.ref_type == 'tag')
85+
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
8286
permissions:
87+
id-token: write
8388
contents: write
84-
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
8589
with:
8690
repository: pytorch/vision
8791
download-artifact: docs

‎.github/workflows/lint.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
jobs:
1313
python-source-and-configs:
1414
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
15+
permissions:
16+
id-token: write
17+
contents: read
1518
with:
1619
repository: pytorch/vision
1720
test-infra-ref: main
@@ -39,6 +42,9 @@ jobs:
3942
4043
c-source:
4144
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
45+
permissions:
46+
id-token: write
47+
contents: read
4248
with:
4349
repository: pytorch/vision
4450
test-infra-ref: main
@@ -66,6 +72,9 @@ jobs:
6672
6773
python-types:
6874
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
75+
permissions:
76+
id-token: write
77+
contents: read
6978
with:
7079
repository: pytorch/vision
7180
test-infra-ref: main

‎.github/workflows/prototype-tests-linux-gpu.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
gpu-arch-version: "11.8"
2525
fail-fast: false
2626
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
27+
permissions:
28+
id-token: write
29+
contents: read
2730
with:
2831
repository: pytorch/vision
2932
runner: ${{ matrix.runner }}

‎.github/workflows/tests.yml‎

Lines changed: 45 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ jobs:
2727
gpu-arch-version: "11.8"
2828
fail-fast: false
2929
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
30+
permissions:
31+
id-token: write
32+
contents: read
3033
with:
3134
repository: pytorch/vision
3235
runner: ${{ matrix.runner }}
@@ -49,7 +52,8 @@ jobs:
4952
python-version:
5053
- "3.9"
5154
- "3.10"
52-
- "3.11"
55+
# TODO put back 3.11 (See blame)
56+
# - "3.11"
5357
- "3.12"
5458
runner: ["macos-m1-stable"]
5559
fail-fast: false
@@ -78,13 +82,17 @@ jobs:
7882
- "3.12"
7983
runner: ["windows.4xlarge"]
8084
gpu-arch-type: ["cpu"]
81-
include:
82-
- python-version: "3.9"
83-
runner: windows.g5.4xlarge.nvidia.gpu
84-
gpu-arch-type: cuda
85-
gpu-arch-version: "11.8"
85+
# TODO: put GPU testing back
86+
# include:
87+
# - python-version: "3.9"
88+
# runner: windows.g5.4xlarge.nvidia.gpu
89+
# gpu-arch-type: cuda
90+
# gpu-arch-version: "11.8"
8691
fail-fast: false
8792
uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
93+
permissions:
94+
id-token: write
95+
contents: read
8896
with:
8997
repository: pytorch/vision
9098
runner: ${{ matrix.runner }}
@@ -96,46 +104,52 @@ jobs:
96104
set -euxo pipefail
97105
98106
export PYTHON_VERSION=${{ matrix.python-version }}
99-
export VC_YEAR=2019
107+
export VC_YEAR=2022
100108
export VSDEVCMD_ARGS=""
101109
export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
102110
export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
103111
104112
./.github/scripts/unittest.sh
105113
106-
onnx:
107-
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
108-
with:
109-
repository: pytorch/vision
110-
test-infra-ref: main
111-
script: |
112-
set -euo pipefail
114+
# onnx:
115+
# uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
116+
# permissions:
117+
# id-token: write
118+
# contents: read
119+
# with:
120+
# repository: pytorch/vision
121+
# test-infra-ref: main
122+
# script: |
123+
# set -euo pipefail
113124

114-
export PYTHON_VERSION=3.10
115-
export GPU_ARCH_TYPE=cpu
116-
export GPU_ARCH_VERSION=''
125+
# export PYTHON_VERSION=3.10
126+
# export GPU_ARCH_TYPE=cpu
127+
# export GPU_ARCH_VERSION=''
117128

118-
./.github/scripts/setup-env.sh
129+
# ./.github/scripts/setup-env.sh
119130

120-
# Prepare conda
121-
CONDA_PATH=$(which conda)
122-
eval "$(${CONDA_PATH} shell.bash hook)"
123-
conda activate ci
131+
# # Prepare conda
132+
# CONDA_PATH=$(which conda)
133+
# eval "$(${CONDA_PATH} shell.bash hook)"
134+
# conda activate ci
124135

125-
echo '::group::Install ONNX'
126-
pip install --progress-bar=off onnx onnxruntime
127-
echo '::endgroup::'
136+
# echo '::group::Install ONNX'
137+
# pip install --progress-bar=off onnx onnxruntime
138+
# echo '::endgroup::'
128139

129-
echo '::group::Install testing utilities'
130-
pip install --progress-bar=off pytest "numpy<2"
131-
echo '::endgroup::'
140+
# echo '::group::Install testing utilities'
141+
# pip install --progress-bar=off pytest "numpy<2"
142+
# echo '::endgroup::'
132143

133-
echo '::group::Run ONNX tests'
134-
pytest --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 test/test_onnx.py
135-
echo '::endgroup::'
144+
# echo '::group::Run ONNX tests'
145+
# pytest --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 test/test_onnx.py
146+
# echo '::endgroup::'
136147

137148
unittests-extended:
138149
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
150+
permissions:
151+
id-token: write
152+
contents: read
139153
if: contains(github.event.pull_request.labels.*.name, 'run-extended')
140154
with:
141155
repository: pytorch/vision

0 commit comments

Comments
 (0)