Skip to content

Commit 45b7b12

Browse files
authored
Merge branch 'master' into resize_doc
2 parents 6928b0d + 7d955df commit 45b7b12

Some content is hidden

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

57 files changed

+1024
-2025
lines changed

.circleci/config.yml

Lines changed: 140 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,11 @@ workflows:
954954
name: binary_linux_wheel_py3.6_rocm4.0.1
955955
python_version: '3.6'
956956
wheel_docker_image: pytorch/manylinux-rocm:4.0.1
957+
- binary_linux_wheel:
958+
cu_version: rocm4.1
959+
name: binary_linux_wheel_py3.6_rocm4.1
960+
python_version: '3.6'
961+
wheel_docker_image: pytorch/manylinux-rocm:4.1
957962
- binary_linux_wheel:
958963
conda_docker_image: pytorch/conda-builder:cpu
959964
cu_version: cpu
@@ -983,6 +988,11 @@ workflows:
983988
name: binary_linux_wheel_py3.7_rocm4.0.1
984989
python_version: '3.7'
985990
wheel_docker_image: pytorch/manylinux-rocm:4.0.1
991+
- binary_linux_wheel:
992+
cu_version: rocm4.1
993+
name: binary_linux_wheel_py3.7_rocm4.1
994+
python_version: '3.7'
995+
wheel_docker_image: pytorch/manylinux-rocm:4.1
986996
- binary_linux_wheel:
987997
conda_docker_image: pytorch/conda-builder:cpu
988998
cu_version: cpu
@@ -1012,6 +1022,11 @@ workflows:
10121022
name: binary_linux_wheel_py3.8_rocm4.0.1
10131023
python_version: '3.8'
10141024
wheel_docker_image: pytorch/manylinux-rocm:4.0.1
1025+
- binary_linux_wheel:
1026+
cu_version: rocm4.1
1027+
name: binary_linux_wheel_py3.8_rocm4.1
1028+
python_version: '3.8'
1029+
wheel_docker_image: pytorch/manylinux-rocm:4.1
10151030
- binary_linux_wheel:
10161031
conda_docker_image: pytorch/conda-builder:cpu
10171032
cu_version: cpu
@@ -1041,6 +1056,11 @@ workflows:
10411056
name: binary_linux_wheel_py3.9_rocm4.0.1
10421057
python_version: '3.9'
10431058
wheel_docker_image: pytorch/manylinux-rocm:4.0.1
1059+
- binary_linux_wheel:
1060+
cu_version: rocm4.1
1061+
name: binary_linux_wheel_py3.9_rocm4.1
1062+
python_version: '3.9'
1063+
wheel_docker_image: pytorch/manylinux-rocm:4.1
10441064
- binary_macos_wheel:
10451065
conda_docker_image: pytorch/conda-builder:cpu
10461066
cu_version: cpu
@@ -1478,13 +1498,11 @@ workflows:
14781498
- torch_onnx_test
14791499
- binary_ios_build:
14801500
build_environment: binary-libtorchvision_ops-ios-12.0.0-x86_64
1481-
context: org-member
14821501
ios_arch: x86_64
14831502
ios_platform: SIMULATOR
14841503
name: binary_libtorchvision_ops_ios_12.0.0_x86_64
14851504
- binary_ios_build:
14861505
build_environment: binary-libtorchvision_ops-ios-12.0.0-arm64
1487-
context: org-member
14881506
ios_arch: arm64
14891507
ios_platform: OS
14901508
name: binary_libtorchvision_ops_ios_12.0.0_arm64
@@ -1637,7 +1655,6 @@ workflows:
16371655
- torch_onnx_test
16381656
- binary_ios_build:
16391657
build_environment: nightly-binary-libtorchvision_ops-ios-12.0.0-x86_64
1640-
context: org-member
16411658
filters:
16421659
branches:
16431660
only:
@@ -1647,7 +1664,6 @@ workflows:
16471664
name: nightly_binary_libtorchvision_ops_ios_12.0.0_x86_64
16481665
- binary_ios_build:
16491666
build_environment: nightly-binary-libtorchvision_ops-ios-12.0.0-arm64
1650-
context: org-member
16511667
filters:
16521668
branches:
16531669
only:
@@ -1819,6 +1835,36 @@ workflows:
18191835
python_version: '3.6'
18201836
requires:
18211837
- nightly_binary_linux_wheel_py3.6_rocm4.0.1_upload
1838+
- binary_linux_wheel:
1839+
cu_version: rocm4.1
1840+
filters:
1841+
branches:
1842+
only: nightly
1843+
tags:
1844+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1845+
name: nightly_binary_linux_wheel_py3.6_rocm4.1
1846+
python_version: '3.6'
1847+
wheel_docker_image: pytorch/manylinux-rocm:4.1
1848+
- binary_wheel_upload:
1849+
context: org-member
1850+
filters:
1851+
branches:
1852+
only: nightly
1853+
tags:
1854+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1855+
name: nightly_binary_linux_wheel_py3.6_rocm4.1_upload
1856+
requires:
1857+
- nightly_binary_linux_wheel_py3.6_rocm4.1
1858+
subfolder: rocm4.1/
1859+
- smoke_test_linux_pip:
1860+
filters:
1861+
branches:
1862+
only:
1863+
- nightly
1864+
name: nightly_binary_linux_wheel_py3.6_rocm4.1_smoke_test_pip
1865+
python_version: '3.6'
1866+
requires:
1867+
- nightly_binary_linux_wheel_py3.6_rocm4.1_upload
18221868
- binary_linux_wheel:
18231869
conda_docker_image: pytorch/conda-builder:cpu
18241870
cu_version: cpu
@@ -1973,6 +2019,36 @@ workflows:
19732019
python_version: '3.7'
19742020
requires:
19752021
- nightly_binary_linux_wheel_py3.7_rocm4.0.1_upload
2022+
- binary_linux_wheel:
2023+
cu_version: rocm4.1
2024+
filters:
2025+
branches:
2026+
only: nightly
2027+
tags:
2028+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2029+
name: nightly_binary_linux_wheel_py3.7_rocm4.1
2030+
python_version: '3.7'
2031+
wheel_docker_image: pytorch/manylinux-rocm:4.1
2032+
- binary_wheel_upload:
2033+
context: org-member
2034+
filters:
2035+
branches:
2036+
only: nightly
2037+
tags:
2038+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2039+
name: nightly_binary_linux_wheel_py3.7_rocm4.1_upload
2040+
requires:
2041+
- nightly_binary_linux_wheel_py3.7_rocm4.1
2042+
subfolder: rocm4.1/
2043+
- smoke_test_linux_pip:
2044+
filters:
2045+
branches:
2046+
only:
2047+
- nightly
2048+
name: nightly_binary_linux_wheel_py3.7_rocm4.1_smoke_test_pip
2049+
python_version: '3.7'
2050+
requires:
2051+
- nightly_binary_linux_wheel_py3.7_rocm4.1_upload
19762052
- binary_linux_wheel:
19772053
conda_docker_image: pytorch/conda-builder:cpu
19782054
cu_version: cpu
@@ -2127,6 +2203,36 @@ workflows:
21272203
python_version: '3.8'
21282204
requires:
21292205
- nightly_binary_linux_wheel_py3.8_rocm4.0.1_upload
2206+
- binary_linux_wheel:
2207+
cu_version: rocm4.1
2208+
filters:
2209+
branches:
2210+
only: nightly
2211+
tags:
2212+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2213+
name: nightly_binary_linux_wheel_py3.8_rocm4.1
2214+
python_version: '3.8'
2215+
wheel_docker_image: pytorch/manylinux-rocm:4.1
2216+
- binary_wheel_upload:
2217+
context: org-member
2218+
filters:
2219+
branches:
2220+
only: nightly
2221+
tags:
2222+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2223+
name: nightly_binary_linux_wheel_py3.8_rocm4.1_upload
2224+
requires:
2225+
- nightly_binary_linux_wheel_py3.8_rocm4.1
2226+
subfolder: rocm4.1/
2227+
- smoke_test_linux_pip:
2228+
filters:
2229+
branches:
2230+
only:
2231+
- nightly
2232+
name: nightly_binary_linux_wheel_py3.8_rocm4.1_smoke_test_pip
2233+
python_version: '3.8'
2234+
requires:
2235+
- nightly_binary_linux_wheel_py3.8_rocm4.1_upload
21302236
- binary_linux_wheel:
21312237
conda_docker_image: pytorch/conda-builder:cpu
21322238
cu_version: cpu
@@ -2281,6 +2387,36 @@ workflows:
22812387
python_version: '3.9'
22822388
requires:
22832389
- nightly_binary_linux_wheel_py3.9_rocm4.0.1_upload
2390+
- binary_linux_wheel:
2391+
cu_version: rocm4.1
2392+
filters:
2393+
branches:
2394+
only: nightly
2395+
tags:
2396+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2397+
name: nightly_binary_linux_wheel_py3.9_rocm4.1
2398+
python_version: '3.9'
2399+
wheel_docker_image: pytorch/manylinux-rocm:4.1
2400+
- binary_wheel_upload:
2401+
context: org-member
2402+
filters:
2403+
branches:
2404+
only: nightly
2405+
tags:
2406+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2407+
name: nightly_binary_linux_wheel_py3.9_rocm4.1_upload
2408+
requires:
2409+
- nightly_binary_linux_wheel_py3.9_rocm4.1
2410+
subfolder: rocm4.1/
2411+
- smoke_test_linux_pip:
2412+
filters:
2413+
branches:
2414+
only:
2415+
- nightly
2416+
name: nightly_binary_linux_wheel_py3.9_rocm4.1_smoke_test_pip
2417+
python_version: '3.9'
2418+
requires:
2419+
- nightly_binary_linux_wheel_py3.9_rocm4.1_upload
22842420
- binary_macos_wheel:
22852421
conda_docker_image: pytorch/conda-builder:cpu
22862422
cu_version: cpu

.circleci/regenerate.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def build_workflows(prefix='', filter_branch=None, upload=False, indentation=6,
2929
for btype in ["wheel", "conda"]:
3030
for os_type in ["linux", "macos", "win"]:
3131
python_versions = PYTHON_VERSIONS
32-
cu_versions_dict = {"linux": ["cpu", "cu101", "cu102", "cu111", "rocm4.0.1"],
32+
cu_versions_dict = {"linux": ["cpu", "cu101", "cu102", "cu111", "rocm4.0.1", "rocm4.1"],
3333
"win": ["cpu", "cu101", "cu102", "cu111"],
3434
"macos": ["cpu"]}
3535
cu_versions = cu_versions_dict[os_type]
@@ -271,7 +271,6 @@ def ios_workflows(indentation=6, nightly=False):
271271
build_job_names.append(name)
272272
build_job = {
273273
'build_environment': f'{env_prefix}binary-libtorchvision_ops-ios-12.0.0-{arch}',
274-
'context': 'org-member',
275274
'ios_arch': arch,
276275
'ios_platform': platform,
277276
'name': name,

examples/python/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
[Examples of Tensor Images transformations](https://github.com/pytorch/vision/blob/master/examples/python/tensor_transforms.ipynb)
55
- [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/pytorch/vision/blob/master/examples/python/video_api.ipynb)
66
[Example of VideoAPI](https://github.com/pytorch/vision/blob/master/examples/python/video_api.ipynb)
7+
- [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/pytorch/vision/blob/master/examples/python/visualization_utils.ipynb)
8+
[Example of Visualization Utils](https://github.com/pytorch/vision/blob/master/examples/python/visualization_utils.ipynb)
79

810

911
Prior to v0.8.0, transforms in torchvision have traditionally been PIL-centric and presented multiple limitations due to
@@ -16,3 +18,5 @@ features:
1618
- read and decode data directly as torch tensor with torchscript support (for PNG and JPEG image formats)
1719

1820
Furthermore, previously we used to provide a very high-level API for video decoding which left little control to the user. We're now expanding that API (and replacing it in the future) with a lower-level API that allows the user a frame-based access to a video.
21+
22+
Torchvision also provides utilities to visualize results. You can make grid of images, plot bounding boxes as well as segmentation masks. Thse utilities work standalone as well as with torchvision models for detection and segmentation.

0 commit comments

Comments
 (0)