Skip to content

Commit 3f23938

Browse files
committed
Merge branch 'master' of https://github.com/pytorch/vision into adjust_hue_tensor
2 parents 71185bd + 195c41e commit 3f23938

File tree

3 files changed

+5
-226
lines changed

3 files changed

+5
-226
lines changed

.circleci/config.yml

Lines changed: 0 additions & 225 deletions
Original file line numberDiff line numberDiff line change
@@ -639,15 +639,6 @@ workflows:
639639
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
640640
name: binary_win_wheel_py3.6_cpu
641641
python_version: '3.6'
642-
- binary_win_wheel:
643-
cu_version: cu92
644-
filters:
645-
branches:
646-
only: master
647-
tags:
648-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
649-
name: binary_win_wheel_py3.6_cu92
650-
python_version: '3.6'
651642
- binary_win_wheel:
652643
cu_version: cu101
653644
filters:
@@ -675,15 +666,6 @@ workflows:
675666
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
676667
name: binary_win_wheel_py3.7_cpu
677668
python_version: '3.7'
678-
- binary_win_wheel:
679-
cu_version: cu92
680-
filters:
681-
branches:
682-
only: master
683-
tags:
684-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
685-
name: binary_win_wheel_py3.7_cu92
686-
python_version: '3.7'
687669
- binary_win_wheel:
688670
cu_version: cu101
689671
filters:
@@ -706,15 +688,6 @@ workflows:
706688
cu_version: cpu
707689
name: binary_win_wheel_py3.8_cpu
708690
python_version: '3.8'
709-
- binary_win_wheel:
710-
cu_version: cu92
711-
filters:
712-
branches:
713-
only: master
714-
tags:
715-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
716-
name: binary_win_wheel_py3.8_cu92
717-
python_version: '3.8'
718691
- binary_win_wheel:
719692
cu_version: cu101
720693
filters:
@@ -812,15 +785,6 @@ workflows:
812785
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
813786
name: binary_win_conda_py3.6_cpu
814787
python_version: '3.6'
815-
- binary_win_conda:
816-
cu_version: cu92
817-
filters:
818-
branches:
819-
only: master
820-
tags:
821-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
822-
name: binary_win_conda_py3.6_cu92
823-
python_version: '3.6'
824788
- binary_win_conda:
825789
cu_version: cu101
826790
filters:
@@ -848,15 +812,6 @@ workflows:
848812
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
849813
name: binary_win_conda_py3.7_cpu
850814
python_version: '3.7'
851-
- binary_win_conda:
852-
cu_version: cu92
853-
filters:
854-
branches:
855-
only: master
856-
tags:
857-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
858-
name: binary_win_conda_py3.7_cu92
859-
python_version: '3.7'
860815
- binary_win_conda:
861816
cu_version: cu101
862817
filters:
@@ -879,15 +834,6 @@ workflows:
879834
cu_version: cpu
880835
name: binary_win_conda_py3.8_cpu
881836
python_version: '3.8'
882-
- binary_win_conda:
883-
cu_version: cu92
884-
filters:
885-
branches:
886-
only: master
887-
tags:
888-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
889-
name: binary_win_conda_py3.8_cu92
890-
python_version: '3.8'
891837
- binary_win_conda:
892838
cu_version: cu101
893839
filters:
@@ -1433,35 +1379,6 @@ workflows:
14331379
python_version: '3.6'
14341380
requires:
14351381
- nightly_binary_win_wheel_py3.6_cpu_upload
1436-
- binary_win_wheel:
1437-
cu_version: cu92
1438-
filters:
1439-
branches:
1440-
only: nightly
1441-
tags:
1442-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1443-
name: nightly_binary_win_wheel_py3.6_cu92
1444-
python_version: '3.6'
1445-
- binary_wheel_upload:
1446-
context: org-member
1447-
filters:
1448-
branches:
1449-
only: nightly
1450-
tags:
1451-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1452-
name: nightly_binary_win_wheel_py3.6_cu92_upload
1453-
requires:
1454-
- nightly_binary_win_wheel_py3.6_cu92
1455-
subfolder: cu92/
1456-
- smoke_test_win_pip:
1457-
filters:
1458-
branches:
1459-
only:
1460-
- nightly
1461-
name: nightly_binary_win_wheel_py3.6_cu92_smoke_test_pip
1462-
python_version: '3.6'
1463-
requires:
1464-
- nightly_binary_win_wheel_py3.6_cu92_upload
14651382
- binary_win_wheel:
14661383
cu_version: cu101
14671384
filters:
@@ -1549,35 +1466,6 @@ workflows:
15491466
python_version: '3.7'
15501467
requires:
15511468
- nightly_binary_win_wheel_py3.7_cpu_upload
1552-
- binary_win_wheel:
1553-
cu_version: cu92
1554-
filters:
1555-
branches:
1556-
only: nightly
1557-
tags:
1558-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1559-
name: nightly_binary_win_wheel_py3.7_cu92
1560-
python_version: '3.7'
1561-
- binary_wheel_upload:
1562-
context: org-member
1563-
filters:
1564-
branches:
1565-
only: nightly
1566-
tags:
1567-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1568-
name: nightly_binary_win_wheel_py3.7_cu92_upload
1569-
requires:
1570-
- nightly_binary_win_wheel_py3.7_cu92
1571-
subfolder: cu92/
1572-
- smoke_test_win_pip:
1573-
filters:
1574-
branches:
1575-
only:
1576-
- nightly
1577-
name: nightly_binary_win_wheel_py3.7_cu92_smoke_test_pip
1578-
python_version: '3.7'
1579-
requires:
1580-
- nightly_binary_win_wheel_py3.7_cu92_upload
15811469
- binary_win_wheel:
15821470
cu_version: cu101
15831471
filters:
@@ -1665,35 +1553,6 @@ workflows:
16651553
python_version: '3.8'
16661554
requires:
16671555
- nightly_binary_win_wheel_py3.8_cpu_upload
1668-
- binary_win_wheel:
1669-
cu_version: cu92
1670-
filters:
1671-
branches:
1672-
only: nightly
1673-
tags:
1674-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1675-
name: nightly_binary_win_wheel_py3.8_cu92
1676-
python_version: '3.8'
1677-
- binary_wheel_upload:
1678-
context: org-member
1679-
filters:
1680-
branches:
1681-
only: nightly
1682-
tags:
1683-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1684-
name: nightly_binary_win_wheel_py3.8_cu92_upload
1685-
requires:
1686-
- nightly_binary_win_wheel_py3.8_cu92
1687-
subfolder: cu92/
1688-
- smoke_test_win_pip:
1689-
filters:
1690-
branches:
1691-
only:
1692-
- nightly
1693-
name: nightly_binary_win_wheel_py3.8_cu92_smoke_test_pip
1694-
python_version: '3.8'
1695-
requires:
1696-
- nightly_binary_win_wheel_py3.8_cu92_upload
16971556
- binary_win_wheel:
16981557
cu_version: cu101
16991558
filters:
@@ -2188,34 +2047,6 @@ workflows:
21882047
python_version: '3.6'
21892048
requires:
21902049
- nightly_binary_win_conda_py3.6_cpu_upload
2191-
- binary_win_conda:
2192-
cu_version: cu92
2193-
filters:
2194-
branches:
2195-
only: nightly
2196-
tags:
2197-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2198-
name: nightly_binary_win_conda_py3.6_cu92
2199-
python_version: '3.6'
2200-
- binary_conda_upload:
2201-
context: org-member
2202-
filters:
2203-
branches:
2204-
only: nightly
2205-
tags:
2206-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2207-
name: nightly_binary_win_conda_py3.6_cu92_upload
2208-
requires:
2209-
- nightly_binary_win_conda_py3.6_cu92
2210-
- smoke_test_win_conda:
2211-
filters:
2212-
branches:
2213-
only:
2214-
- nightly
2215-
name: nightly_binary_win_conda_py3.6_cu92_smoke_test_conda
2216-
python_version: '3.6'
2217-
requires:
2218-
- nightly_binary_win_conda_py3.6_cu92_upload
22192050
- binary_win_conda:
22202051
cu_version: cu101
22212052
filters:
@@ -2300,34 +2131,6 @@ workflows:
23002131
python_version: '3.7'
23012132
requires:
23022133
- nightly_binary_win_conda_py3.7_cpu_upload
2303-
- binary_win_conda:
2304-
cu_version: cu92
2305-
filters:
2306-
branches:
2307-
only: nightly
2308-
tags:
2309-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2310-
name: nightly_binary_win_conda_py3.7_cu92
2311-
python_version: '3.7'
2312-
- binary_conda_upload:
2313-
context: org-member
2314-
filters:
2315-
branches:
2316-
only: nightly
2317-
tags:
2318-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2319-
name: nightly_binary_win_conda_py3.7_cu92_upload
2320-
requires:
2321-
- nightly_binary_win_conda_py3.7_cu92
2322-
- smoke_test_win_conda:
2323-
filters:
2324-
branches:
2325-
only:
2326-
- nightly
2327-
name: nightly_binary_win_conda_py3.7_cu92_smoke_test_conda
2328-
python_version: '3.7'
2329-
requires:
2330-
- nightly_binary_win_conda_py3.7_cu92_upload
23312134
- binary_win_conda:
23322135
cu_version: cu101
23332136
filters:
@@ -2412,34 +2215,6 @@ workflows:
24122215
python_version: '3.8'
24132216
requires:
24142217
- nightly_binary_win_conda_py3.8_cpu_upload
2415-
- binary_win_conda:
2416-
cu_version: cu92
2417-
filters:
2418-
branches:
2419-
only: nightly
2420-
tags:
2421-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2422-
name: nightly_binary_win_conda_py3.8_cu92
2423-
python_version: '3.8'
2424-
- binary_conda_upload:
2425-
context: org-member
2426-
filters:
2427-
branches:
2428-
only: nightly
2429-
tags:
2430-
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
2431-
name: nightly_binary_win_conda_py3.8_cu92_upload
2432-
requires:
2433-
- nightly_binary_win_conda_py3.8_cu92
2434-
- smoke_test_win_conda:
2435-
filters:
2436-
branches:
2437-
only:
2438-
- nightly
2439-
name: nightly_binary_win_conda_py3.8_cu92_smoke_test_conda
2440-
python_version: '3.8'
2441-
requires:
2442-
- nightly_binary_win_conda_py3.8_cu92_upload
24432218
- binary_win_conda:
24442219
cu_version: cu101
24452220
filters:

.circleci/regenerate.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ def build_workflows(prefix='', filter_branch=None, upload=False, indentation=6,
2727
for btype in ["wheel", "conda"]:
2828
for os_type in ["linux", "macos", "win"]:
2929
python_versions = PYTHON_VERSIONS
30-
cu_versions = (["cpu", "cu92", "cu101", "cu102"] if os_type == "linux" or os_type == "win" else ["cpu"])
30+
cu_versions_dict = {"linux": ["cpu", "cu92", "cu101", "cu102"],
31+
"win": ["cpu", "cu101", "cu102"],
32+
"macos": ["cpu"]}
33+
cu_versions = cu_versions_dict[os_type]
3134
for python_version in python_versions:
3235
for cu_version in cu_versions:
3336
for unicode in ([False, True] if btype == "wheel" and python_version == "2.7" else [False]):

.circleci/unittest/windows/scripts/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ dependencies:
1414
- pillow>=4.1.1
1515
- scipy==1.4.1
1616
- av
17+
- dataclasses

0 commit comments

Comments
 (0)