From 1583f5810c2f3b4b3ea4f953605bba2fb823d10c Mon Sep 17 00:00:00 2001 From: mengfeil Date: Tue, 11 Mar 2025 10:15:40 +0800 Subject: [PATCH 1/2] No need submodule when launch E2E --- .github/workflows/nightly_ondemand.yml | 1 - .github/workflows/nightly_ondemand_rolling.yml | 1 - .github/workflows/pull.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/nightly_ondemand.yml b/.github/workflows/nightly_ondemand.yml index 26da75ff3..88a4c3c32 100644 --- a/.github/workflows/nightly_ondemand.yml +++ b/.github/workflows/nightly_ondemand.yml @@ -142,7 +142,6 @@ jobs: pip install requests python ../torch-xpu-ops/.github/scripts/apply_torch_pr.py git status && git show -s - git submodule sync && git submodule update --init --recursive if [[ ${{ env.keep_torch_xpu_ops }} == 'true' ]]; then echo "Don't replace torch-xpu-ops!" else diff --git a/.github/workflows/nightly_ondemand_rolling.yml b/.github/workflows/nightly_ondemand_rolling.yml index 5cf66b3c8..6ca2bdd25 100644 --- a/.github/workflows/nightly_ondemand_rolling.yml +++ b/.github/workflows/nightly_ondemand_rolling.yml @@ -147,7 +147,6 @@ jobs: pip install requests python ../torch-xpu-ops/.github/scripts/apply_torch_pr.py git status && git show -s - git submodule sync && git submodule update --init --recursive if [[ ${{ env.keep_torch_xpu_ops }} == 'true' ]]; then echo "Don't replace torch-xpu-ops!" else diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index a3ff597d4..029c4e34e 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -97,7 +97,6 @@ jobs: # https://github.com/mengfei25/pytorch/pull/18 internal use only for subset model list python ../torch-xpu-ops/.github/scripts/apply_torch_pr.py -e https://github.com/mengfei25/pytorch/pull/18 git status && git show -s - git submodule sync && git submodule update --init --recursive rm -rf third_party/torch-xpu-ops && cp -r ../torch-xpu-ops third_party/ # Workaround for torch-xpu-ops ci test sed -i "s/checkout --quiet \${TORCH_XPU_OPS_COMMIT}/log -n 1/g" caffe2/CMakeLists.txt From 85457b7ea42acfa2062527a1317add4443f00fcb Mon Sep 17 00:00:00 2001 From: mengfeil Date: Tue, 11 Mar 2025 11:22:26 +0800 Subject: [PATCH 2/2] Fix build issue --- .github/workflows/_linux_build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_linux_build.yml b/.github/workflows/_linux_build.yml index 6abcab211..41a70b386 100644 --- a/.github/workflows/_linux_build.yml +++ b/.github/workflows/_linux_build.yml @@ -36,10 +36,10 @@ on: outputs: whl_name: description: The name of the wheel file - value: ${{ jobs.Torch-XPU-Build.outputs.whl_name }} + value: ${{ jobs.build.outputs.whl_name }} torch_commit_id: description: The commit id of the torch build - value: ${{ jobs.Torch-XPU-Build.outputs.TORCH_COMMIT_ID }} + value: ${{ jobs.build.outputs.TORCH_COMMIT_ID }} permissions: issues: write @@ -116,7 +116,7 @@ jobs: WERROR=1 python setup.py bdist_wheel 2>&1 | tee pytorch_${current_commit}_build.log if [[ ${is_fork_pr} == "false" ]]; then - if [ -f dist/torch*.whl && "${last_commit}" != "${current_commit}"] && [[ "${{ inputs.pytorch }}" == "main" || "${{ inputs.pytorch }}" == "release/"* ]]; then + if [ -f dist/torch*.whl && "${last_commit}" != "${current_commit}" ] && [[ "${{ inputs.pytorch }}" == "main" || "${{ inputs.pytorch }}" == "release/"* ]]; then echo "Wheel build successful, update last commit in the issue https://github.com/intel/torch-xpu-ops/issues/1280" gh --repo $repo issue view $commit_issue --json body -q .body | sed "s;${last_commit};${current_commit};g" | sed '/^$/d' > new_body.txt gh --repo $repo issue edit $commit_issue --body-file new_body.txt