Skip to content

Commit b264b31

Browse files
alinpahontu2912alinpahontu2912
authored
Merge branch 'pytorch:main' into x64_workflow_test
2 parents cb246d4 + 95f10a4 commit b264b31

32 files changed

+425
-535
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,13 @@ echo '::endgroup::'
100100

101101
echo '::group::Install torchvision-extra-decoders'
102102
# This can be done after torchvision was built
103-
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
104110
echo '::endgroup::'
105111

106112
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/lint.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -40,34 +40,34 @@ 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::'
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::'
7171

7272

7373
python-types:
@@ -99,13 +99,13 @@ jobs:
9999
mypy --install-types --non-interactive --config-file mypy.ini
100100
echo '::endgroup::'
101101
102-
bc:
103-
if: github.event.pull_request
104-
runs-on: ubuntu-latest
105-
steps:
106-
- name: Run BC Lint Action
107-
uses: pytorch/test-infra/.github/actions/bc-lint@main
108-
with:
109-
repo: ${{ github.event.pull_request.head.repo.full_name }}
110-
base_sha: ${{ github.event.pull_request.base.sha }}
111-
head_sha: ${{ github.event.pull_request.head.sha }}
102+
# bc:
103+
# if: github.event.pull_request
104+
# runs-on: ubuntu-latest
105+
# steps:
106+
# - name: Run BC Lint Action
107+
# uses: pytorch/test-infra/.github/actions/bc-lint@main
108+
# with:
109+
# repo: ${{ github.event.pull_request.head.repo.full_name }}
110+
# base_sha: ${{ github.event.pull_request.base.sha }}
111+
# head_sha: ${{ github.event.pull_request.head.sha }}

‎.github/workflows/tests.yml‎

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ jobs:
5252
python-version:
5353
- "3.9"
5454
- "3.10"
55-
- "3.11"
55+
# TODO put back 3.11 (See blame)
56+
# - "3.11"
5657
- "3.12"
5758
runner: ["macos-m1-stable"]
5859
fail-fast: false
@@ -81,11 +82,12 @@ jobs:
8182
- "3.12"
8283
runner: ["windows.4xlarge"]
8384
gpu-arch-type: ["cpu"]
84-
include:
85-
- python-version: "3.9"
86-
runner: windows.g5.4xlarge.nvidia.gpu
87-
gpu-arch-type: cuda
88-
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"
8991
fail-fast: false
9092
uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
9193
permissions:
@@ -109,39 +111,39 @@ jobs:
109111
110112
./.github/scripts/unittest.sh
111113
112-
onnx:
113-
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
114-
permissions:
115-
id-token: write
116-
contents: read
117-
with:
118-
repository: pytorch/vision
119-
test-infra-ref: main
120-
script: |
121-
set -euo pipefail
122-
123-
export PYTHON_VERSION=3.10
124-
export GPU_ARCH_TYPE=cpu
125-
export GPU_ARCH_VERSION=''
126-
127-
./.github/scripts/setup-env.sh
128-
129-
# Prepare conda
130-
CONDA_PATH=$(which conda)
131-
eval "$(${CONDA_PATH} shell.bash hook)"
132-
conda activate ci
133-
134-
echo '::group::Install ONNX'
135-
pip install --progress-bar=off onnx onnxruntime
136-
echo '::endgroup::'
137-
138-
echo '::group::Install testing utilities'
139-
pip install --progress-bar=off pytest "numpy<2"
140-
echo '::endgroup::'
141-
142-
echo '::group::Run ONNX tests'
143-
pytest --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 test/test_onnx.py
144-
echo '::endgroup::'
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
124+
125+
# export PYTHON_VERSION=3.10
126+
# export GPU_ARCH_TYPE=cpu
127+
# export GPU_ARCH_VERSION=''
128+
129+
# ./.github/scripts/setup-env.sh
130+
131+
# # Prepare conda
132+
# CONDA_PATH=$(which conda)
133+
# eval "$(${CONDA_PATH} shell.bash hook)"
134+
# conda activate ci
135+
136+
# echo '::group::Install ONNX'
137+
# pip install --progress-bar=off onnx onnxruntime
138+
# echo '::endgroup::'
139+
140+
# echo '::group::Install testing utilities'
141+
# pip install --progress-bar=off pytest "numpy<2"
142+
# echo '::endgroup::'
143+
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::'
145147

146148
unittests-extended:
147149
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main

‎docs/source/io.rst‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,16 @@ IO operations
8686
read_file
8787
write_file
8888

89-
Video
90-
-----
89+
Video - DEPREACTED
90+
------------------
9191

9292
.. warning::
9393

94-
Torchvision supports video decoding through different APIs listed below,
95-
some of which are still in BETA stage. In the near future, we intend to
96-
centralize PyTorch's video decoding capabilities within the `torchcodec
97-
<https://github.com/pytorch/torchcodec>`_ project. We encourage you to try
98-
it out and share your feedback, as the torchvision video decoders will
99-
eventually be deprecated.
94+
DEPRECATED: All the video decoding and encoding capabilities of torchvision
95+
are deprecated from version 0.22 and will be removed in version 0.24. We
96+
recommend that you migrate to
97+
`TorchCodec <https://github.com/pytorch/torchcodec>`__, where we'll
98+
consolidate the future decoding/encoding capabilities of PyTorch
10099

101100
.. autosummary::
102101
:toctree: generated/

0 commit comments

Comments
 (0)