Move ASAN and ONNX to Python 3.9 and 3.8 (#92712)

As 3.7 is getting deprecated
Pull Request resolved: https://github.com/pytorch/pytorch/pull/92712
Approved by: https://github.com/weiwangmeta, https://github.com/kit1980, https://github.com/seemethere
This commit is contained in:
Nikita Shulga 2023-01-23 03:25:23 +00:00 committed by PyTorch MergeBot
parent 8f3600b966
commit b5f614c4cd
4 changed files with 24 additions and 25 deletions

View File

@ -52,14 +52,14 @@ $MAYBE_SUDO pip -q uninstall -y coverage
# CircleCI, so we host a copy on S3 instead
$MAYBE_SUDO pip -q install attrs==18.1.0 -f https://s3.amazonaws.com/ossci-linux/wheels/attrs-18.1.0-py2.py3-none-any.whl
$MAYBE_SUDO pip -q install coverage==4.5.1 -f https://s3.amazonaws.com/ossci-linux/wheels/coverage-4.5.1-cp36-cp36m-macosx_10_12_x86_64.whl
$MAYBE_SUDO pip -q install hypothesis==3.44.6 -f https://s3.amazonaws.com/ossci-linux/wheels/hypothesis-3.44.6-py3-none-any.whl
$MAYBE_SUDO pip -q install hypothesis==4.57.1
##############
# ONNX tests #
##############
if [[ "$BUILD_ENVIRONMENT" == *onnx* ]]; then
pip install -q --user --no-use-pep517 "git+https://github.com/pytorch/vision.git@$(cat .github/ci_commit_pins/vision.txt)"
pip install -q --user ninja flatbuffers==2.0 numpy==1.21.5 onnxruntime==1.12.1 beartype==0.10.4 onnx==1.12.0
pip install -q --user ninja flatbuffers==2.0 numpy==1.22.4 onnxruntime==1.12.1 beartype==0.10.4 onnx==1.12.0
# TODO: change this when onnx-script is on testPypi
pip install 'onnx-script @ git+https://github.com/microsoft/onnx-script@4f3ff0d806d0d0f30cecdfd3e8b094b1e492d44a'
# numba requires numpy <= 1.20, onnxruntime requires numpy >= 1.21.

View File

@ -112,7 +112,7 @@ case "$image" in
CONDA_CMAKE=yes
;;
pytorch-linux-focal-py3-clang7-asan)
ANACONDA_PYTHON_VERSION=3.7
ANACONDA_PYTHON_VERSION=3.9
CLANG_VERSION=7
PROTOBUF=yes
DB=yes
@ -120,7 +120,7 @@ case "$image" in
CONDA_CMAKE=yes
;;
pytorch-linux-focal-py3-clang10-onnx)
ANACONDA_PYTHON_VERSION=3.7
ANACONDA_PYTHON_VERSION=3.8
CLANG_VERSION=10
PROTOBUF=yes
DB=yes

View File

@ -66,11 +66,11 @@ jobs:
build-environment: linux-focal-py3.7-gcc7-pch
docker-image-name: pytorch-linux-focal-py3.7-gcc7
linux-focal-py3_7-clang7-asan-build:
name: linux-focal-py3.7-clang7-asan
linux-focal-py3_9-clang7-asan-build:
name: linux-focal-py3.9-clang7-asan
uses: ./.github/workflows/_linux-build.yml
with:
build-environment: linux-focal-py3.7-clang7-asan
build-environment: linux-focal-py3.9-clang7-asan
docker-image-name: pytorch-linux-focal-py3-clang7-asan
test-matrix: |
{ include: [
@ -82,20 +82,20 @@ jobs:
{ config: "functorch", shard: 1, num_shards: 1, runner: "linux.2xlarge" },
]}
linux-focal-py3_7-clang7-asan-test:
name: linux-focal-py3.7-clang7-asan
linux-focal-py3_9-clang7-asan-test:
name: linux-focal-py3.9-clang7-asan
uses: ./.github/workflows/_linux-test.yml
needs: linux-focal-py3_7-clang7-asan-build
needs: linux-focal-py3_9-clang7-asan-build
with:
build-environment: linux-focal-py3.7-clang7-asan
docker-image: ${{ needs.linux-focal-py3_7-clang7-asan-build.outputs.docker-image }}
test-matrix: ${{ needs.linux-focal-py3_7-clang7-asan-build.outputs.test-matrix }}
build-environment: linux-focal-py3.9-clang7-asan
docker-image: ${{ needs.linux-focal-py3_9-clang7-asan-build.outputs.docker-image }}
test-matrix: ${{ needs.linux-focal-py3_9-clang7-asan-build.outputs.test-matrix }}
linux-focal-py3_7-clang10-onnx-build:
name: linux-focal-py3.7-clang10-onnx
linux-focal-py3_8-clang10-onnx-build:
name: linux-focal-py3.8-clang10-onnx
uses: ./.github/workflows/_linux-build.yml
with:
build-environment: linux-focal-py3.7-clang10-onnx
build-environment: linux-focal-py3.8-clang10-onnx
docker-image-name: pytorch-linux-focal-py3-clang10-onnx
test-matrix: |
{ include: [
@ -103,14 +103,14 @@ jobs:
{ config: "default", shard: 2, num_shards: 2, runner: "linux.2xlarge" },
]}
linux-focal-py3_7-clang10-onnx-test:
name: linux-focal-py3.7-clang10-onnx
linux-focal-py3_8-clang10-onnx-test:
name: linux-focal-py3.8-clang10-onnx
uses: ./.github/workflows/_linux-test.yml
needs: linux-focal-py3_7-clang10-onnx-build
needs: linux-focal-py3_8-clang10-onnx-build
with:
build-environment: linux-focal-py3.7-clang10-onnx
docker-image: ${{ needs.linux-focal-py3_7-clang10-onnx-build.outputs.docker-image }}
test-matrix: ${{ needs.linux-focal-py3_7-clang10-onnx-build.outputs.test-matrix }}
build-environment: linux-focal-py3.8-clang10-onnx
docker-image: ${{ needs.linux-focal-py3_8-clang10-onnx-build.outputs.docker-image }}
test-matrix: ${{ needs.linux-focal-py3_8-clang10-onnx-build.outputs.test-matrix }}
linux-bionic-py3_7-clang9-build:
name: linux-bionic-py3.7-clang9

View File

@ -195,9 +195,8 @@ class TestOnnxDiagnostics(common_utils.TestCase):
diagnostics.context.diagnose(self._sample_rule, sample_level)
def test_diagnostics_records_python_call_stack(self):
diagnostic = diagnostics.ExportDiagnostic(
self._sample_rule, diagnostics.levels.NOTE
)
diagnostic = diagnostics.ExportDiagnostic(self._sample_rule, diagnostics.levels.NOTE) # fmt: skip
# Do not break the above line, otherwise it will not work with Python-3.8+
stack = diagnostic.python_call_stack
assert stack is not None # for mypy
self.assertGreater(len(stack.frames), 0)