From 2b931cde46471b690272406165fe57a78c4fe2ae Mon Sep 17 00:00:00 2001
From: mengfei25 <mengfei.li@Intel.com>
Date: Tue, 20 Aug 2024 11:35:28 +0800
Subject: [PATCH] Modify nighlty (#777)

---
 .github/actions/inductor-xpu-e2e-test/action.yml | 4 ++--
 .github/workflows/_linux_ut.yml                  | 4 ++--
 .github/workflows/nightly_ondemand_whl.yml       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/actions/inductor-xpu-e2e-test/action.yml b/.github/actions/inductor-xpu-e2e-test/action.yml
index 2ba270735..f36226c19 100644
--- a/.github/actions/inductor-xpu-e2e-test/action.yml
+++ b/.github/actions/inductor-xpu-e2e-test/action.yml
@@ -48,7 +48,7 @@ runs:
         source activate e2e_ci
         source .github/scripts/env.sh
         if [[ ${{ inputs.suite }} == *"torchbench"* ]]; then
-          if [[ ${{ inputs.pytorch }} != *" wheel"* ]]; then
+          if [[ "${{ inputs.pytorch }}" != *" wheel"* ]]; then
             cd ../ && rm -rf audio && git clone --single-branch -b main https://github.com/pytorch/audio.git
             cd audio && git checkout $TORCHAUDIO_COMMIT_ID
             python setup.py bdist_wheel && pip uninstall torchaudio -y && pip install dist/*.whl
@@ -70,7 +70,7 @@ runs:
           pip install --force-reinstall git+https://github.com/huggingface/transformers@${TRANSFORMERS_VERSION}
         fi
         if [[ ${{ inputs.suite }} == *"timm_models"* ]]; then
-          if [[ ${{ inputs.pytorch }} != *" wheel"* ]]; then
+          if [[ "${{ inputs.pytorch }}" != *" wheel"* ]]; then
             cd ../ && rm -rf vision && git clone --single-branch -b main https://github.com/pytorch/vision.git
             cd vision && git checkout $TORCHVISION_COMMIT_ID
             python setup.py bdist_wheel && pip uninstall torchvision -y && pip install dist/*.whl
diff --git a/.github/workflows/_linux_ut.yml b/.github/workflows/_linux_ut.yml
index 8ee93ebf8..822ec9d94 100644
--- a/.github/workflows/_linux_ut.yml
+++ b/.github/workflows/_linux_ut.yml
@@ -53,7 +53,7 @@ jobs:
           source activate xpu_op_${ZE_AFFINITY_MASK}
           cd ../ && rm -rf pytorch
           git clone https://github.com/pytorch/pytorch pytorch
-          cd pytorch && git checkout $(echo ${{ inputs.pytorch }} |awk '{print $1}') 
+          cd pytorch && git checkout $(echo "${{ inputs.pytorch }}" |awk '{print $1}') 
           # apply PRs for stock pytorch
           pip install requests
           python ../torch-xpu-ops/.github/scripts/apply_torch_pr.py
@@ -77,7 +77,7 @@ jobs:
           else
             export _GLIBCXX_USE_CXX11_ABI=1
           fi
-          if [[ ${{ inputs.pytorch }} != *" wheel"* ]]; then
+          if [[ "${{ inputs.pytorch }}" != *" wheel"* ]]; then
             export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${CONDA_PREFIX:-"$(dirname $(which conda))/../"}
             pip install -r requirements.txt
             WERROR=1 python setup.py bdist_wheel
diff --git a/.github/workflows/nightly_ondemand_whl.yml b/.github/workflows/nightly_ondemand_whl.yml
index 879f4e094..5a13b54bd 100644
--- a/.github/workflows/nightly_ondemand_whl.yml
+++ b/.github/workflows/nightly_ondemand_whl.yml
@@ -61,7 +61,6 @@ jobs:
     uses: ./.github/workflows/_linux_ut.yml
     with: 
       ut: ${{ github.event_name == 'schedule' && 'op_example,op_extended,op_ut,torch_xpu' || inputs.ut }}
-      pytorch: ${{ github.event_name == 'schedule' && 'main' || inputs.pytorch }}
       python: ${{ github.event_name == 'schedule' && '3.10' || inputs.python }}
       pytorch: nightly wheel
       runner: linux.idc.xpu
@@ -112,6 +111,7 @@ jobs:
           pip install requests
           python ../torch-xpu-ops/.github/scripts/apply_torch_pr.py
           git status && git show -s
+          pip install -r requirements.txt
           cd ../
           pip install torch torchvision torchaudio --pre --index-url https://download.pytorch.org/whl/nightly/xpu
       - name: Identify pinned versions