Skip to content

Commit c7d81bf

Browse files
author
Elias Ellison
committed
Merge branch 'master' of https://github.com/pytorch/pytorch into normal_fix
2 parents 68b5048 + ef3765b commit c7d81bf

1,381 files changed

Lines changed: 52611 additions & 19102 deletions

File tree

Some content is hidden

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

‎.circleci/cimodel/data/binary_build_data.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ def get_processor_arch_name(gpu_version):
5252
"3.7",
5353
],
5454
)),
55+
macos_arm64=([None], OrderedDict(
56+
wheel=[
57+
"3.8",
58+
],
59+
conda=[
60+
"3.8",
61+
],
62+
)),
5563
# Skip CUDA-9.2 builds on Windows
5664
windows=(
5765
[v for v in dimensions.GPU_VERSIONS if v not in ['cuda92'] + dimensions.ROCM_VERSION_LABELS],

‎.circleci/cimodel/data/binary_build_definitions.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ def gen_build_env_parms(self):
2828
def gen_docker_image(self):
2929
if self.gcc_config_variant == 'gcc5.4_cxx11-abi':
3030
return miniutils.quote("pytorch/pytorch-binary-docker-image-ubuntu16.04:latest")
31+
if self.pydistro == "conda":
32+
if self.gpu_version is None:
33+
return miniutils.quote("pytorch/conda-builder:cpu")
34+
else:
35+
return miniutils.quote(
36+
f"pytorch/conda-builder:{self.gpu_version}"
37+
)
3138

3239
docker_word_substitution = {
3340
"manywheel": "manylinux",
@@ -164,7 +171,7 @@ def gen_build_env_list(smoke):
164171
c.find_prop("gpu"),
165172
c.find_prop("package_format"),
166173
[c.find_prop("pyver")],
167-
c.find_prop("smoke"),
174+
c.find_prop("smoke") and not (c.find_prop("os_name") == "macos_arm64"), # don't test arm64
168175
c.find_prop("libtorch_variant"),
169176
c.find_prop("gcc_config_variant"),
170177
c.find_prop("libtorch_config_variant"),
@@ -216,7 +223,9 @@ def get_jobs(toplevel_key, smoke):
216223
configs = gen_build_env_list(smoke)
217224
phase = "build" if toplevel_key == "binarybuilds" else "test"
218225
for build_config in configs:
219-
jobs_list.append(build_config.gen_workflow_job(phase, nightly=True))
226+
# don't test for macos_arm64 as it's cross compiled
227+
if phase != "test" or build_config.os != "macos_arm64":
228+
jobs_list.append(build_config.gen_workflow_job(phase, nightly=True))
220229

221230
return jobs_list
222231

‎.circleci/cimodel/data/dimensions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
CUDA_VERSIONS = [
44
"101",
55
"102",
6-
"112",
6+
"111",
77
]
88

99
ROCM_VERSIONS = [

‎.circleci/cimodel/data/pytorch_build_data.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@
3232
]),
3333
]),
3434
("cuda", [
35-
("9.2", [
36-
("3.6", [
37-
X(True),
38-
("cuda_gcc_override", [
39-
("gcc5.4", [
40-
('build_only', [XImportant(True)]),
41-
]),
42-
]),
43-
])
44-
]),
4535
("10.1", [
4636
("3.6", [
4737
('build_only', [X(True)]),
@@ -57,9 +47,9 @@
5747
]),
5848
]),
5949
]),
60-
("11.2", [
50+
("11.1", [
6151
("3.8", [
62-
X(True),
52+
("shard_test", [X(True)]),
6353
("libtorch", [
6454
(True, [
6555
('build_only', [XImportant(True)]),
@@ -167,6 +157,7 @@ def child_constructor(self):
167157
next_nodes = {
168158
"asan": AsanConfigNode,
169159
"xla": XlaConfigNode,
160+
"mlc": MLCConfigNode,
170161
"vulkan": VulkanConfigNode,
171162
"parallel_tbb": ParallelTBBConfigNode,
172163
"parallel_native": ParallelNativeConfigNode,
@@ -203,6 +194,16 @@ def init2(self, node_name):
203194
def child_constructor(self):
204195
return ImportantConfigNode
205196

197+
class MLCConfigNode(TreeConfigNode):
198+
def modify_label(self, label):
199+
return "MLC=" + str(label)
200+
201+
def init2(self, node_name):
202+
self.props["is_mlc"] = node_name
203+
204+
def child_constructor(self):
205+
return ImportantConfigNode
206+
206207

207208
class AsanConfigNode(TreeConfigNode):
208209
def modify_label(self, label):

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,17 @@
66

77
# TODO: make this generated from a matrix rather than just a static list
88
IMAGE_NAMES = [
9-
"pytorch-linux-bionic-cuda11.2-cudnn8-py3.6-gcc9",
10-
"pytorch-linux-bionic-cuda11.2-cudnn8-py3.8-gcc9",
11-
"pytorch-linux-bionic-cuda11.0-cudnn8-py3.6-gcc9",
12-
"pytorch-linux-bionic-cuda11.0-cudnn8-py3.8-gcc9",
139
"pytorch-linux-bionic-cuda10.2-cudnn7-py3.8-gcc9",
1410
"pytorch-linux-bionic-py3.6-clang9",
1511
"pytorch-linux-bionic-cuda10.2-cudnn7-py3.6-clang9",
1612
"pytorch-linux-bionic-py3.8-gcc9",
13+
"pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc5.4",
14+
"pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7",
1715
"pytorch-linux-xenial-cuda10-cudnn7-py3-gcc7",
1816
"pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7",
1917
"pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7",
20-
"pytorch-linux-xenial-cuda11.0-cudnn8-py3-gcc7",
18+
"pytorch-linux-xenial-cuda11.1-cudnn8-py3-gcc7",
2119
"pytorch-linux-xenial-cuda11.2-cudnn8-py3-gcc7",
22-
"pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc5.4",
23-
"pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7",
2420
"pytorch-linux-xenial-py3-clang5-android-ndk-r19c",
2521
"pytorch-linux-xenial-py3-clang5-asan",
2622
"pytorch-linux-xenial-py3-clang7-onnx",

‎.circleci/cimodel/data/simple/ios_definitions.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,12 @@ def gen_tree(self):
6262

6363
WORKFLOW_DATA = [
6464
IOSJob(XCODE_VERSION, ArchVariant("x86_64"), is_org_member_context=False),
65+
IOSJob(XCODE_VERSION, ArchVariant("x86_64", "lite_interpreter"), is_org_member_context=False, extra_props={
66+
"lite_interpreter": miniutils.quote(str(int(True)))}),
6567
IOSJob(XCODE_VERSION, ArchVariant("arm64")),
6668
IOSJob(XCODE_VERSION, ArchVariant("arm64", "metal"), extra_props={"use_metal": miniutils.quote(str(int(True)))}),
69+
IOSJob(XCODE_VERSION, ArchVariant("arm64", "lite_interpreter"), extra_props={
70+
"lite_interpreter": miniutils.quote(str(int(True)))}),
6771
IOSJob(XCODE_VERSION, ArchVariant("arm64", "custom"), extra_props={"op_list": "mobilenetv2.yaml"}),
6872
]
6973

‎.circleci/cimodel/data/simple/macos_definitions.py‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
class MacOsJob:
2-
def __init__(self, os_version, is_test=False):
2+
def __init__(self, os_version, is_build=False, is_test=False, extra_props=tuple()):
3+
# extra_props is tuple type, because mutable data structures for argument defaults
4+
# is not recommended.
35
self.os_version = os_version
6+
self.is_build = is_build
47
self.is_test = is_test
8+
self.extra_props = dict(extra_props)
59

610
def gen_tree(self):
711
non_phase_parts = ["pytorch", "macos", self.os_version, "py3"]
812

9-
phase_name = "test" if self.is_test else "build"
13+
extra_name_list = [name for name, exist in self.extra_props.items() if exist]
14+
full_job_name_list = non_phase_parts + extra_name_list + [
15+
'build' if self.is_build else None,
16+
'test' if self.is_test else None,
17+
]
1018

11-
full_job_name = "_".join(non_phase_parts + [phase_name])
19+
full_job_name = "_".join(list(filter(None, full_job_name_list)))
1220

1321
test_build_dependency = "_".join(non_phase_parts + ["build"])
1422
extra_dependencies = [test_build_dependency] if self.is_test else []
@@ -21,7 +29,23 @@ def gen_tree(self):
2129
return [{full_job_name: props_dict}]
2230

2331

24-
WORKFLOW_DATA = [MacOsJob("10_13"), MacOsJob("10_13", True)]
32+
WORKFLOW_DATA = [
33+
MacOsJob("10_15", is_build=True),
34+
MacOsJob("10_13", is_build=True),
35+
MacOsJob(
36+
"10_13",
37+
is_build=False,
38+
is_test=True,
39+
),
40+
MacOsJob(
41+
"10_13",
42+
is_build=True,
43+
is_test=True,
44+
extra_props=tuple({
45+
"lite_interpreter": True
46+
}.items()),
47+
)
48+
]
2549

2650

2751
def get_workflow_jobs():

‎.circleci/cimodel/data/simple/mobile_definitions.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ def gen_tree(self):
6565
["custom", "build", "dynamic"]
6666
),
6767

68+
MobileJob(
69+
DOCKER_IMAGE_NDK,
70+
[DOCKER_REQUIREMENT_NDK],
71+
["custom", "build", "static"]
72+
),
73+
6874
# Use LLVM-DEV toolchain in android-ndk-r19c docker image
6975
# Most of this CI is already covered by "mobile-custom-build-dynamic" job
7076
MobileJob(

‎.circleci/cimodel/data/windows_build_definitions.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ def TruePred(_):
132132
WindowsJob(None, _VC2019, CudaVersion(10, 1)),
133133
WindowsJob(1, _VC2019, CudaVersion(10, 1)),
134134
WindowsJob(2, _VC2019, CudaVersion(10, 1)),
135-
# VS2019 CUDA-11.2
136-
WindowsJob(None, _VC2019, CudaVersion(11, 2)),
137-
WindowsJob(1, _VC2019, CudaVersion(11, 2), master_only_pred=TruePred),
138-
WindowsJob(2, _VC2019, CudaVersion(11, 2), master_only_pred=TruePred),
135+
# VS2019 CUDA-11.1
136+
WindowsJob(None, _VC2019, CudaVersion(11, 1)),
137+
WindowsJob(1, _VC2019, CudaVersion(11, 1), master_only_pred=TruePred),
138+
WindowsJob(2, _VC2019, CudaVersion(11, 1), master_only_pred=TruePred),
139139
# VS2019 CPU-only
140140
WindowsJob(None, _VC2019, None),
141141
WindowsJob(1, _VC2019, None, master_only_pred=TruePred),

0 commit comments

Comments
 (0)