From ebe530a9cd2902d6f9c1f9cb4307482ceadea779 Mon Sep 17 00:00:00 2001 From: Nikita Shulga Date: Thu, 7 Oct 2021 19:56:19 -0700 Subject: [PATCH] Periodic jobs should not have CIFLOW_DEFAULT label (#66300) Summary: Noticed that `periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck` job has a `ciflow/default`, but does not have a `ciflow/scheduled` label Added asserts to enforce that jobs with non-trival is_scheduled property do not have default and do have scheduled labesl Rename `periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck` to `periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck` Fixes #{issue number} Pull Request resolved: https://github.com/pytorch/pytorch/pull/66300 Reviewed By: seemethere Differential Revision: D31493323 Pulled By: malfet fbshipit-source-id: 194c1d7a4e659847d94a547b87a0d7d08e66406d --- .github/generated-ciflow-ruleset.json | 12 ++++++------ .github/scripts/generate_ci_workflows.py | 7 +++++-- ...enial-cuda10.2-py3-gcc7-slow-gradcheck.yml} | 18 +++++++++--------- 3 files changed, 20 insertions(+), 17 deletions(-) rename .github/workflows/{generated-periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck.yml => generated-periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck.yml} (94%) diff --git a/.github/generated-ciflow-ruleset.json b/.github/generated-ciflow-ruleset.json index f26136324b2..00e55aa8c82 100644 --- a/.github/generated-ciflow-ruleset.json +++ b/.github/generated-ciflow-ruleset.json @@ -15,8 +15,8 @@ "linux-xenial-py3.6-gcc7-bazel-test", "parallelnative-linux-xenial-py3.6-gcc5.4", "periodic-libtorch-linux-xenial-cuda11.1-py3.6-gcc7", + "periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck", "periodic-linux-xenial-cuda11.1-py3.6-gcc7", - "periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck", "periodic-win-vs2019-cuda11.1-py3", "puretorch-linux-xenial-py3.6-gcc5.4", "win-vs2019-cpu-py3", @@ -43,8 +43,8 @@ "linux-xenial-cuda10.2-py3.6-gcc7", "linux-xenial-cuda11.3-py3.6-gcc7", "periodic-libtorch-linux-xenial-cuda11.1-py3.6-gcc7", + "periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck", "periodic-linux-xenial-cuda11.1-py3.6-gcc7", - "periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck", "periodic-win-vs2019-cuda11.1-py3", "win-vs2019-cuda11.3-py3" ], @@ -56,7 +56,6 @@ "linux-xenial-py3.6-clang7-onnx", "linux-xenial-py3.6-gcc5.4", "linux-xenial-py3.6-gcc7-bazel-test", - "periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck", "win-vs2019-cpu-py3", "win-vs2019-cuda11.3-py3" ], @@ -79,8 +78,8 @@ "linux-xenial-py3.6-gcc7-bazel-test", "parallelnative-linux-xenial-py3.6-gcc5.4", "periodic-libtorch-linux-xenial-cuda11.1-py3.6-gcc7", + "periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck", "periodic-linux-xenial-cuda11.1-py3.6-gcc7", - "periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck", "puretorch-linux-xenial-py3.6-gcc5.4" ], "ciflow/noarch": [ @@ -94,16 +93,17 @@ ], "ciflow/scheduled": [ "periodic-libtorch-linux-xenial-cuda11.1-py3.6-gcc7", + "periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck", "periodic-linux-xenial-cuda11.1-py3.6-gcc7", "periodic-win-vs2019-cuda11.1-py3" ], "ciflow/slow": [ "linux-bionic-cuda10.2-py3.9-gcc7", "linux-xenial-cuda10.2-py3.6-gcc7", - "periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck" + "periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck" ], "ciflow/slow-gradcheck": [ - "periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck" + "periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck" ], "ciflow/vulkan": [ "linux-vulkan-bionic-py3.6-clang9" diff --git a/.github/scripts/generate_ci_workflows.py b/.github/scripts/generate_ci_workflows.py index ca54d5b2f86..ba241a5adbb 100755 --- a/.github/scripts/generate_ci_workflows.py +++ b/.github/scripts/generate_ci_workflows.py @@ -202,6 +202,9 @@ class CIWorkflow: assert LABEL_CIFLOW_CUDA in self.ciflow_config.labels if self.test_runner_type in CPU_RUNNERS: assert LABEL_CIFLOW_CPU in self.ciflow_config.labels + if self.is_scheduled: + assert LABEL_CIFLOW_DEFAULT not in self.ciflow_config.labels + assert LABEL_CIFLOW_SCHEDULED in self.ciflow_config.labels def generate_workflow_file(self, workflow_template: jinja2.Template) -> None: output_file_path = GITHUB_DIR / f"workflows/generated-{self.build_environment}.yml" @@ -446,7 +449,7 @@ LINUX_WORKFLOWS = [ ), CIWorkflow( arch="linux", - build_environment="periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck", + build_environment="periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck", docker_image_base=f"{DOCKER_REGISTRY}/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7", test_runner_type=LINUX_CUDA_TEST_RUNNER, num_test_shards=2, @@ -456,7 +459,7 @@ LINUX_WORKFLOWS = [ is_scheduled="0 */4 * * *", ciflow_config=CIFlowConfig( enabled=True, - labels={LABEL_CIFLOW_DEFAULT, LABEL_CIFLOW_LINUX, LABEL_CIFLOW_CUDA, LABEL_CIFLOW_SLOW_GRADCHECK, LABEL_CIFLOW_SLOW}, + labels={LABEL_CIFLOW_LINUX, LABEL_CIFLOW_CUDA, LABEL_CIFLOW_SLOW_GRADCHECK, LABEL_CIFLOW_SLOW, LABEL_CIFLOW_SCHEDULED}, ), ), ] diff --git a/.github/workflows/generated-periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck.yml b/.github/workflows/generated-periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck.yml similarity index 94% rename from .github/workflows/generated-periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck.yml rename to .github/workflows/generated-periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck.yml index 98bb9f41334..9876a26459b 100644 --- a/.github/workflows/generated-periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck.yml +++ b/.github/workflows/generated-periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck.yml @@ -1,7 +1,7 @@ # @generated DO NOT EDIT MANUALLY # Template is at: .github/templates/linux_ci_workflow.yml.j2 # Generation script: .github/scripts/generate_ci_workflows.py -name: periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck +name: periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck on: pull_request: @@ -11,7 +11,7 @@ on: workflow_dispatch: env: - BUILD_ENVIRONMENT: periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck + BUILD_ENVIRONMENT: periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck DOCKER_IMAGE_BASE: 308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7 SCCACHE_BUCKET: ossci-compiler-cache-circleci-v2 XLA_CLANG_CACHE_S3_BUCKET_NAME: ossci-compiler-clang-cache-circleci-xla @@ -29,7 +29,7 @@ env: CIRCLE_PR_NUMBER: ${{ github.event.pull_request.number }} CIRCLE_SHA1: ${{ github.event.pull_request.head.sha || github.sha }} concurrency: - group: periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }} + group: periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }} cancel-in-progress: true jobs: @@ -38,12 +38,12 @@ jobs: runs-on: ubuntu-18.04 env: IS_PROBOT_TRIGGER_EVENT: ${{ (github.event.action == 'unassigned') && (github.event.assigneed.login == 'pytorchbot') }} - LABEL_CONDITIONS: ${{ contains(github.event.pull_request.labels.*.name, 'ciflow/all') || contains(github.event.pull_request.labels.*.name, 'ciflow/cuda') || contains(github.event.pull_request.labels.*.name, 'ciflow/default') || contains(github.event.pull_request.labels.*.name, 'ciflow/linux') || contains(github.event.pull_request.labels.*.name, 'ciflow/slow') || contains(github.event.pull_request.labels.*.name, 'ciflow/slow-gradcheck') }} + LABEL_CONDITIONS: ${{ contains(github.event.pull_request.labels.*.name, 'ciflow/all') || contains(github.event.pull_request.labels.*.name, 'ciflow/cuda') || contains(github.event.pull_request.labels.*.name, 'ciflow/linux') || contains(github.event.pull_request.labels.*.name, 'ciflow/scheduled') || contains(github.event.pull_request.labels.*.name, 'ciflow/slow') || contains(github.event.pull_request.labels.*.name, 'ciflow/slow-gradcheck') }} LABELS: ${{ toJson(github.event.pull_request.labels.*.name) }} if: ${{ (github.repository == 'pytorch/pytorch') && ( (github.event_name == 'push') || - (contains(github.event.pull_request.labels.*.name, 'ciflow/all') || contains(github.event.pull_request.labels.*.name, 'ciflow/cuda') || contains(github.event.pull_request.labels.*.name, 'ciflow/default') || contains(github.event.pull_request.labels.*.name, 'ciflow/linux') || contains(github.event.pull_request.labels.*.name, 'ciflow/slow') || contains(github.event.pull_request.labels.*.name, 'ciflow/slow-gradcheck')) || - ((github.event_name == 'pull_request' && github.event.action != 'unassigned') && !contains(join(github.event.pull_request.labels.*.name), 'ciflow/'))) + (contains(github.event.pull_request.labels.*.name, 'ciflow/all') || contains(github.event.pull_request.labels.*.name, 'ciflow/cuda') || contains(github.event.pull_request.labels.*.name, 'ciflow/linux') || contains(github.event.pull_request.labels.*.name, 'ciflow/scheduled') || contains(github.event.pull_request.labels.*.name, 'ciflow/slow') || contains(github.event.pull_request.labels.*.name, 'ciflow/slow-gradcheck')) || + (false)) }} steps: - name: noop @@ -55,7 +55,7 @@ jobs: runs-on: linux.2xlarge needs: [ciflow_should_run] env: - JOB_BASE_NAME: periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck-build + JOB_BASE_NAME: periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck-build outputs: docker_image: ${{ steps.calculate-tag.outputs.docker_image }} steps: @@ -295,7 +295,7 @@ jobs: runs-on: ${{ matrix.runner }} env: DOCKER_IMAGE: ${{ needs.build.outputs.docker_image }} - JOB_BASE_NAME: periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck-test + JOB_BASE_NAME: periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck-test TEST_CONFIG: ${{ matrix.config }} SHARD_NUMBER: ${{ matrix.shard }} NUM_TEST_SHARDS: ${{ matrix.num_shards }} @@ -481,7 +481,7 @@ jobs: env: AWS_DEFAULT_REGION: us-east-1 CIRCLE_BRANCH: ${{ steps.parse-ref.outputs.branch }} - JOB_BASE_NAME: periodic-pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7-slow-gradcheck-test + JOB_BASE_NAME: periodic-linux-xenial-cuda10.2-py3-gcc7-slow-gradcheck-test CIRCLE_PR_NUMBER: ${{ github.event.pull_request.number }} CIRCLE_SHA1: ${{ github.event.pull_request.head.sha || github.sha }} CIRCLE_TAG: ${{ steps.parse-ref.outputs.tag }}