Skip to content

Commit f188dd5

Browse files
author
Mike Ruberry
committed
Merges with master
2 parents f705a08 + 9cac2b8 commit f188dd5

291 files changed

Lines changed: 6292 additions & 3441 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/pytorch_build_definitions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
# ARE YOU EDITING THIS NUMBER? MAKE SURE YOU READ THE GUIDANCE AT THE
1515
# TOP OF .circleci/config.yml
16-
DOCKER_IMAGE_VERSION = "e43973a9-9d5a-4138-9181-a08a0fc55e2f"
16+
DOCKER_IMAGE_VERSION = "8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
1717

1818

1919
@dataclass

.circleci/config.yml

Lines changed: 54 additions & 51 deletions
Large diffs are not rendered by default.

.circleci/docker/build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,13 @@ case "$image" in
153153
DB=yes
154154
VISION=yes
155155
;;
156+
pytorch-linux-bionic-py3.6-clang9)
157+
ANACONDA_PYTHON_VERSION=3.6
158+
CLANG_VERSION=9
159+
PROTOBUF=yes
160+
DB=yes
161+
VISION=yes
162+
;;
156163
pytorch-linux-xenial-rocm-py3.6-clang7)
157164
ANACONDA_PYTHON_VERSION=3.6
158165
CLANG_VERSION=7

.circleci/verbatim-sources/job-specs-custom.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
environment:
33
BUILD_ENVIRONMENT: pytorch-python-doc-push
44
# TODO: stop hardcoding this
5-
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
5+
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
66
resource_class: large
77
machine:
88
image: ubuntu-1604:201903-01
@@ -47,7 +47,7 @@
4747
pytorch_cpp_doc_push:
4848
environment:
4949
BUILD_ENVIRONMENT: pytorch-cpp-doc-push
50-
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
50+
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
5151
resource_class: large
5252
machine:
5353
image: ubuntu-1604:201903-01
@@ -157,7 +157,7 @@
157157
pytorch_android_gradle_build:
158158
environment:
159159
BUILD_ENVIRONMENT: pytorch-linux-xenial-py3-clang5-android-ndk-r19c-gradle-build
160-
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
160+
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
161161
PYTHON_VERSION: "3.6"
162162
resource_class: large
163163
machine:
@@ -243,7 +243,7 @@
243243
pytorch_android_publish_snapshot:
244244
environment:
245245
BUILD_ENVIRONMENT: pytorch-linux-xenial-py3-clang5-android-ndk-r19c-gradle-publish-snapshot
246-
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
246+
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
247247
PYTHON_VERSION: "3.6"
248248
resource_class: large
249249
machine:
@@ -279,7 +279,7 @@
279279
pytorch_android_gradle_build-x86_32:
280280
environment:
281281
BUILD_ENVIRONMENT: pytorch-linux-xenial-py3-clang5-android-ndk-r19c-gradle-build-only-x86_32
282-
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
282+
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
283283
PYTHON_VERSION: "3.6"
284284
resource_class: large
285285
machine:

.circleci/verbatim-sources/workflows-docker-builder.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
- master
99
jobs:
1010
- docker_for_ecr_gc_build_job
11+
- docker_build_job:
12+
name: "pytorch-linux-bionic-py3.6-clang9"
13+
image_name: "pytorch-linux-bionic-py3.6-clang9"
1114
- docker_build_job:
1215
name: "pytorch-linux-bionic-clang9-thrift-llvmdev"
1316
image_name: "pytorch-linux-bionic-clang9-thrift-llvmdev"

.circleci/verbatim-sources/workflows-ecr-gc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- ecr_gc_job:
1111
name: ecr_gc_job_for_pytorch
1212
project: pytorch
13-
tags_to_keep: "271,262,256,278,282,291,300,323,327,347,389,401,402,403,405,a8006f9a-272d-4478-b137-d121c6f05c83,6e7b11da-a919-49e5-b2ba-da66e3d4bb0a,f990c76a-a798-42bb-852f-5be5006f8026,e43973a9-9d5a-4138-9181-a08a0fc55e2f"
13+
tags_to_keep: "271,262,256,278,282,291,300,323,327,347,389,401,402,403,405,a8006f9a-272d-4478-b137-d121c6f05c83,6e7b11da-a919-49e5-b2ba-da66e3d4bb0a,f990c76a-a798-42bb-852f-5be5006f8026,e43973a9-9d5a-4138-9181-a08a0fc55e2f,8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
1414
- ecr_gc_job:
1515
name: ecr_gc_job_for_caffe2
1616
project: caffe2

.circleci/verbatim-sources/workflows-nightly-android-binary-builds.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
build_environment: "pytorch-linux-xenial-py3-clang5-android-ndk-r19c-x86_32"
44
requires:
55
- setup
6-
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
6+
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
77
filters:
88
branches:
99
only: nightly
@@ -12,7 +12,7 @@
1212
build_environment: "pytorch-linux-xenial-py3-clang5-android-ndk-r19c-x86_64"
1313
requires:
1414
- setup
15-
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
15+
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
1616
filters:
1717
branches:
1818
only: nightly
@@ -21,7 +21,7 @@
2121
build_environment: "pytorch-linux-xenial-py3-clang5-android-ndk-r19c-arm-v7a"
2222
requires:
2323
- setup
24-
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
24+
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
2525
filters:
2626
branches:
2727
only: nightly
@@ -30,7 +30,7 @@
3030
build_environment: "pytorch-linux-xenial-py3-clang5-android-ndk-r19c-arm-v8a"
3131
requires:
3232
- setup
33-
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
33+
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
3434
filters:
3535
branches:
3636
only: nightly

.circleci/verbatim-sources/workflows-pytorch-ge-config-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
- setup
55
- pytorch_linux_xenial_py3_6_gcc5_4_build
66
build_environment: "pytorch-linux-xenial-py3.6-gcc5.4-ge_config_legacy-test"
7-
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
7+
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
88
resource_class: large
99
- pytorch_linux_test:
1010
name: pytorch_linux_xenial_py3_6_gcc5_4_ge_config_simple_test
1111
requires:
1212
- setup
1313
- pytorch_linux_xenial_py3_6_gcc5_4_build
1414
build_environment: "pytorch-linux-xenial-py3.6-gcc5.4-ge_config_simple-test"
15-
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
15+
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
1616
resource_class: large
1717
- pytorch_linux_test:
1818
name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_ge_config_legacy_test
1919
requires:
2020
- setup
2121
- pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build
2222
build_environment: "pytorch-linux-xenial-cuda10.1-cudnn7-ge_config_legacy-test"
23-
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
23+
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
2424
use_cuda_docker_runtime: "1"
2525
resource_class: gpu.medium

.circleci/verbatim-sources/workflows-pytorch-mobile-builds.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
- setup
66
build_environment: "pytorch-linux-xenial-py3-clang5-mobile-build"
77
build_only: "1"
8-
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
8+
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
99
- pytorch_linux_build:
1010
name: pytorch_linux_xenial_py3_clang5_mobile_custom_build_static
1111
requires:
1212
- setup
1313
build_environment: "pytorch-linux-xenial-py3-clang5-mobile-custom-build-static"
1414
build_only: "1"
15-
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
15+
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
1616
- pytorch_linux_build:
1717
name: pytorch_linux_xenial_py3_clang5_mobile_custom_build_dynamic
1818
requires:
1919
- setup
2020
build_environment: "pytorch-linux-xenial-py3-clang5-mobile-custom-build-dynamic"
2121
build_only: "1"
2222
# Use LLVM-DEV toolchain in android-ndk-r19c docker image
23-
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
23+
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"
2424
- pytorch_linux_build:
2525
name: pytorch_linux_xenial_py3_clang5_mobile_code_analysis
2626
requires:
@@ -35,4 +35,4 @@
3535
build_environment: "pytorch-linux-xenial-py3-clang5-mobile-code-analysis"
3636
build_only: "1"
3737
# Use LLVM-DEV toolchain in android-ndk-r19c docker image
38-
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:e43973a9-9d5a-4138-9181-a08a0fc55e2f"
38+
docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59"

.jenkins/caffe2/test.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ if [[ "${BUILD_ENVIRONMENT}" == *-android* ]]; then
77
echo 'Skipping tests'
88
exit 0
99
fi
10+
if [[ "${BUILD_ENVIRONMENT}" == *-rocm* ]]; then
11+
# temporary to locate some kernel issues on the CI nodes
12+
export HSAKMT_DEBUG_LEVEL=4
13+
fi
1014

1115
# Find where cpp tests and Caffe2 itself are installed
1216
if [[ "$BUILD_ENVIRONMENT" == *cmake* ]]; then

0 commit comments

Comments
 (0)