From cf5c00f1557382a241c2268864e5e13a9c53d0de Mon Sep 17 00:00:00 2001 From: Jane Xu Date: Fri, 17 Sep 2021 12:32:11 -0700 Subject: [PATCH] CI: Consolidate Build and Test naming for better stats collection (#65232) Summary: All build pytorch steps should now be named "Build" and test steps named "Test" for workflows that test PyTorch on Linux and Windows. I left the binary stuff alone as that build is different. Pull Request resolved: https://github.com/pytorch/pytorch/pull/65232 Reviewed By: driazati, seemethere Differential Revision: D31024232 Pulled By: janeyx99 fbshipit-source-id: 24b1a1e2b1b25aba70b7adc41603ec8fa4ce7dd6 --- .circleci/config.yml | 2 +- .circleci/verbatim-sources/job-specs/pytorch-job-specs.yml | 2 +- .github/templates/bazel_ci_workflow.yml.j2 | 4 ++-- .github/templates/linux_ci_workflow.yml.j2 | 4 ++-- .github/templates/windows_ci_workflow.yml.j2 | 2 +- .../workflows/generated-libtorch-linux-xenial-cuda10.2-py3.6-gcc7.yml | 2 +- .../workflows/generated-libtorch-linux-xenial-cuda11.3-py3.6-gcc7.yml | 2 +- .github/workflows/generated-linux-bionic-cuda10.2-py3.9-gcc7.yml | 4 ++-- .github/workflows/generated-linux-bionic-py3.6-clang9.yml | 4 ++-- .github/workflows/generated-linux-bionic-py3.8-gcc9-coverage.yml | 4 ++-- .github/workflows/generated-linux-xenial-cuda10.2-py3.6-gcc7.yml | 4 ++-- .github/workflows/generated-linux-xenial-cuda11.3-py3.6-gcc7.yml | 4 ++-- .github/workflows/generated-linux-xenial-py3.6-gcc5.4.yml | 4 ++-- .github/workflows/generated-linux-xenial-py3.6-gcc7-bazel-test.yml | 4 ++-- .../workflows/generated-parallelnative-linux-xenial-py3.6-gcc5.4.yml | 4 ++-- .../generated-periodic-libtorch-linux-xenial-cuda11.1-py3.6-gcc7.yml | 2 +- .../workflows/generated-periodic-linux-xenial-cuda11.1-py3.6-gcc7.yml | 4 ++-- .github/workflows/generated-periodic-win-vs2019-cuda11.1-py3.yml | 2 +- .github/workflows/generated-puretorch-linux-xenial-py3.6-gcc5.4.yml | 2 +- .github/workflows/generated-win-vs2019-cpu-py3.yml | 2 +- .github/workflows/generated-win-vs2019-cuda10.2-py3.yml | 2 +- .github/workflows/generated-win-vs2019-cuda11.3-py3.yml | 2 +- .github/workflows/test_tools.yml | 2 +- 23 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51987dc..9318a2d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -638,7 +638,7 @@ jobs: echo "Skipping for ${BUILD_ENVIRONMENT}" fi - run: - name: Run tests + name: Test no_output_timeout: "90m" command: | set -e diff --git a/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml b/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml index 422e44e..437a28b 100644 --- a/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml +++ b/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml @@ -164,7 +164,7 @@ jobs: echo "Skipping for ${BUILD_ENVIRONMENT}" fi - run: - name: Run tests + name: Test no_output_timeout: "90m" command: | set -e diff --git a/.github/templates/bazel_ci_workflow.yml.j2 b/.github/templates/bazel_ci_workflow.yml.j2 index 601a5f2..6977f82 100644 --- a/.github/templates/bazel_ci_workflow.yml.j2 +++ b/.github/templates/bazel_ci_workflow.yml.j2 @@ -54,7 +54,7 @@ on: - name: Preserve github env variables for use in docker run: | env | grep '^GITHUB' > "/tmp/github_env_${GITHUB_RUN_ID}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ @@ -95,7 +95,7 @@ on: export COMMIT_TIME pip3 install requests==2.26 python3 -m tools.stats.upload_binary_size_to_scuba || exit 0 - - name: Test PyTorch + - name: Test run: | # detached container should get cleaned up by teardown_ec2_linux export SHARD_NUMBER=0 diff --git a/.github/templates/linux_ci_workflow.yml.j2 b/.github/templates/linux_ci_workflow.yml.j2 index e25fbcd..97af532 100644 --- a/.github/templates/linux_ci_workflow.yml.j2 +++ b/.github/templates/linux_ci_workflow.yml.j2 @@ -133,7 +133,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ @@ -289,7 +289,7 @@ jobs: - name: Output disk space left run: | sudo df -H - - name: Test PyTorch + - name: Test env: PR_NUMBER: ${{ github.event.pull_request.number }} run: | diff --git a/.github/templates/windows_ci_workflow.yml.j2 b/.github/templates/windows_ci_workflow.yml.j2 index b10d649..346773d 100644 --- a/.github/templates/windows_ci_workflow.yml.j2 +++ b/.github/templates/windows_ci_workflow.yml.j2 @@ -234,7 +234,7 @@ jobs: name: Setup Python3 with: python-version: '3.x' - - name: Run test scripts + - name: Test shell: bash env: PYTORCH_FINAL_PACKAGE_DIR: /c/${{ github.run_id }}/build-results/ diff --git a/.github/workflows/generated-libtorch-linux-xenial-cuda10.2-py3.6-gcc7.yml b/.github/workflows/generated-libtorch-linux-xenial-cuda10.2-py3.6-gcc7.yml index 49016f5..54cf936 100644 --- a/.github/workflows/generated-libtorch-linux-xenial-cuda10.2-py3.6-gcc7.yml +++ b/.github/workflows/generated-libtorch-linux-xenial-cuda10.2-py3.6-gcc7.yml @@ -204,7 +204,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ diff --git a/.github/workflows/generated-libtorch-linux-xenial-cuda11.3-py3.6-gcc7.yml b/.github/workflows/generated-libtorch-linux-xenial-cuda11.3-py3.6-gcc7.yml index 1080e6f..d3f9755 100644 --- a/.github/workflows/generated-libtorch-linux-xenial-cuda11.3-py3.6-gcc7.yml +++ b/.github/workflows/generated-libtorch-linux-xenial-cuda11.3-py3.6-gcc7.yml @@ -204,7 +204,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ diff --git a/.github/workflows/generated-linux-bionic-cuda10.2-py3.9-gcc7.yml b/.github/workflows/generated-linux-bionic-cuda10.2-py3.9-gcc7.yml index fd9905d..3130954 100644 --- a/.github/workflows/generated-linux-bionic-cuda10.2-py3.9-gcc7.yml +++ b/.github/workflows/generated-linux-bionic-cuda10.2-py3.9-gcc7.yml @@ -204,7 +204,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ @@ -420,7 +420,7 @@ jobs: - name: Output disk space left run: | sudo df -H - - name: Test PyTorch + - name: Test env: PR_NUMBER: ${{ github.event.pull_request.number }} run: | diff --git a/.github/workflows/generated-linux-bionic-py3.6-clang9.yml b/.github/workflows/generated-linux-bionic-py3.6-clang9.yml index adfe696..dc41351 100644 --- a/.github/workflows/generated-linux-bionic-py3.6-clang9.yml +++ b/.github/workflows/generated-linux-bionic-py3.6-clang9.yml @@ -204,7 +204,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ @@ -420,7 +420,7 @@ jobs: - name: Output disk space left run: | sudo df -H - - name: Test PyTorch + - name: Test env: PR_NUMBER: ${{ github.event.pull_request.number }} run: | diff --git a/.github/workflows/generated-linux-bionic-py3.8-gcc9-coverage.yml b/.github/workflows/generated-linux-bionic-py3.8-gcc9-coverage.yml index 2fa996a..d8b430b 100644 --- a/.github/workflows/generated-linux-bionic-py3.8-gcc9-coverage.yml +++ b/.github/workflows/generated-linux-bionic-py3.8-gcc9-coverage.yml @@ -204,7 +204,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ @@ -420,7 +420,7 @@ jobs: - name: Output disk space left run: | sudo df -H - - name: Test PyTorch + - name: Test env: PR_NUMBER: ${{ github.event.pull_request.number }} run: | diff --git a/.github/workflows/generated-linux-xenial-cuda10.2-py3.6-gcc7.yml b/.github/workflows/generated-linux-xenial-cuda10.2-py3.6-gcc7.yml index 92530bf..84ee27f 100644 --- a/.github/workflows/generated-linux-xenial-cuda10.2-py3.6-gcc7.yml +++ b/.github/workflows/generated-linux-xenial-cuda10.2-py3.6-gcc7.yml @@ -204,7 +204,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ @@ -420,7 +420,7 @@ jobs: - name: Output disk space left run: | sudo df -H - - name: Test PyTorch + - name: Test env: PR_NUMBER: ${{ github.event.pull_request.number }} run: | diff --git a/.github/workflows/generated-linux-xenial-cuda11.3-py3.6-gcc7.yml b/.github/workflows/generated-linux-xenial-cuda11.3-py3.6-gcc7.yml index a09b79d..807277e 100644 --- a/.github/workflows/generated-linux-xenial-cuda11.3-py3.6-gcc7.yml +++ b/.github/workflows/generated-linux-xenial-cuda11.3-py3.6-gcc7.yml @@ -204,7 +204,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ @@ -420,7 +420,7 @@ jobs: - name: Output disk space left run: | sudo df -H - - name: Test PyTorch + - name: Test env: PR_NUMBER: ${{ github.event.pull_request.number }} run: | 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 95d5420..fd609a4 100644 --- a/.github/workflows/generated-linux-xenial-py3.6-gcc5.4.yml +++ b/.github/workflows/generated-linux-xenial-py3.6-gcc5.4.yml @@ -204,7 +204,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ @@ -420,7 +420,7 @@ jobs: - name: Output disk space left run: | sudo df -H - - name: Test PyTorch + - name: Test env: PR_NUMBER: ${{ github.event.pull_request.number }} run: | diff --git a/.github/workflows/generated-linux-xenial-py3.6-gcc7-bazel-test.yml b/.github/workflows/generated-linux-xenial-py3.6-gcc7-bazel-test.yml index e660ee7..69fad84 100644 --- a/.github/workflows/generated-linux-xenial-py3.6-gcc7-bazel-test.yml +++ b/.github/workflows/generated-linux-xenial-py3.6-gcc7-bazel-test.yml @@ -225,7 +225,7 @@ jobs: - name: Preserve github env variables for use in docker run: | env | grep '^GITHUB' > "/tmp/github_env_${GITHUB_RUN_ID}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ @@ -268,7 +268,7 @@ jobs: export COMMIT_TIME pip3 install requests==2.26 python3 -m tools.stats.upload_binary_size_to_scuba || exit 0 - - name: Test PyTorch + - name: Test run: | # detached container should get cleaned up by teardown_ec2_linux export SHARD_NUMBER=0 diff --git a/.github/workflows/generated-parallelnative-linux-xenial-py3.6-gcc5.4.yml b/.github/workflows/generated-parallelnative-linux-xenial-py3.6-gcc5.4.yml index 6cbb0fc..e6bde0f 100644 --- a/.github/workflows/generated-parallelnative-linux-xenial-py3.6-gcc5.4.yml +++ b/.github/workflows/generated-parallelnative-linux-xenial-py3.6-gcc5.4.yml @@ -204,7 +204,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ @@ -420,7 +420,7 @@ jobs: - name: Output disk space left run: | sudo df -H - - name: Test PyTorch + - name: Test env: PR_NUMBER: ${{ github.event.pull_request.number }} run: | diff --git a/.github/workflows/generated-periodic-libtorch-linux-xenial-cuda11.1-py3.6-gcc7.yml b/.github/workflows/generated-periodic-libtorch-linux-xenial-cuda11.1-py3.6-gcc7.yml index e1e4639..4a83b41 100644 --- a/.github/workflows/generated-periodic-libtorch-linux-xenial-cuda11.1-py3.6-gcc7.yml +++ b/.github/workflows/generated-periodic-libtorch-linux-xenial-cuda11.1-py3.6-gcc7.yml @@ -202,7 +202,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ diff --git a/.github/workflows/generated-periodic-linux-xenial-cuda11.1-py3.6-gcc7.yml b/.github/workflows/generated-periodic-linux-xenial-cuda11.1-py3.6-gcc7.yml index a3cc5cb..b30458c 100644 --- a/.github/workflows/generated-periodic-linux-xenial-cuda11.1-py3.6-gcc7.yml +++ b/.github/workflows/generated-periodic-linux-xenial-cuda11.1-py3.6-gcc7.yml @@ -202,7 +202,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ @@ -418,7 +418,7 @@ jobs: - name: Output disk space left run: | sudo df -H - - name: Test PyTorch + - name: Test env: PR_NUMBER: ${{ github.event.pull_request.number }} run: | diff --git a/.github/workflows/generated-periodic-win-vs2019-cuda11.1-py3.yml b/.github/workflows/generated-periodic-win-vs2019-cuda11.1-py3.yml index d9bea92..32d4480 100644 --- a/.github/workflows/generated-periodic-win-vs2019-cuda11.1-py3.yml +++ b/.github/workflows/generated-periodic-win-vs2019-cuda11.1-py3.yml @@ -225,7 +225,7 @@ jobs: name: Setup Python3 with: python-version: '3.x' - - name: Run test scripts + - name: Test shell: bash env: PYTORCH_FINAL_PACKAGE_DIR: /c/${{ github.run_id }}/build-results/ diff --git a/.github/workflows/generated-puretorch-linux-xenial-py3.6-gcc5.4.yml b/.github/workflows/generated-puretorch-linux-xenial-py3.6-gcc5.4.yml index da5060d..003e97f 100644 --- a/.github/workflows/generated-puretorch-linux-xenial-py3.6-gcc5.4.yml +++ b/.github/workflows/generated-puretorch-linux-xenial-py3.6-gcc5.4.yml @@ -204,7 +204,7 @@ jobs: - name: Pull docker image run: | docker pull "${DOCKER_IMAGE}" - - name: Build PyTorch + - name: Build run: | # detached container should get cleaned up by teardown_ec2_linux container_name=$(docker run \ diff --git a/.github/workflows/generated-win-vs2019-cpu-py3.yml b/.github/workflows/generated-win-vs2019-cpu-py3.yml index 7c62e9f..dab1201 100644 --- a/.github/workflows/generated-win-vs2019-cpu-py3.yml +++ b/.github/workflows/generated-win-vs2019-cpu-py3.yml @@ -209,7 +209,7 @@ jobs: name: Setup Python3 with: python-version: '3.x' - - name: Run test scripts + - name: Test shell: bash env: PYTORCH_FINAL_PACKAGE_DIR: /c/${{ github.run_id }}/build-results/ diff --git a/.github/workflows/generated-win-vs2019-cuda10.2-py3.yml b/.github/workflows/generated-win-vs2019-cuda10.2-py3.yml index 9d575847..c42e20a 100644 --- a/.github/workflows/generated-win-vs2019-cuda10.2-py3.yml +++ b/.github/workflows/generated-win-vs2019-cuda10.2-py3.yml @@ -227,7 +227,7 @@ jobs: name: Setup Python3 with: python-version: '3.x' - - name: Run test scripts + - name: Test shell: bash env: PYTORCH_FINAL_PACKAGE_DIR: /c/${{ github.run_id }}/build-results/ diff --git a/.github/workflows/generated-win-vs2019-cuda11.3-py3.yml b/.github/workflows/generated-win-vs2019-cuda11.3-py3.yml index cdd5c90..b435584 100644 --- a/.github/workflows/generated-win-vs2019-cuda11.3-py3.yml +++ b/.github/workflows/generated-win-vs2019-cuda11.3-py3.yml @@ -227,7 +227,7 @@ jobs: name: Setup Python3 with: python-version: '3.x' - - name: Run test scripts + - name: Test shell: bash env: PYTORCH_FINAL_PACKAGE_DIR: /c/${{ github.run_id }}/build-results/ diff --git a/.github/workflows/test_tools.yml b/.github/workflows/test_tools.yml index 9af9c39..45c6a23 100644 --- a/.github/workflows/test_tools.yml +++ b/.github/workflows/test_tools.yml @@ -28,7 +28,7 @@ jobs: pip install -r requirements.txt pip install boto3==1.16.34 make setup_lint - - name: Run tests + - name: Test tools run: python -m unittest discover -vs tools/test -p 'test_*.py' concurrency: -- 2.7.4