10000 Update base for Update on "move aten_core_headers to common build str… · pytorch/pytorch@c7ec237 · GitHub
[go: up one dir, main page]
Skip to content

Commit c7ec237

Browse files
author
Michael Andreas Dagitses
committed
Update base for Update on "move aten_core_headers to common build structure"
Differential Revision: [D36597720](https://our.internmc.facebook.com/intern/diff/D36597720/) **NOTE FOR REVIEWERS**: This PR has internal Facebook specific changes or comments, please review them on [Phabricator](https://our.internmc.facebook.com/intern/diff/D36597720/)! [ghstack-poisoned]
2 parents 9988a6b + 3e1ac21 commit c7ec237

File tree

343 files changed

+12137
-4150
lines changed

Some content is hidden

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

343 files changed

+12137
-4150
lines changed

‎.circleci/docker/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ case "$image" in
139139
KATEX=yes
140140
;;
141141
pytorch-linux-bionic-cuda11.6-cudnn8-py3-gcc7)
142-
CUDA_VERSION=11.6.0
142+
CUDA_VERSION=11.6.2
143143
CUDNN_VERSION=8
144144
ANACONDA_PYTHON_VERSION=3.7
145145
GCC_VERSION=7
@@ -234,15 +234,15 @@ case "$image" in
234234
DB=yes
235235
VISION=yes
236236
;;
237-
pytorch-linux-bionic-rocm5.0-py3.7)
237+
pytorch-linux-focal-rocm5.0-py3.7)
238238
ANACONDA_PYTHON_VERSION=3.7
239239
GCC_VERSION=9
240240
PROTOBUF=yes
241241
DB=yes
242242
VISION=yes
243243
ROCM_VERSION=5.0
244244
;;
245-
pytorch-linux-bionic-rocm5.1-py3.7)
245+
pytorch-linux-focal-rocm5.1-py3.7)
246246
ANACONDA_PYTHON_VERSION=3.7
247247
GCC_VERSION=9
248248
PROTOBUF=yes

‎.circleci/docker/common/install_conda.sh

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,18 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
7373
}
7474

7575
# Install PyTorch conda deps, as per https://github.com/pytorch/pytorch README
76-
# DO NOT install cmake here as it would install a version newer than 3.10, but
77-
# we want to pin to version 3.10.
76+
# DO NOT install cmake here as it would install a version newer than 3.13, but
77+
# we want to pin to version 3.13.
78+
CONDA_COMMON_DEPS="astunparse pyyaml mkl=2022.0.1 mkl-include=2022.0.1 setuptools cffi future six"
7879
if [ "$ANACONDA_PYTHON_VERSION" = "3.9" ]; then
7980
# Install llvm-8 as it is required to compile llvmlite-0.30.0 from source
80-
conda_install numpy=1.19.2 astunparse pyyaml mkl mkl-include setuptools cffi future six llvmdev=8.0.0
81+
conda_install numpy=1.19.2 ${CONDA_COMMON_DEPS} llvmdev=8.0.0
8182
elif [ "$ANACONDA_PYTHON_VERSION" = "3.8" ]; then
8283
# Install llvm-8 as it is required to compile llvmlite-0.30.0 from source
83-
conda_install numpy=1.18.5 astunparse pyyaml mkl mkl-include setuptools cffi future six llvmdev=8.0.0
84-
elif [ "$ANACONDA_PYTHON_VERSION" = "3.7" ]; then
85-
# DO NOT install dataclasses if installing python-3.7, since its part of python-3.7 core packages
86-
conda_install numpy=1.18.5 astunparse pyyaml mkl mkl-include setuptools cffi future six typing_extensions
84+
conda_install numpy=1.18.5 ${CONDA_COMMON_DEPS} llvmdev=8.0.0
8785
else
88-
conda_install numpy=1.18.5 astunparse pyyaml mkl mkl-include setuptools cffi future six dataclasses typing_extensions
86+
# Install `typing_extensions` for 3.7
87+
conda_install numpy=1.18.5 ${CONDA_COMMON_DEPS} typing_extensions
8988
fi
9089

9190
# Magma package names are concatenation of CUDA major and minor ignoring revision

‎.github/actions/calculate-docker-image/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ inputs:
1919
required: false
2020
skip_push:
2121
description: If set to true value, skip will be pushed, default is to skip so that pushing will be explicit
22-
required: true
22+
required: false
23+
default: "true"
2324
force_push:
2425
description: If set to any value, always run the push
2526
required: false
@@ -40,7 +41,7 @@ runs:
4041
id: calculate-tag
4142
env:
4243
IS_XLA: ${{ inputs.xla == 'true' && 'true' || '' }}
43-
XLA_IMAGE_TAG: v0.2
44+
XLA_IMAGE_TAG: v0.4
4445
DOCKER_IMAGE_BASE: 308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/${{ inputs.docker-image-name }}
4546
run: |
4647
if [ -n "${IS_XLA}" ]; then

‎.github/ci_commit_pins/functorch.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eace82adae308ae779a25d3d1579b5814369ae92

‎.github/ci_commit_pins/torchdynamo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5f2f374d9bbc6374fe725a17182e7d4c270c6833
1+
ed7acb54e9e08c4bc2a841678abf54e1258e82a9

‎.github/ci_commit_pins/vision.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8a2dc6f22ac4389ccba8859aa1e1cb14f1ee53db
1+
8a45147f9df23b12981f1e80554bbae251f594ea

‎.github/ci_commit_pins/xla.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8f0f0d3ea0818f2fc8c7a81a17d60fdf95c956d0
1+
2bdd718b4b7309b5868825e261ae05bef6be548f

‎.github/scripts/trymerge.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,6 @@
308308
r'https://github.com/(?P<owner>[^/]+)/(?P<repo>[^/]+)/pull/(?P<number>[0-9]+)',
309309
re.MULTILINE
310310
)
311-
RE_REVERT_CMD = re.compile(r"@pytorch(merge|)bot\s+revert\s+this")
312-
RE_REVERT_CMD_CLI = re.compile(r"@pytorch(merge|)bot\s+revert\s+(-m.*-c.*|-c.*-m.*)")
313311
RE_DIFF_REV = re.compile(r'^Differential Revision:.+?(D[0-9]+)', re.MULTILINE)
314312

315313
def _fetch_url(url: str, *,
@@ -921,11 +919,7 @@ def try_revert(repo: GitRepo, pr: GitHubPR, *,
921919
reason: Optional[str] = None) -> None:
922920
def post_comment(msg: str) -> None:
923921
gh_post_pr_comment(pr.org, pr.project, pr.pr_num, msg, dry_run=dry_run)
924-
if not pr.is_closed():
925-
return post_comment(f"Can't revert open PR #{pr.pr_num}")
926922
comment = pr.get_last_comment() if comment_id is None else pr.get_comment_by_id(comment_id)
927-
if not RE_REVERT_CMD.match(comment.body_text) and not RE_REVERT_CMD_CLI.match(comment.body_text):
928-
raise RuntimeError(f"Comment {comment.body_text} does not seem to be a valid revert command")
929923
if comment.editor_login is not None:
930924
return post_comment("Don't want to revert based on edited command")
931925
author_association = comment.author_association

‎.github/templates/common.yml.j2

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

1414
{%- macro concurrency(build_environment) -%}
1515
concurrency:
16-
group: !{{ build_environment }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
16+
group: !{{ build_environment }}-${{ github.event.pull_request.number || github.ref_name }}-${{ github.ref_type == 'branch' && github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
1717
cancel-in-progress: true
1818
{%- endmacro -%}
1919

‎.github/workflows/_linux-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
- name: Archive artifacts into zip
136136
if: inputs.build-generates-artifacts
137137
run: |
138-
zip -1 -r artifacts.zip dist/ build/custom_test_artifacts build/lib build/bin .pytorch-test-times.json
138+
zip -1 -r artifacts.zip dist/ build/custom_test_artifacts build/lib build/bin
139139
140140
- name: Store PyTorch Build Artifacts on S3
141141
uses: seemethere/upload-artifact-s3@v5

0 commit comments

Comments
 (0)
0