diff --git a/.circleci/cimodel/data/caffe2_build_definitions.py b/.circleci/cimodel/data/caffe2_build_definitions.py index 376e88f78ab9..34e8b2a66416 100644 --- a/.circleci/cimodel/data/caffe2_build_definitions.py +++ b/.circleci/cimodel/data/caffe2_build_definitions.py @@ -127,7 +127,7 @@ def gen_workflow_job(self, phase): job_name = "caffe2_" + self.get_platform() + "_build" if not self.is_important: - job_def["filters"] = {"branches": {"only": ["master", r"/ci-all\/.*/"]}} + job_def["filters"] = {"branches": {"only": ["master", r"/ci-all\/.*/", r"/release\/.*/"]}} job_def.update(self.gen_workflow_params(phase)) return {job_name : job_def} diff --git a/.circleci/cimodel/data/pytorch_build_definitions.py b/.circleci/cimodel/data/pytorch_build_definitions.py index 11e334f63ab8..d45180623418 100644 --- a/.circleci/cimodel/data/pytorch_build_definitions.py +++ b/.circleci/cimodel/data/pytorch_build_definitions.py @@ -114,7 +114,7 @@ def gen_workflow_job(self, phase): if not self.is_important: # If you update this, update # caffe2_build_definitions.py too - job_def["filters"] = {"branches": {"only": ["master", r"/ci-all\/.*/"]}} + job_def["filters"] = {"branches": {"only": ["master", r"/ci-all\/.*/", r"/release\/.*/"]}} job_def.update(self.gen_workflow_params(phase)) return {job_name : job_def} diff --git a/.circleci/config.yml b/.circleci/config.yml index 107eed649d94..1a1171c2af48 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1805,6 +1805,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_test: name: pytorch_windows_vs2017_14.11_py36_cuda10.1_test1 test_name: pytorch-windows-test1 @@ -1822,6 +1823,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_test: name: pytorch_windows_vs2017_14.11_py36_cuda10.1_test2 test_name: pytorch-windows-test2 @@ -1839,6 +1841,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_build: name: pytorch_windows_vs2017_14.16_py36_cuda10.1_build cuda_version: "10" @@ -1854,6 +1857,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_test: name: pytorch_windows_vs2017_14.16_py36_cuda10.1_test1 test_name: pytorch-windows-test1 @@ -1871,6 +1875,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_test: name: pytorch_windows_vs2017_14.16_py36_cuda10.1_test2 test_name: pytorch-windows-test2 @@ -1888,6 +1893,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_build: name: pytorch_windows_vs2019_py36_cuda10.1_build cuda_version: "10" @@ -1931,6 +1937,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-pynightly-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-pynightly:f990c76a-a798-42bb-852f-5be5006f8026" - pytorch_linux_test: @@ -1943,6 +1950,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-pynightly-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-pynightly:f990c76a-a798-42bb-852f-5be5006f8026" resource_class: large @@ -1983,6 +1991,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-paralleltbb-linux-xenial-py3.6-gcc5.4-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:f990c76a-a798-42bb-852f-5be5006f8026" - pytorch_linux_test: @@ -1995,6 +2004,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-paralleltbb-linux-xenial-py3.6-gcc5.4-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:f990c76a-a798-42bb-852f-5be5006f8026" resource_class: large @@ -2007,6 +2017,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-parallelnative-linux-xenial-py3.6-gcc5.4-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:f990c76a-a798-42bb-852f-5be5006f8026" - pytorch_linux_test: @@ -2019,6 +2030,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-parallelnative-linux-xenial-py3.6-gcc5.4-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:f990c76a-a798-42bb-852f-5be5006f8026" resource_class: large @@ -2031,6 +2043,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-py3.6-gcc7-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc7:f990c76a-a798-42bb-852f-5be5006f8026" - pytorch_linux_test: @@ -2043,6 +2056,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-py3.6-gcc7-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc7:f990c76a-a798-42bb-852f-5be5006f8026" resource_class: large @@ -2083,6 +2097,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda9-cudnn7-py3-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3:f990c76a-a798-42bb-852f-5be5006f8026" - pytorch_linux_test: @@ -2095,6 +2110,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda9-cudnn7-py3-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3:f990c76a-a798-42bb-852f-5be5006f8026" use_cuda_docker_runtime: "1" @@ -2108,6 +2124,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7:f990c76a-a798-42bb-852f-5be5006f8026" - pytorch_linux_test: @@ -2120,6 +2137,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7:f990c76a-a798-42bb-852f-5be5006f8026" use_cuda_docker_runtime: "1" @@ -2133,6 +2151,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7:f990c76a-a798-42bb-852f-5be5006f8026" - pytorch_linux_test: @@ -2145,6 +2164,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7:f990c76a-a798-42bb-852f-5be5006f8026" use_cuda_docker_runtime: "1" @@ -2159,6 +2179,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda10.1-cudnn7-py3-multigpu-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7:f990c76a-a798-42bb-852f-5be5006f8026" use_cuda_docker_runtime: "1" @@ -2173,6 +2194,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda10.1-cudnn7-py3-NO_AVX2-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7:f990c76a-a798-42bb-852f-5be5006f8026" use_cuda_docker_runtime: "1" @@ -2187,6 +2209,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda10.1-cudnn7-py3-NO_AVX-NO_AVX2-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7:f990c76a-a798-42bb-852f-5be5006f8026" use_cuda_docker_runtime: "1" @@ -2201,6 +2224,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda10.1-cudnn7-py3-slow-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7:f990c76a-a798-42bb-852f-5be5006f8026" use_cuda_docker_runtime: "1" @@ -2215,6 +2239,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-cuda10.1-cudnn7-py3-nogpu-test" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7:f990c76a-a798-42bb-852f-5be5006f8026" resource_class: large @@ -2263,6 +2288,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-py3-clang5-android-ndk-r19c-x86_64-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:f990c76a-a798-42bb-852f-5be5006f8026" - pytorch_linux_build: @@ -2274,6 +2300,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-py3-clang5-android-ndk-r19c-arm-v7a-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:f990c76a-a798-42bb-852f-5be5006f8026" - pytorch_linux_build: @@ -2285,6 +2312,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-py3-clang5-android-ndk-r19c-arm-v8a-build" docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:f990c76a-a798-42bb-852f-5be5006f8026" # Warning: indentation here matters! @@ -2303,6 +2331,8 @@ workflows: branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ requires: - pytorch_linux_xenial_py3_clang5_android_ndk_r19c_x86_32_build @@ -2312,6 +2342,8 @@ workflows: branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ requires: - pytorch_linux_xenial_py3_clang5_android_ndk_r19c_x86_32_build - pytorch_linux_xenial_py3_clang5_android_ndk_r19c_x86_64_build @@ -2376,6 +2408,7 @@ workflows: only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-py3-clang5-mobile-code-analysis" build_only: "1" # Use LLVM-DEV toolchain in android-ndk-r19c docker image @@ -2454,6 +2487,8 @@ workflows: branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ # This binary build is currently broken, see https://github_com/pytorch/pytorch/issues/16710 # - binary_linux_conda_3_6_cu90_devtoolset7_build - binary_linux_build: @@ -2481,6 +2516,8 @@ workflows: branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ # This job has an average run time of 3 hours o.O # Now only running this on master to reduce overhead - binary_mac_build: @@ -2492,6 +2529,8 @@ workflows: branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ - binary_linux_test: name: binary_linux_manywheel_3_7m_cu102_devtoolset7_test build_environment: "manywheel 3.7m cu102 devtoolset7" @@ -2505,6 +2544,8 @@ workflows: branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ # This binary build is currently broken, see https://github_com/pytorch/pytorch/issues/16710 # - binary_linux_conda_3_6_cu90_devtoolset7_test: - binary_linux_test: diff --git a/.circleci/verbatim-sources/windows-build-test.yml b/.circleci/verbatim-sources/windows-build-test.yml index 4192632db0ef..f467700a9947 100644 --- a/.circleci/verbatim-sources/windows-build-test.yml +++ b/.circleci/verbatim-sources/windows-build-test.yml @@ -15,6 +15,7 @@ only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_test: name: pytorch_windows_vs2017_14.11_py36_cuda10.1_test1 test_name: pytorch-windows-test1 @@ -32,6 +33,7 @@ only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_test: name: pytorch_windows_vs2017_14.11_py36_cuda10.1_test2 test_name: pytorch-windows-test2 @@ -49,6 +51,7 @@ only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_build: name: pytorch_windows_vs2017_14.16_py36_cuda10.1_build cuda_version: "10" @@ -64,6 +67,7 @@ only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_test: name: pytorch_windows_vs2017_14.16_py36_cuda10.1_test1 test_name: pytorch-windows-test1 @@ -81,6 +85,7 @@ only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_test: name: pytorch_windows_vs2017_14.16_py36_cuda10.1_test2 test_name: pytorch-windows-test2 @@ -98,6 +103,7 @@ only: - master - /ci-all\/.*/ + - /release\/.*/ - pytorch_windows_build: name: pytorch_windows_vs2019_py36_cuda10.1_build cuda_version: "10" diff --git a/.circleci/verbatim-sources/workflows-binary-builds-smoke-subset.yml b/.circleci/verbatim-sources/workflows-binary-builds-smoke-subset.yml index 3f1059be3c39..92a1467f73ad 100644 --- a/.circleci/verbatim-sources/workflows-binary-builds-smoke-subset.yml +++ b/.circleci/verbatim-sources/workflows-binary-builds-smoke-subset.yml @@ -17,6 +17,8 @@ branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ # This binary build is currently broken, see https://github_com/pytorch/pytorch/issues/16710 # - binary_linux_conda_3_6_cu90_devtoolset7_build - binary_linux_build: @@ -44,6 +46,8 @@ branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ # This job has an average run time of 3 hours o.O # Now only running this on master to reduce overhead - binary_mac_build: @@ -55,6 +59,8 @@ branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ - binary_linux_test: name: binary_linux_manywheel_3_7m_cu102_devtoolset7_test build_environment: "manywheel 3.7m cu102 devtoolset7" @@ -68,6 +74,8 @@ branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ # This binary build is currently broken, see https://github_com/pytorch/pytorch/issues/16710 # - binary_linux_conda_3_6_cu90_devtoolset7_test: - binary_linux_test: diff --git a/.circleci/verbatim-sources/workflows-pytorch-android-gradle-build.yml b/.circleci/verbatim-sources/workflows-pytorch-android-gradle-build.yml index d826ffdcece6..b3829054460d 100644 --- a/.circleci/verbatim-sources/workflows-pytorch-android-gradle-build.yml +++ b/.circleci/verbatim-sources/workflows-pytorch-android-gradle-build.yml @@ -4,6 +4,8 @@ branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ requires: - pytorch_linux_xenial_py3_clang5_android_ndk_r19c_x86_32_build @@ -13,6 +15,8 @@ branches: only: - master + - /ci-all\/.*/ + - /release\/.*/ requires: - pytorch_linux_xenial_py3_clang5_android_ndk_r19c_x86_32_build - pytorch_linux_xenial_py3_clang5_android_ndk_r19c_x86_64_build diff --git a/.circleci/verbatim-sources/workflows-pytorch-mobile-builds.yml b/.circleci/verbatim-sources/workflows-pytorch-mobile-builds.yml index be259c0f835f..4feb219dfd46 100644 --- a/.circleci/verbatim-sources/workflows-pytorch-mobile-builds.yml +++ b/.circleci/verbatim-sources/workflows-pytorch-mobile-builds.yml @@ -31,6 +31,7 @@ only: - master - /ci-all\/.*/ + - /release\/.*/ build_environment: "pytorch-linux-xenial-py3-clang5-mobile-code-analysis" build_only: "1" # Use LLVM-DEV toolchain in android-ndk-r19c docker image