From: Eli Uriegas Date: Wed, 15 Sep 2021 23:09:57 +0000 (-0700) Subject: ci: Disable jit legacy on circleci, enable on gha (#65106) X-Git-Tag: accepted/tizen/8.0/unified/20231005.095509~170 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=59c486f2f32da0fa97b6d4e5539b8eacc85053f3;p=platform%2Fupstream%2Fpytorch.git ci: Disable jit legacy on circleci, enable on gha (#65106) Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/65106 Signed-off-by: Eli Uriegas cc ezyang seemethere malfet lg20987 pytorch/pytorch-dev-infra Test Plan: Imported from OSS Reviewed By: malfet, janeyx99 Differential Revision: D30976186 Pulled By: seemethere fbshipit-source-id: 8958f821eab9aa284496c57915894ed70f6b2fff --- diff --git a/.circleci/cimodel/data/simple/ge_config_tests.py b/.circleci/cimodel/data/simple/ge_config_tests.py deleted file mode 100644 index 603966c..0000000 --- a/.circleci/cimodel/data/simple/ge_config_tests.py +++ /dev/null @@ -1,78 +0,0 @@ -import cimodel.lib.miniutils as miniutils -from cimodel.data.simple.util.versions import MultiPartVersion, CudaVersion -from cimodel.data.simple.util.docker_constants import DOCKER_IMAGE_BASIC, DOCKER_IMAGE_CUDA_10_2 - - -class GeConfigTestJob: - def __init__(self, - py_version, - gcc_version, - cuda_version, - variant_parts, - extra_requires, - use_cuda_docker=False, - build_env_override=None): - - self.py_version = py_version - self.gcc_version = gcc_version - self.cuda_version = cuda_version - self.variant_parts = variant_parts - self.extra_requires = extra_requires - self.use_cuda_docker = use_cuda_docker - self.build_env_override = build_env_override - - def get_all_parts(self, with_dots): - - maybe_py_version = self.py_version.render_dots_or_parts(with_dots) if self.py_version else [] - maybe_gcc_version = self.gcc_version.render_dots_or_parts(with_dots) if self.gcc_version else [] - maybe_cuda_version = self.cuda_version.render_dots_or_parts(with_dots) if self.cuda_version else [] - - common_parts = [ - "pytorch", - "linux", - "xenial", - ] + maybe_cuda_version + maybe_py_version + maybe_gcc_version - - return common_parts + self.variant_parts - - def gen_tree(self): - - resource_class = "gpu.medium" if self.use_cuda_docker else "large" - docker_image = DOCKER_IMAGE_CUDA_10_2 if self.use_cuda_docker else DOCKER_IMAGE_BASIC - full_name = "_".join(self.get_all_parts(False)) - build_env = self.build_env_override or "-".join(self.get_all_parts(True)) - - props_dict = { - "name": full_name, - "build_environment": build_env, - "requires": self.extra_requires, - "resource_class": resource_class, - "docker_image": docker_image, - } - - if self.use_cuda_docker: - props_dict["use_cuda_docker_runtime"] = miniutils.quote(str(1)) - - return [{"pytorch_linux_test": props_dict}] - - -WORKFLOW_DATA = [ - GeConfigTestJob( - MultiPartVersion([3, 6], "py"), - MultiPartVersion([5, 4], "gcc"), - None, - ["jit_legacy", "test"], - ["pytorch_linux_xenial_py3_6_gcc5_4_build"]), - GeConfigTestJob( - None, - None, - CudaVersion(10, 2), - ["cudnn7", "py3", "jit_legacy", "test"], - ["pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build"], - use_cuda_docker=True, - ), -] - - -def get_workflow_jobs(): - return [item.gen_tree() for item in WORKFLOW_DATA] diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d6b970..fdd0aaa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7442,21 +7442,6 @@ workflows: name: pytorch_linux_xenial_py3_clang5_mobile_code_analysis requires: - docker-pytorch-linux-xenial-py3-clang5-android-ndk-r19c - - pytorch_linux_test: - build_environment: pytorch-linux-xenial-py3.6-gcc5.4-jit_legacy-test - docker_image: 308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4 - name: pytorch_linux_xenial_py3_6_gcc5_4_jit_legacy_test - requires: - - pytorch_linux_xenial_py3_6_gcc5_4_build - resource_class: large - - pytorch_linux_test: - build_environment: pytorch-linux-xenial-cuda10.2-cudnn7-py3-jit_legacy-test - docker_image: 308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7 - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_jit_legacy_test - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - resource_class: gpu.medium - use_cuda_docker_runtime: "1" - binary_linux_build: build_environment: manywheel 3.7m cu102 devtoolset7 docker_image: pytorch/manylinux-cuda102 diff --git a/.circleci/generate_config_yml.py b/.circleci/generate_config_yml.py index b6f2cb6..276a846 100755 --- a/.circleci/generate_config_yml.py +++ b/.circleci/generate_config_yml.py @@ -15,7 +15,6 @@ import cimodel.data.pytorch_build_definitions as pytorch_build_definitions import cimodel.data.simple.android_definitions import cimodel.data.simple.binary_smoketest import cimodel.data.simple.docker_definitions -import cimodel.data.simple.ge_config_tests import cimodel.data.simple.ios_definitions import cimodel.data.simple.macos_definitions import cimodel.data.simple.mobile_definitions @@ -134,7 +133,6 @@ def gen_build_workflows_tree(): cimodel.data.simple.android_definitions.get_workflow_jobs, cimodel.data.simple.ios_definitions.get_workflow_jobs, cimodel.data.simple.mobile_definitions.get_workflow_jobs, - cimodel.data.simple.ge_config_tests.get_workflow_jobs, cimodel.data.simple.binary_smoketest.get_workflow_jobs, cimodel.data.simple.nightly_ios.get_workflow_jobs, cimodel.data.simple.nightly_android.get_workflow_jobs, diff --git a/.github/scripts/generate_ci_workflows.py b/.github/scripts/generate_ci_workflows.py index e5a9cf2..7dafb3a 100755 --- a/.github/scripts/generate_ci_workflows.py +++ b/.github/scripts/generate_ci_workflows.py @@ -276,6 +276,7 @@ LINUX_WORKFLOWS = [ docker_image_base=f"{DOCKER_REGISTRY}/pytorch/pytorch-linux-xenial-py3.6-gcc5.4", test_runner_type=LINUX_CPU_TEST_RUNNER, on_pull_request=True, + enable_jit_legacy_test=1, enable_doc_jobs=True, enable_docs_test=1, enable_backwards_compat_test=1, diff --git a/.github/workflows/generated-linux-xenial-py3.6-gcc5.4.yml b/.github/workflows/generated-linux-xenial-py3.6-gcc5.4.yml index 35e0931..5a44c56 100644 --- a/.github/workflows/generated-linux-xenial-py3.6-gcc5.4.yml +++ b/.github/workflows/generated-linux-xenial-py3.6-gcc5.4.yml @@ -292,7 +292,7 @@ jobs: env: TEST_RUNNER_TYPE: linux.2xlarge ENABLE_DISTRIBUTED_TEST: 1 - ENABLE_JIT_LEGACY_TEST: '' + ENABLE_JIT_LEGACY_TEST: 1 ENABLE_MULTIGPU_TEST: '' ENABLE_NOGPU_NO_AVX_TEST: '' ENABLE_NOGPU_NO_AVX2_TEST: ''