From d49f0bf466f2484e6dbf58e5fc89c4964da8fadb Mon Sep 17 00:00:00 2001 From: chuanqiw Date: Thu, 28 Nov 2024 14:21:21 +0000 Subject: [PATCH] [CI] Fix xpu linux ci build environment duplicated issue (#141546) We found that there are duplicated build environments in XPU linux ci test, it led to test jobs may download wrong pytorch build artifact file. Refer https://github.com/pytorch/pytorch/actions/runs/12023238798/job/33518351906#step:14:633 Works for https://github.com/pytorch/pytorch/issues/139722 and https://github.com/pytorch/pytorch/issues/114850 Pull Request resolved: https://github.com/pytorch/pytorch/pull/141546 Approved by: https://github.com/EikanWang, https://github.com/atalman --- .ci/pytorch/test.sh | 2 +- .github/workflows/xpu.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/pytorch/test.sh b/.ci/pytorch/test.sh index 6709be483ba..3fbc590fb91 100755 --- a/.ci/pytorch/test.sh +++ b/.ci/pytorch/test.sh @@ -48,7 +48,7 @@ NUM_TEST_SHARDS="${NUM_TEST_SHARDS:=1}" export VALGRIND=ON # export TORCH_INDUCTOR_INSTALL_GXX=ON -if [[ "$BUILD_ENVIRONMENT" == *clang9* ]]; then +if [[ "$BUILD_ENVIRONMENT" == *clang9* || "$BUILD_ENVIRONMENT" == *xpu* ]]; then # clang9 appears to miscompile code involving std::optional, # such that valgrind complains along these lines: # diff --git a/.github/workflows/xpu.yml b/.github/workflows/xpu.yml index 294d8cf874a..28677f5ee14 100644 --- a/.github/workflows/xpu.yml +++ b/.github/workflows/xpu.yml @@ -40,12 +40,12 @@ jobs: ]} linux-jammy-xpu-2025_0-py3_9-build: - name: linux-jammy-xpu-2025_0-py3.9 + name: linux-jammy-xpu-2025.0-py3.9 uses: ./.github/workflows/_linux-build.yml needs: get-label-type with: runner_prefix: ${{ needs.get-label-type.outputs.label-type }} - build-environment: linux-jammy-xpu-py3.9 + build-environment: linux-jammy-xpu-2025.0-py3.9 docker-image-name: pytorch-linux-jammy-xpu-2025.0-py3 runner: linux.12xlarge test-matrix: | @@ -57,14 +57,14 @@ jobs: ]} linux-jammy-xpu-2025_0-py3_9-test: - name: linux-jammy-xpu-2025_0-py3.9 + name: linux-jammy-xpu-2025.0-py3.9 uses: ./.github/workflows/_xpu-test.yml needs: linux-jammy-xpu-2025_0-py3_9-build permissions: id-token: write contents: read with: - build-environment: linux-jammy-xpu-py3.9 + build-environment: linux-jammy-xpu-2025.0-py3.9 docker-image: ${{ needs.linux-jammy-xpu-2025_0-py3_9-build.outputs.docker-image }} test-matrix: ${{ needs.linux-jammy-xpu-2025_0-py3_9-build.outputs.test-matrix }}