Skip to content

Commit 9f9114f

Browse files
vfdev-5vfdev-5
committed
Merge branch 'master' of https://github.com/pytorch/pytorch into added-interp-antialias-bilinear-cpu
2 parents 1efed34 + e3bcf64 commit 9f9114f

File tree

267 files changed

+6962
-5654
lines changed

Some content is hidden

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

267 files changed

+6962
-5654
lines changed

‎.clang-tidy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@ modernize-*,
3333
-modernize-use-default-member-init,
3434
-modernize-use-using,
3535
-modernize-use-trailing-return-type,
36+
-modernize-use-nodiscard,
3637
performance-*,
3738
-performance-noexcept-move-constructor,
3839
-performance-unnecessary-value-param,
3940
'
40-
HeaderFilterRegex: 'torch/csrc/.*'
41+
HeaderFilterRegex: 'torch/csrc/(?!deploy/interpreter/cpython).*'
4142
AnalyzeTemporaryDtors: false
4243
WarningsAsErrors: '*'
4344
CheckOptions:

‎.flake8‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ per-file-ignores = __init__.py: F401 torch/utils/cpp_extension.py: B950
1616
optional-ascii-coding = True
1717
exclude =
1818
./.git,
19-
./build_code_analyzer,
2019
./build_test_custom_build,
2120
./build,
2221
./caffe2,

‎.github/generated-ciflow-ruleset.json‎

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/scripts/generate_ci_workflows.py‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -368,17 +368,6 @@ def generate_workflow_file(self, workflow_template: jinja2.Template) -> None:
368368
labels={LABEL_CIFLOW_LINUX, LABEL_CIFLOW_MOBILE, LABEL_CIFLOW_DEFAULT},
369369
),
370370
),
371-
CIWorkflow(
372-
arch="linux",
373-
build_environment="linux-xenial-py3-clang5-mobile-custom-build-dynamic",
374-
docker_image_base=f"{DOCKER_REGISTRY}/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c",
375-
test_runner_type=LINUX_CPU_TEST_RUNNER,
376-
build_generates_artifacts=False,
377-
exclude_test=True,
378-
ciflow_config=CIFlowConfig(
379-
labels={LABEL_CIFLOW_LINUX, LABEL_CIFLOW_MOBILE, LABEL_CIFLOW_DEFAULT},
380-
),
381-
),
382371
CIWorkflow(
383372
arch="linux",
384373
build_environment="linux-xenial-py3-clang5-mobile-custom-build-static",
@@ -390,17 +379,6 @@ def generate_workflow_file(self, workflow_template: jinja2.Template) -> None:
390379
labels={LABEL_CIFLOW_LINUX, LABEL_CIFLOW_MOBILE, LABEL_CIFLOW_DEFAULT},
391380
),
392381
),
393-
CIWorkflow(
394-
arch="linux",
395-
build_environment="linux-xenial-py3-clang5-mobile-code-analysis",
396-
docker_image_base=f"{DOCKER_REGISTRY}/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c",
397-
test_runner_type=LINUX_CPU_TEST_RUNNER,
398-
build_generates_artifacts=False,
399-
exclude_test=True,
400-
ciflow_config=CIFlowConfig(
401-
labels={LABEL_CIFLOW_LINUX, LABEL_CIFLOW_MOBILE},
402-
),
403-
),
404382
CIWorkflow(
405383
arch="linux",
406384
build_environment="linux-xenial-py3.6-clang7-asan",

‎.github/templates/android_ci_workflow.yml.j2‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ on:
9999
env:
100100
AWS_DEFAULT_REGION: us-east-1
101101
SCRIBE_GRAPHQL_ACCESS_TOKEN: ${{ secrets.SCRIBE_GRAPHQL_ACCESS_TOKEN }}
102-
CIRCLE_BRANCH: ${{ steps.parse-ref.outputs.branch }}
103-
CIRCLE_PR_NUMBER: ${{ github.event.pull_request.number }}
104-
CIRCLE_SHA1: ${{ github.event.pull_request.head.sha || github.sha }}
105-
CIRCLE_TAG: ${{ steps.parse-ref.outputs.tag }}
106-
CIRCLE_WORKFLOW_ID: '${{ github.run_id }}_${{ github.run_number }}'
102+
BRANCH: ${{ steps.parse-ref.outputs.branch }}
103+
PR_NUMBER: ${{ github.event.pull_request.number }}
104+
SHA1: ${{ github.event.pull_request.head.sha || github.sha }}
105+
TAG: ${{ steps.parse-ref.outputs.tag }}
106+
WORKFLOW_ID: '${{ github.run_id }}_${{ github.run_number }}'
107107
run: |
108108
COMMIT_TIME=$(git log --max-count=1 --format=%ct || echo 0)
109109
export COMMIT_TIME

‎.github/templates/bazel_ci_workflow.yml.j2‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ on:
7474
env:
7575
AWS_DEFAULT_REGION: us-east-1
7676
SCRIBE_GRAPHQL_ACCESS_TOKEN: ${{ secrets.SCRIBE_GRAPHQL_ACCESS_TOKEN }}
77-
CIRCLE_BRANCH: ${{ steps.parse-ref.outputs.branch }}
78-
CIRCLE_PR_NUMBER: ${{ github.event.pull_request.number }}
79-
CIRCLE_SHA1: ${{ github.event.pull_request.head.sha || github.sha }}
80-
CIRCLE_TAG: ${{ steps.parse-ref.outputs.tag }}
81-
CIRCLE_WORKFLOW_ID: '${{ github.run_id }}_${{ github.run_number }}'
77+
BRANCH: ${{ steps.parse-ref.outputs.branch }}
78+
PR_NUMBER: ${{ github.event.pull_request.number }}
79+
SHA1: ${{ github.event.pull_request.head.sha || github.sha }}
80+
TAG: ${{ steps.parse-ref.outputs.tag }}
81+
WORKFLOW_ID: '${{ github.run_id }}_${{ github.run_number }}'
8282
run: |
8383
COMMIT_TIME=$(git log --max-count=1 --format=%ct || echo 0)
8484
export COMMIT_TIME

‎.github/templates/common.yml.j2‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ concurrency:
4848
# tools/stats/print_test_stats.py to natively support GitHub Actions
4949
env:
5050
AWS_DEFAULT_REGION: us-east-1
51-
CIRCLE_BRANCH: ${{ steps.parse-ref.outputs.branch }}
51+
BRANCH: ${{ steps.parse-ref.outputs.branch }}
5252
JOB_BASE_NAME: !{{ build_environment }}-test
53-
CIRCLE_PR_NUMBER: ${{ github.event.pull_request.number }}
54-
CIRCLE_SHA1: ${{ github.event.pull_request.head.sha || github.sha }}
55-
CIRCLE_TAG: ${{ steps.parse-ref.outputs.tag }}
56-
CIRCLE_WORKFLOW_ID: '${{ github.run_id }}_${{ github.run_number }}'
53+
PR_NUMBER: ${{ github.event.pull_request.number }}
54+
SHA1: ${{ github.event.pull_request.head.sha || github.sha }}
55+
TAG: ${{ steps.parse-ref.outputs.tag }}
56+
WORKFLOW_ID: '${{ github.run_id }}_${{ github.run_number }}'
5757
shell: bash
5858
run: |
5959
python3 -m pip install -r requirements.txt

‎.github/templates/linux_ci_workflow.yml.j2‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ env:
3737
PR_LABELS: ${{ toJson(github.event.pull_request.labels.*.name) }}
3838
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3939
AWS_DEFAULT_REGION: us-east-1
40-
CIRCLE_PR_NUMBER: ${{ github.event.pull_request.number }}
41-
CIRCLE_SHA1: ${{ github.event.pull_request.head.sha || github.sha }}
40+
PR_NUMBER: ${{ github.event.pull_request.number }}
41+
SHA1: ${{ github.event.pull_request.head.sha || github.sha }}
42+
PYTORCH_RETRY_TEST_CASES: 1
4243
!{{ common.concurrency(build_environment) }}
4344

4445
jobs:
@@ -62,7 +63,7 @@ jobs:
6263
!{{ common.parse_ref() }}
6364
- name: Build
6465
env:
65-
CIRCLE_BRANCH: ${{ steps.parse-ref.outputs.branch }}
66+
BRANCH: ${{ steps.parse-ref.outputs.branch }}
6667
run: |
6768
# detached container should get cleaned up by teardown_ec2_linux
6869
container_name=$(docker run \
@@ -71,9 +72,9 @@ jobs:
7172
-e MAX_JOBS="$(nproc --ignore=2)" \
7273
-e AWS_DEFAULT_REGION \
7374
-e IS_GHA \
74-
-e CIRCLE_PR_NUMBER \
75-
-e CIRCLE_SHA1 \
76-
-e CIRCLE_BRANCH \
75+
-e PR_NUMBER \
76+
-e SHA1 \
77+
-e BRANCH \
7778
-e GITHUB_RUN_ID \
7879
-e SCCACHE_BUCKET \
7980
-e XLA_CLANG_CACHE_S3_BUCKET_NAME \
@@ -98,9 +99,9 @@ jobs:
9899
# tools/stats/print_test_stats.py to natively support GitHub Actions
99100
env:
100101
SCRIBE_GRAPHQL_ACCESS_TOKEN: ${{ secrets.SCRIBE_GRAPHQL_ACCESS_TOKEN }}
101-
CIRCLE_BRANCH: ${{ steps.parse-ref.outputs.branch }}
102-
CIRCLE_TAG: ${{ steps.parse-ref.outputs.tag }}
103-
CIRCLE_WORKFLOW_ID: '${{ github.run_id }}_${{ github.run_number }}'
102+
BRANCH: ${{ steps.parse-ref.outputs.branch }}
103+
TAG: ${{ steps.parse-ref.outputs.tag }}
104+
WORKFLOW_ID: '${{ github.run_id }}_${{ github.run_number }}'
104105
run: |
105106
COMMIT_TIME=$(git log --max-count=1 --format=%ct || echo 0)
106107
export COMMIT_TIME
@@ -223,7 +224,7 @@ jobs:
223224
- name: Test
224225
env:
225226
PR_NUMBER: ${{ github.event.pull_request.number }}
226-
CIRCLE_BRANCH: ${{ steps.parse-ref.outputs.branch }}
227+
BRANCH: ${{ steps.parse-ref.outputs.branch }}
227228
# Time out the test phase after !{{ timeout_after }} minutes
228229
timeout-minutes: !{{ timeout_after }}
229230
run: |
@@ -248,9 +249,8 @@ jobs:
248249
-e GITHUB_ACTIONS \
249250
-e IN_CI \
250251
-e IS_GHA \
251-
-e CIRCLE_BRANCH \
252-
-e CIRCLE_SHA1 \
253-
-e CIRCLE_PR_NUMBER \
252+
-e BRANCH \
253+
-e SHA1 \
254254
-e AWS_DEFAULT_REGION \
255255
-e IN_WHEEL_TEST \
256256
-e SHARD_NUMBER \
@@ -325,7 +325,7 @@ jobs:
325325
-e CUSTOM_TEST_ARTIFACT_BUILD_DIR \
326326
-e IN_CI \
327327
-e MAX_JOBS="$(nproc --ignore=2)" \
328-
-e CIRCLE_SHA1="$GITHUB_SHA" \
328+
-e SHA1="$GITHUB_SHA" \
329329
-e DOCS_VERSION="${target}" \
330330
-e DOCS_TYPE \
331331
-e PR_LABELS \

‎.github/templates/macos_ci_workflow.yml.j2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ env:
3030
COMPACT_JOB_NAME: !{{ build_environment }}
3131
IN_CI: 1
3232
IS_GHA: 1
33+
PYTORCH_RETRY_TEST_CASES: 1
3334
!{{ common.set_xcode_version(xcode_version) }}
3435

3536
jobs:

‎.github/templates/windows_ci_workflow.yml.j2‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ env:
4141
IS_GHA: 1
4242
INSTALL_WINDOWS_SDK: 1
4343
PYTHON_VERSION: "3.8"
44+
PYTORCH_RETRY_TEST_CASES: 1
4445
PR_LABELS: ${{ toJson(github.event.pull_request.labels.*.name) }}
4546
SCCACHE_BUCKET: "ossci-compiler-cache"
4647
VC_PRODUCT: "BuildTools"
@@ -50,8 +51,8 @@ env:
5051
ALPINE_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/tool/alpine"
5152
no_proxy: !{{ common.squid_no_proxy }}
5253
AWS_DEFAULT_REGION: us-east-1
53-
CIRCLE_PR_NUMBER: ${{ github.event.pull_request.number }}
54-
CIRCLE_SHA1: ${{ github.event.pull_request.head.sha || github.sha }}
54+
PR_NUMBER: ${{ github.event.pull_request.number }}
55+
SHA1: ${{ github.event.pull_request.head.sha || github.sha }}
5556
{%- if cuda_version != "cpu" %}
5657
TORCH_CUDA_ARCH_LIST: "7.0"
5758
{%- endif %}
@@ -95,7 +96,7 @@ jobs:
9596
shell: bash
9697
env:
9798
PYTORCH_FINAL_PACKAGE_DIR: /c/${{ github.run_id }}/build-results/
98-
CIRCLE_BRANCH: ${{ steps.parse-ref.outputs.branch }}
99+
BRANCH: ${{ steps.parse-ref.outputs.branch }}
99100
run: |
100101
.jenkins/pytorch/win-build.sh
101102
# Upload to github so that people can click and download artifacts

0 commit comments

Comments
 (0)