Merge branch 'main' into penghuic/Fixed_regression_issue

.github/actions/inductor-xpu-e2e-test/action.yml

@@ -81,6 +81,7 @@ runs:
         source .github/scripts/env.sh
         cp .github/scripts/inductor_xpu_test.sh ../pytorch
         cd ../pytorch
+
         # check param
         function contains() {
             contains_status="echo 'Start $2 ...'"
@@ -136,8 +137,7 @@ runs:
           done
         done
 
-    - name: Summary E2E Accuracy Test (${{ inputs.suite }} ${{ inputs.dt }} ${{ inputs.mode }} ${{ inputs.scenario }})
-      if: contains(inputs.scenario, 'accuracy')
+    - name: Summary E2E Test (${{ inputs.suite }} ${{ inputs.dt }} ${{ inputs.mode }} ${{ inputs.scenario }})
       shell: bash
       env:
         HUGGING_FACE_HUB_TOKEN: ${{ inputs.hf_token }}
@@ -150,60 +150,15 @@ runs:
           cat $var >> inductor_log/summary_accuracy.csv
         done
 
-        # check param
-        function contains() {
-            contains_status="echo 'Start $2 ...'"
-            {
-              [[ $1 =~ (^|,)$2($|,) ]]
-            } || {
-              echo "[Warning] $2 is not suppotted type! Skipped!"
-              contains_status="continue"
-            }
-        }
-        #Accuracy summary 
         source activate e2e_ci
         cd ${{ github.workspace }}
-        cp .github/scripts/inductor_accuracy_summary.py ../pytorch
+        cp .github/scripts/inductor_summary.py ../pytorch
         cd ../pytorch
         pip install styleFrame scipy pandas
         set -xe
-        for suite in $(echo ${{ inputs.suite }} |sed 's/,/ /g')
-        do
-          contains "huggingface,timm_models,torchbench" $suite
-          $contains_status
-          dt=$(echo ${{ inputs.dt }} |sed 's/,/ /g')
-          mode=$(echo ${{ inputs.mode }} |sed 's/,/ /g')
-          python inductor_accuracy_summary.py -p ${dt} -s ${suite} -m ${mode}
-        done
-
-    - name: Summary E2E Performance Test (${{ inputs.suite }} ${{ inputs.dt }} ${{ inputs.mode }} ${{ inputs.scenario }})
-      if: contains(inputs.scenario, 'performance')
-      shell: bash
-      env:
-        HUGGING_FACE_HUB_TOKEN: ${{ inputs.hf_token }}
-      run: |
-        # check param
-        function contains() {
-            contains_status="echo 'Start $2 ...'"
-            {
-              [[ $1 =~ (^|,)$2($|,) ]]
-            } || {
-              echo "[Warning] $2 is not suppotted type! Skipped!"
-              contains_status="continue"
-            }
-        }
-
-        source activate e2e_ci
-        cp .github/scripts/inductor_perf_summary.py ../pytorch
-        cd ../pytorch
-        source /opt/intel/oneapi/pytorch-gpu-dev-0.5/oneapi-vars.sh
-        pip install styleFrame scipy pandas
-        set -xe
-        for suite in $(echo ${{ inputs.suite }} |sed 's/,/ /g')
-        do
-          contains "huggingface,timm_models,torchbench" $suite
-          $contains_status
-          dt=$(echo ${{ inputs.dt }} |sed 's/,/ /g')
-          mode=$(echo ${{ inputs.mode }} |sed 's/,/ /g')
-          python inductor_perf_summary.py -p ${dt} -s ${suite} -m ${mode}
-        done
+        dt=$(echo ${{ inputs.dt }} |sed 's/,/ /g')
+        mode=$(echo ${{ inputs.mode }} |sed 's/,/ /g')
+        suite=$(echo ${{ inputs.suite }} |sed 's/,/ /g')
+        scenario=$(echo ${{ inputs.scenario }} |sed 's/,/ /g')
+        python inductor_summary.py -p ${dt} -s ${suite} -m ${mode} -sc ${scenario}
+        

.github/workflows/nightly_ondemand.yml

@@ -62,7 +62,7 @@ on:
 permissions: read-all
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref_name }}-${{ github.ref_type == 'branch' && github.sha }}-${{ github.event_name == 'workflow_dispatch' }}-${{ github.event_name == 'schedule' }}-${{ inputs.suite }}-${{ inputs.dt }}-${{ inputs.mode }}-${{ inputs.scenario }}-${{ inputs.triton }}-${{ inputs.model }}
+  group: ${{ github.workflow }}-${{ github.sha }}-${{ github.event_name }}-${{ inputs.pytorch }}-${{ inputs.keep_torch_xpu_ops }}-${{ inputs.ut }}-${{ inputs.triton }}-${{ inputs.suite }}-${{ inputs.dt }}-${{ inputs.mode }}-${{ inputs.scenario }}-${{ inputs.model }}-${{ inputs.python }}
   cancel-in-progress: true
 
 jobs:
@@ -288,7 +288,7 @@ jobs:
 
   Tests-Failure-And-Report:
     if: ${{ ! cancelled() }}
-    runs-on: pvc_e2e
+    runs-on: [ self-hosted, Linux ]
     permissions:
       issues: write
     env: