Skip to content

Commit 10fe454

Browse files
committed
Merge remote-tracking branch 'upstream/master' into complex-lusolve
2 parents b7190dd + 2907447 commit 10fe454

File tree

599 files changed

+31288
-9199
lines changed

Some content is hidden

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

599 files changed

+31288
-9199
lines changed

.circleci/cimodel/data/binary_build_data.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,26 @@ def get_processor_arch_name(gpu_version):
3636
"3.6m",
3737
"3.7m",
3838
"3.8m",
39+
"3.9m"
3940
],
4041
conda=dimensions.STANDARD_PYTHON_VERSIONS,
4142
libtorch=[
4243
"3.7m",
4344
],
4445
)
4546

47+
# TODO: There's an issue with current Python 3.9 builds that only occurs during
48+
# windows builds, let's just not build 3.9 for windows and figure out how
49+
# to resolve afterwards
50+
PYTHON_VERSIONS_NO_39 = [
51+
v for v in dimensions.STANDARD_PYTHON_VERSIONS if v not in ['3.9']
52+
]
53+
4654
CONFIG_TREE_DATA = OrderedDict(
4755
linux=(dimensions.GPU_VERSIONS, LINUX_PACKAGE_VARIANTS),
4856
macos=([None], OrderedDict(
49-
wheel=dimensions.STANDARD_PYTHON_VERSIONS,
50-
conda=dimensions.STANDARD_PYTHON_VERSIONS,
57+
wheel=PYTHON_VERSIONS_NO_39,
58+
conda=PYTHON_VERSIONS_NO_39,
5159
libtorch=[
5260
"3.7",
5361
],
@@ -56,8 +64,8 @@ def get_processor_arch_name(gpu_version):
5664
windows=(
5765
[v for v in dimensions.GPU_VERSIONS if v not in ['cuda92'] + dimensions.ROCM_VERSION_LABELS],
5866
OrderedDict(
59-
wheel=dimensions.STANDARD_PYTHON_VERSIONS,
60-
conda=dimensions.STANDARD_PYTHON_VERSIONS,
67+
wheel=PYTHON_VERSIONS_NO_39,
68+
conda=PYTHON_VERSIONS_NO_39,
6169
libtorch=[
6270
"3.7",
6371
],

.circleci/cimodel/data/dimensions.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
]
99

1010
ROCM_VERSIONS = [
11-
"3.7",
1211
"3.8",
12+
"3.9",
1313
]
1414

1515
ROCM_VERSION_LABELS = ["rocm" + v for v in ROCM_VERSIONS]
@@ -20,4 +20,5 @@
2020
"3.6",
2121
"3.7",
2222
"3.8",
23+
"3.9"
2324
]

.circleci/cimodel/data/simple/docker_definitions.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"pytorch-linux-bionic-py3.6-clang9",
1515
"pytorch-linux-bionic-cuda10.2-cudnn7-py3.6-clang9",
1616
"pytorch-linux-bionic-py3.8-gcc9",
17-
"pytorch-linux-bionic-rocm3.5.1-py3.6",
1817
"pytorch-linux-xenial-cuda10-cudnn7-py3-gcc7",
1918
"pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7",
2019
"pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7",
@@ -27,12 +26,12 @@
2726
"pytorch-linux-xenial-py3-clang7-onnx",
2827
"pytorch-linux-xenial-py3.8",
2928
"pytorch-linux-xenial-py3.6-clang7",
30-
"pytorch-linux-xenial-py3.6-gcc4.8",
3129
"pytorch-linux-xenial-py3.6-gcc5.4", # this one is used in doc builds
3230
"pytorch-linux-xenial-py3.6-gcc7.2",
3331
"pytorch-linux-xenial-py3.6-gcc7",
3432
"pytorch-linux-bionic-rocm3.7-py3.6",
3533
"pytorch-linux-bionic-rocm3.8-py3.6",
34+
"pytorch-linux-bionic-rocm3.9-py3.6",
3635
]
3736

3837

@@ -43,7 +42,7 @@ def get_workflow_jobs():
4342
parameters = OrderedDict({
4443
"name": quote(f"docker-{image_name}"),
4544
"image_name": quote(image_name),
46-
})
45+
})
4746
if image_name == "pytorch-linux-xenial-py3.6-gcc5.4":
4847
# pushing documentation on tags requires CircleCI to also
4948
# build all the dependencies on tags, including this docker image

0 commit comments

Comments
 (0)