after rebasing

Author: lowdy1

.github/workflows/_ascend_npu_torchtitan.yml

@@ -11,10 +11,6 @@ on:
         required: true
         type: string
         description: "The docker image which will be loaded"
-      device:
-        required: true
-        type: string
-        description: "The device selected to run on"
       torch-artifact:
         required: false
         type: string
@@ -28,14 +24,6 @@ on:
         description: "A token used to create a pull request"
         required: true
 
-# Bash shells do not use ~/.profile or ~/.bashrc so these shells need to be explicitly
-# declared as "shell: bash -el {0}" on steps that need to be properly activated.
-# It's used to activate ascend-toolkit environment variables.
-
-defaults:
-  run:
-    shell: bash -el {0}
-
 jobs:
   setup_environment:
     name: run torchtitan tests

.github/workflows/ascend_npu_test.yml

@@ -120,8 +120,6 @@ jobs:
       image: ${{ needs.prepare.outputs.image }}
       torch-artifact: ${{ needs.build-torch.outputs.torch-artifact }}
 
-<<<<<<< HEAD
-=======
   test:
     name: Test torch_npu
     needs:
@@ -135,7 +133,6 @@ jobs:
     with:
       runner: ${{ needs.prepare.outputs.runner }}
       image: ${{ needs.prepare.outputs.image }}
-      device: ${{ needs.prepare.outputs.device }}
       torch-artifact: ${{ needs.build-torch.outputs.torch-artifact }}
       torch-npu-artifact: ${{ needs.build.outputs.torch-npu-artifact }}
 
@@ -152,7 +149,6 @@ jobs:
     with:
       runner: ${{ needs.prepare.outputs.runner }}
       image: ${{ needs.prepare.outputs.image }}
-      device: ${{ needs.prepare.outputs.device }}
       torch-artifact: ${{ needs.build-torch.outputs.torch-artifact }}
       torch-npu-artifact: ${{ needs.build.outputs.torch-npu-artifact }}
     secrets:
@@ -171,7 +167,6 @@ jobs:
     with:
       runner: "linux-arm64-npu-4"
       image: ${{ needs.prepare.outputs.image }}
-      device:  ${{ needs.prepare.outputs.device }}
       torch-artifact: ${{ needs.build-torch.outputs.torch-artifact }}
       torch-npu-artifact: ${{ needs.build.outputs.torch-npu-artifact }}
     secrets: