Skip to content

Commit be86a7b

Browse files
alperenunlualperenunlu
authored
Merge branch 'main' into main
2 parents 14a8fbe + b818d32 commit be86a7b

File tree

228 files changed

+5833
-2679
lines changed

Some content is hidden

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

228 files changed

+5833
-2679
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ d367a01a18a3ae6bee13d8be3b63fd6a581ea46f
1111
a335d916db0694770e8152f41e19195de3134523
1212
# Renaming: `BoundingBox` -> `BoundingBoxes` (#7778)
1313
332bff937c6711666191880fab57fa2f23ae772e
14+
# Upgrade type hint and others to Python 3.9 (#8814)
15+
a095de183d3811d79ed0db2715e7a1c3162fa19d

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
gpu-arch-type: cpu
1919
- runner: linux.g5.4xlarge.nvidia.gpu
2020
gpu-arch-type: cuda
21-
gpu-arch-version: "11.8"
21+
gpu-arch-version: "12.6"
2222
fail-fast: false
2323
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
2424
permissions:
@@ -66,7 +66,7 @@ jobs:
6666
gpu-arch-type: cpu
6767
- runner: windows.g5.4xlarge.nvidia.gpu
6868
gpu-arch-type: cuda
69-
gpu-arch-version: "11.8"
69+
gpu-arch-version: "12.6"
7070
fail-fast: false
7171
uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
7272
with:

‎.github/workflows/build-wheels-aarch64-linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
os: linux-aarch64
2626
test-infra-repository: pytorch/test-infra
2727
test-infra-ref: main
28-
with-cuda: disable
28+
with-cuda: enable
2929
build:
3030
needs: generate-matrix
3131
strategy:

‎.github/workflows/build_wheel_windows_arm64.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Build Windows ARM64 Wheels
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- .github/workflows/build_wheel_windows_arm64.yml
7+
push:
8+
branches:
9+
- nightly
10+
- release/*
11+
tags:
12+
# NOTE: Binary build pipelines should only get triggered on release candidate builds
13+
# Release candidate tags look like: v1.11.0-rc1
14+
- v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
15+
workflow_dispatch:
16+
17+
permissions:
18+
id-token: write
19+
contents: read
20+
21+
jobs:
22+
generate-matrix:
23+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
24+
with:
25+
package-type: wheel
26+
os: windows-arm64
27+
test-infra-repository: pytorch/test-infra
28+
test-infra-ref: main
29+
with-cuda: disable
30+
31+
build:
32+
needs: generate-matrix
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
include:
37+
- repository: pytorch/vision
38+
smoke-test-script: test/smoke_test.py
39+
pre-script: packaging/pre_build_script_arm64.sh
40+
package-name: torchvision
41+
architecture: "arm64"
42+
name: ${{ matrix.repository }}
43+
uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main
44+
with:
45+
repository: ${{ matrix.repository }}
46+
ref: ""
47+
test-infra-repository: pytorch/test-infra
48+
test-infra-ref: main
49+
pre-script: ${{ matrix.pre-script }}
50+
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
51+
package-name: ${{ matrix.package-name }}
52+
smoke-test-script: ${{ matrix.smoke-test-script }}
53+
trigger-event: ${{ github.event_name }}
54+
architecture: ${{ matrix.architecture }}

‎.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/prototype-tests-linux-gpu.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- python-version: "3.9"
2222
runner: linux.g5.4xlarge.nvidia.gpu
2323
gpu-arch-type: cuda
24-
gpu-arch-version: "11.8"
24+
gpu-arch-version: "12.6"
2525
fail-fast: false
2626
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
2727
permissions:

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- python-version: 3.9
2525
runner: linux.g5.4xlarge.nvidia.gpu
2626
gpu-arch-type: cuda
27-
gpu-arch-version: "11.8"
27+
gpu-arch-version: "12.6"
2828
fail-fast: false
2929
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
3030
permissions:

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ instructions](https://pytorch.org/get-started/locally/). Note that the official
3838
instructions may ask you to install torchvision itself. If you are doing development
3939
on torchvision, you should not install prebuilt torchvision packages.
4040

41-
**Optionally**, install `libpng` and `libjpeg-turbo` if you want to enable
41+
**Optionally**, install `libpng`, `libjpeg-turbo` and `libwebp` if you want to enable
4242
support for
43-
native encoding / decoding of PNG and JPEG formats in
43+
native encoding / decoding of PNG, JPEG and WebP formats in
4444
[torchvision.io](https://pytorch.org/vision/stable/io.html#image):
4545

4646
```bash
47-
conda install libpng libjpeg-turbo -c pytorch
47+
conda install libpng libjpeg-turbo libwebp -c pytorch
4848
```
4949

5050
Note: you can use the `TORCHVISION_INCLUDE` and `TORCHVISION_LIBRARY`

‎docs/source/conf.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ def __init__(self, src_dir):
8787
"plot_transforms_illustrations.py",
8888
"plot_transforms_e2e.py",
8989
"plot_cutmix_mixup.py",
90+
"plot_rotated_box_transforms.py",
9091
"plot_custom_transforms.py",
9192
"plot_tv_tensors.py",
9293
"plot_custom_tv_tensors.py",

‎docs/source/io.rst‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ powerful, e.g. if you want to encode/decode JPEGs on CUDA.
4141

4242
decode_image
4343
decode_jpeg
44-
encode_png
44+
decode_png
4545
decode_webp
4646
decode_avif
4747
decode_heic
@@ -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)