From 8a652e0e919e4ea21a1d503efebccc6be79b082f Mon Sep 17 00:00:00 2001 From: Nikita Shulga Date: Wed, 15 Sep 2021 11:52:06 -0700 Subject: [PATCH] [CircleCI] Disable pytorch_linux_xenial_cuda10_2 test jobs (#65071) Summary: As all of them has been migrated to GHA: - pytorch_linux_pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_distributed_test -> "linux-xenial-cuda11.3-py3.6-gcc7 / test (distributed, 1, 1, linux.8xlarge.nvidia.gpu)" - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_test1 -> "linux-xenial-cuda10.2-py3.6-gcc7 / test (default, 1, 2, linux.8xlarge.nvidia.gpu)" - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_test2 -> "linux-xenial-cuda10.2-py3.6-gcc7 / test (default, 2, 2, linux.8xlarge.nvidia.gpu)" - pytorch_linux_xenial_cuda10_2_cudnn7_py3_multigpu_test -> "linux-xenial-cuda10.2-py3.6-gcc7 / test (multigpu, 1, 1, linux.16xlarge.nvidia.gpu)" - pytorch_linux_xenial_cuda10_2_cudnn7_py3_nogpu_NO_AVX2_test -> "linux-xenial-cuda10.2-py3.6-gcc7 / test (nogpu_NO_AVX2, 1, 1, linux.2xlarge)" - pytorch_linux_xenial_cuda10_2_cudnn7_py3_nogpu_NO_AVX_test -> "linux-xenial-cuda10.2-py3.6-gcc7 / test (nogpu_NO_AVX, 1, 1, linux.2xlarge)" - pytorch_linux_xenial_cuda10_2_cudnn7_py3_slow_test -> "linux-xenial-cuda10.2-py3.6-gcc7 / test (slow, 1, 1, linux.8xlarge.nvidia.gpu)" "pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build" is still a holdout due to slow gradchecks Pull Request resolved: https://github.com/pytorch/pytorch/pull/65071 Reviewed By: driazati, seemethere, janeyx99 Differential Revision: D30963413 Pulled By: malfet fbshipit-source-id: d9a5188ce7eb2f60547b91b854a5db83af2b10e7 --- .circleci/cimodel/data/pytorch_build_data.py | 3 +- .../cimodel/data/pytorch_build_definitions.py | 34 +---- .circleci/config.yml | 137 +-------------------- 3 files changed, 5 insertions(+), 169 deletions(-) diff --git a/.circleci/cimodel/data/pytorch_build_data.py b/.circleci/cimodel/data/pytorch_build_data.py index 292d326..9281829 100644 --- a/.circleci/cimodel/data/pytorch_build_data.py +++ b/.circleci/cimodel/data/pytorch_build_data.py @@ -27,7 +27,8 @@ CONFIG_TREE_DATA = [ ("cuda", [ ("10.2", [ ("3.6", [ - ("shard_test", [X(True)]), + # Build are needed for slow_gradcheck + ('build_only', [X(True)]), ("slow_gradcheck", [ # If you update this slow gradcheck, you should # also update docker_definitions.py to make sure diff --git a/.circleci/cimodel/data/pytorch_build_definitions.py b/.circleci/cimodel/data/pytorch_build_definitions.py index 40b6775..194e750 100644 --- a/.circleci/cimodel/data/pytorch_build_definitions.py +++ b/.circleci/cimodel/data/pytorch_build_definitions.py @@ -178,35 +178,6 @@ class DocPushConf(object): } } -# TODO Convert these to graph nodes -def gen_dependent_configs(xenial_parent_config): - - extra_parms = [ - (["multigpu"], "large"), - (["nogpu", "NO_AVX2"], None), - (["nogpu", "NO_AVX"], None), - (["slow"], "medium"), - ] - - configs = [] - for parms, gpu in extra_parms: - - c = Conf( - xenial_parent_config.distro, - ["py3"] + parms, - pyver=xenial_parent_config.pyver, - cuda_version=xenial_parent_config.cuda_version, - restrict_phases=["test"], - gpu_resource=gpu, - parent_build=xenial_parent_config, - is_important=False, - ) - - configs.append(c) - - return configs - - def gen_docs_configs(xenial_parent_config): configs = [] @@ -386,10 +357,6 @@ def instantiate_configs(only_slow_gradcheck): tags_list=RC_PATTERN) c.dependent_tests = gen_docs_configs(c) - if cuda_version == "10.2" and python_version == "3.6" and not is_libtorch and not is_slow_gradcheck: - c.dependent_tests = gen_dependent_configs(c) - - if ( compiler_name != "clang" and not rocm_version @@ -399,6 +366,7 @@ def instantiate_configs(only_slow_gradcheck): and not is_noarch and not is_slow_gradcheck and not only_slow_gradcheck + and not build_only ): distributed_test = Conf( c.gen_build_name("") + "distributed", diff --git a/.circleci/config.yml b/.circleci/config.yml index 0950b03..a5421a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7244,95 +7244,7 @@ workflows: - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_test1 - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - filters: - branches: - only: - - master - - /ci-all\/.*/ - - /release\/.*/ - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-test1" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - use_cuda_docker_runtime: "1" - resource_class: gpu.medium - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_test2 - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - filters: - branches: - only: - - master - - /ci-all\/.*/ - - /release\/.*/ - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-test2" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - use_cuda_docker_runtime: "1" - resource_class: gpu.medium - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_multigpu_test - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - filters: - branches: - only: - - master - - /ci-all\/.*/ - - /release\/.*/ - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-multigpu-test" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - use_cuda_docker_runtime: "1" - resource_class: gpu.large - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_nogpu_NO_AVX2_test - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - filters: - branches: - only: - - master - - /ci-all\/.*/ - - /release\/.*/ - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-nogpu-NO_AVX2-test" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - resource_class: large - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_nogpu_NO_AVX_test - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - filters: - branches: - only: - - master - - /ci-all\/.*/ - - /release\/.*/ - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-nogpu-NO_AVX-test" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - resource_class: large - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_slow_test - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - filters: - branches: - only: - - master - - /ci-all\/.*/ - - /release\/.*/ - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-slow-test" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - use_cuda_docker_runtime: "1" - resource_class: gpu.medium - - pytorch_linux_test: - name: pytorch_linux_pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_distributed_test - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - build_environment: "pytorch-linux-pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_distributed-test" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - resource_class: large + build_only: "1" - pytorch_linux_build: name: pytorch_xla_linux_bionic_py3_6_clang9_build requires: @@ -9256,52 +9168,7 @@ workflows: - "docker-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_test1 - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-test1" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - use_cuda_docker_runtime: "1" - resource_class: gpu.medium - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_test2 - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-test2" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - use_cuda_docker_runtime: "1" - resource_class: gpu.medium - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_multigpu_test - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-multigpu-test" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - use_cuda_docker_runtime: "1" - resource_class: gpu.large - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_nogpu_NO_AVX2_test - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-nogpu-NO_AVX2-test" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - resource_class: large - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_nogpu_NO_AVX_test - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-nogpu-NO_AVX-test" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - resource_class: large - - pytorch_linux_test: - name: pytorch_linux_xenial_cuda10_2_cudnn7_py3_slow_test - requires: - - pytorch_linux_xenial_cuda10_2_cudnn7_py3_gcc7_build - build_environment: "pytorch-linux-xenial-cuda10.2-cudnn7-py3-slow-test" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7" - use_cuda_docker_runtime: "1" - resource_class: gpu.medium + build_only: "1" - pytorch_linux_build: build_environment: "pytorch-linux-xenial-py3-clang5-android-ndk-r19c-x86_32-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c" -- 2.7.4