Skip to content

Commit 622d4a6

Browse files
samestepsamestep
committed
Merge branch 'viable/strict' into mypy-strict-ini-consolidate
2 parents 365ba06 + 94cc681 commit 622d4a6

587 files changed

Lines changed: 15493 additions & 11495 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/docker/build.sh‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ case "$image" in
8888
DB=yes
8989
VISION=yes
9090
KATEX=yes
91+
BREAKPAD=yes
9192
;;
9293
pytorch-linux-xenial-py3.6-gcc7.2)
9394
ANACONDA_PYTHON_VERSION=3.6
@@ -100,6 +101,7 @@ case "$image" in
100101
PROTOBUF=yes
101102
DB=yes
102103
VISION=yes
104+
BREAKPAD=yes
103105
;;
104106
pytorch-linux-xenial-cuda10-cudnn7-py3-gcc7)
105107
CUDA_VERSION=10.0
@@ -109,6 +111,7 @@ case "$image" in
109111
PROTOBUF=yes
110112
DB=yes
111113
VISION=yes
114+
BREAKPAD=yes
112115
;;
113116
pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7)
114117
CUDA_VERSION=10.1
@@ -119,6 +122,7 @@ case "$image" in
119122
DB=yes
120123
VISION=yes
121124
KATEX=yes
125+
BREAKPAD=yes
122126
;;
123127
pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7)
124128
CUDA_VERSION=10.2
@@ -129,6 +133,7 @@ case "$image" in
129133
DB=yes
130134
VISION=yes
131135
KATEX=yes
136+
BREAKPAD=yes
132137
;;
133138
pytorch-linux-xenial-cuda11.1-cudnn8-py3-gcc7)
134139
CUDA_VERSION=11.1
@@ -139,6 +144,7 @@ case "$image" in
139144
DB=yes
140145
VISION=yes
141146
KATEX=yes
147+
BREAKPAD=yes
142148
;;
143149
pytorch-linux-xenial-cuda11.3-cudnn8-py3-gcc7)
144150
CUDA_VERSION=11.3.0 # Deviating from major.minor to conform to nvidia's Docker image names
@@ -149,20 +155,23 @@ case "$image" in
149155
DB=yes
150156
VISION=yes
151157
KATEX=yes
158+
BREAKPAD=yes
152159
;;
153160
pytorch-linux-xenial-py3-clang5-asan)
154161
ANACONDA_PYTHON_VERSION=3.6
155162
CLANG_VERSION=5.0
156163
PROTOBUF=yes
157164
DB=yes
158165
VISION=yes
166+
BREAKPAD=yes
159167
;;
160168
pytorch-linux-xenial-py3-clang7-onnx)
161169
ANACONDA_PYTHON_VERSION=3.6
162170
CLANG_VERSION=7
163171
PROTOBUF=yes
164172
DB=yes
165173
VISION=yes
174+
BREAKPAD=yes
166175
;;
167176
pytorch-linux-xenial-py3-clang5-android-ndk-r19c)
168177
ANACONDA_PYTHON_VERSION=3.6
@@ -181,13 +190,15 @@ case "$image" in
181190
PROTOBUF=yes
182191
DB=yes
183192
VISION=yes
193+
BREAKPAD=yes
184194
;;
185195
pytorch-linux-bionic-py3.6-clang9)
186196
ANACONDA_PYTHON_VERSION=3.6
187197
CLANG_VERSION=9
188198
PROTOBUF=yes
189199
DB=yes
190200
VISION=yes
201+
BREAKPAD=yes
191202
VULKAN_SDK_VERSION=1.2.162.1
192203
SWIFTSHADER=yes
193204
;;
@@ -198,6 +209,7 @@ case "$image" in
198209
DB=yes
199210
VISION=yes
200211
BREAKPAD=yes
212+
BREAKPAD=yes
201213
;;
202214
pytorch-linux-bionic-cuda10.2-cudnn7-py3.6-clang9)
203215
CUDA_VERSION=10.2
@@ -207,6 +219,7 @@ case "$image" in
207219
PROTOBUF=yes
208220
DB=yes
209221
VISION=yes
222+
BREAKPAD=yes
210223
;;
211224
pytorch-linux-bionic-cuda10.2-cudnn7-py3.8-gcc9)
212225
CUDA_VERSION=10.2
@@ -216,6 +229,7 @@ case "$image" in
216229
PROTOBUF=yes
217230
DB=yes
218231
VISION=yes
232+
BREAKPAD=yes
219233
;;
220234
pytorch-linux-bionic-cuda10.2-cudnn7-py3.9-gcc7)
221235
CUDA_VERSION=10.2
@@ -225,6 +239,7 @@ case "$image" in
225239
PROTOBUF=yes
226240
DB=yes
227241
VISION=yes
242+
BREAKPAD=yes
228243
;;
229244
pytorch-linux-bionic-cuda11.0-cudnn8-py3.6-gcc9)
230245
CUDA_VERSION=11.0
@@ -234,6 +249,7 @@ case "$image" in
234249
PROTOBUF=yes
235250
DB=yes
236251
VISION=yes
252+
BREAKPAD=yes
237253
ROCM_VERSION=3.9
238254
;;
239255
pytorch-linux-bionic-rocm4.0.1-py3.6)
@@ -242,6 +258,7 @@ case "$image" in
242258
PROTOBUF=yes
243259
DB=yes
244260
VISION=yes
261+
BREAKPAD=yes
245262
ROCM_VERSION=4.0.1
246263
;;
247264
pytorch-linux-bionic-rocm4.1-py3.6)
@@ -250,6 +267,7 @@ case "$image" in
250267
PROTOBUF=yes
251268
DB=yes
252269
VISION=yes
270+
BREAKPAD=yes
253271
ROCM_VERSION=4.1
254272
;;
255273
pytorch-linux-bionic-rocm4.2-py3.6)
@@ -258,13 +276,15 @@ case "$image" in
258276
PROTOBUF=yes
259277
DB=yes
260278
VISION=yes
279+
BREAKPAD=yes
261280
ROCM_VERSION=4.2
262281
;;
263282
*)
264283
# Catch-all for builds that are not hardcoded.
265284
PROTOBUF=yes
266285
DB=yes
267286
VISION=yes
287+
BREAKPAD=yes
268288
echo "image '$image' did not match an existing build configuration"
269289
if [[ "$image" == *py* ]]; then
270290
extract_version_from_image_name py ANACONDA_PYTHON_VERSION

‎.circleci/docker/common/install_breakpad.sh‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,24 @@
22

33
set -ex
44

5-
git clone https://github.com/google/breakpad.git
6-
cd breakpad
5+
git clone https://github.com/driazati/breakpad.git
6+
pushd breakpad
7+
8+
# breakpad has no actual releases, so this is pinned to the top commit from
9+
# main when this was forked (including the one patch commit). This uses a fork
10+
# of the breakpad mainline that automatically daisy-chains out to any previously
11+
# installed signal handlers (instead of overwriting them).
12+
git checkout 5485e473ed46d065e05489e50dfc59d90dfd7e22
713

814
git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss
15+
pushd src/third_party/lss
16+
# same as with breakpad, there are no real releases for this repo so use a
17+
# commit as the pin
18+
git checkout e1e7b0ad8ee99a875b272c8e33e308472e897660
19+
popd
20+
921
./configure
1022
make
1123
make install
12-
cd ..
24+
popd
1325
rm -rf breakpad

‎.circleci/scripts/binary_populate_env.sh‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,18 @@ if [[ -z "$DOCKER_IMAGE" ]]; then
6868
fi
6969
fi
7070

71+
USE_GOLD_LINKER="OFF"
72+
# GOLD linker can not be used if CUPTI is statically linked into PyTorch, see https://github.com/pytorch/pytorch/issues/57744
73+
if [[ ${DESIRED_CUDA} == "cpu" ]]; then
74+
USE_GOLD_LINKER="ON"
75+
fi
76+
7177
# Default to nightly, since that's where this normally uploads to
7278
PIP_UPLOAD_FOLDER='nightly/'
7379
# We put this here so that OVERRIDE_PACKAGE_VERSION below can read from it
7480
export DATE="$(date -u +%Y%m%d)"
7581
#TODO: We should be pulling semver version from the base version.txt
76-
BASE_BUILD_VERSION="1.9.0.dev$DATE"
82+
BASE_BUILD_VERSION="1.10.0.dev$DATE"
7783
# Change BASE_BUILD_VERSION to git tag when on a git tag
7884
# Use 'git -C' to make doubly sure we're in the correct directory for checking
7985
# the git tag
@@ -136,7 +142,7 @@ if [[ "${BUILD_FOR_SYSTEM:-}" == "windows" ]]; then
136142
fi
137143
138144
export DATE="$DATE"
139-
export NIGHTLIES_DATE_PREAMBLE=1.9.0.dev
145+
export NIGHTLIES_DATE_PREAMBLE=1.10.0.dev
140146
export PYTORCH_BUILD_VERSION="$PYTORCH_BUILD_VERSION"
141147
export PYTORCH_BUILD_NUMBER="$PYTORCH_BUILD_NUMBER"
142148
export OVERRIDE_PACKAGE_VERSION="$PYTORCH_BUILD_VERSION"
@@ -169,7 +175,8 @@ export CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-}"
169175
export CIRCLE_BRANCH="$CIRCLE_BRANCH"
170176
export CIRCLE_WORKFLOW_ID="$CIRCLE_WORKFLOW_ID"
171177
172-
export USE_GOLD_LINKER=1
178+
export USE_GOLD_LINKER="${USE_GOLD_LINKER}"
179+
export USE_GLOO_WITH_OPENSSL=1
173180
# =================== The above code will be executed inside Docker container ===================
174181
EOL
175182

‎.circleci/scripts/vs_install.ps1‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ $VS_INSTALL_ARGS = @("--nocache","--quiet","--wait", "--add Microsoft.VisualStud
1414
"--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
1515
"--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81")
1616

17+
if (${env:INSTALL_WINDOWS_SDK} -eq "1") {
18+
$VS_INSTALL_ARGS += "--add Microsoft.VisualStudio.Component.Windows10SDK.19041"
19+
}
20+
1721
curl.exe --retry 3 -kL $VS_DOWNLOAD_LINK --output vs_installer.exe
1822
if ($LASTEXITCODE -ne 0) {
1923
echo "Download of the VS 2019 Version 16.8.5 installer failed"

‎.github/scale-config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ runner_types:
2828
max_available: 50
2929
disk_size: 150
3030
windows.4xlarge:
31-
instance_type: c5.4xlarge
31+
instance_type: c5d.4xlarge
3232
os: windows
3333
max_available: 200
3434
disk_size: 256
3535
windows.8xlarge.nvidia.gpu:
36-
instance_type: g3.8xlarge
36+
instance_type: p3.2xlarge
3737
os: windows
3838
max_available: 25
3939
disk_size: 256

‎.github/scripts/install_windows_sdk.ps1‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎.github/scripts/windows_install_utils.ps1‎

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)