diff --git a/.github/workflows/_ascend_npu_benchmark.yml b/.github/workflows/_ascend_npu_benchmark.yml index 9b262ab..ab7177b 100644 --- a/.github/workflows/_ascend_npu_benchmark.yml +++ b/.github/workflows/_ascend_npu_benchmark.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,13 +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: benchmark: name: run benchmarks for torch_npu diff --git a/.github/workflows/_ascend_npu_build_torch.yml b/.github/workflows/_ascend_npu_build_torch.yml index e01dff6..1b387bc 100644 --- a/.github/workflows/_ascend_npu_build_torch.yml +++ b/.github/workflows/_ascend_npu_build_torch.yml @@ -26,13 +26,6 @@ on: description: "The distribution artifact name of torch" value: ${{ jobs.build.outputs.dist-name }} -# 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: build: name: build torch for ${{ inputs.pr-number && format('#{0}', inputs.pr-number) || inputs.ref }} diff --git a/.github/workflows/_ascend_npu_build_torch_npu.yml b/.github/workflows/_ascend_npu_build_torch_npu.yml index 71e1c27..a20142d 100644 --- a/.github/workflows/_ascend_npu_build_torch_npu.yml +++ b/.github/workflows/_ascend_npu_build_torch_npu.yml @@ -11,10 +11,6 @@ on: required: true type: string description: "The docker image which will be used to build" - device: - required: true - type: string - description: "The device selected to run on" torch-artifact: required: false type: string @@ -28,13 +24,6 @@ on: description: "A token used to pull private repo" 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: build: name: build torch_npu diff --git a/.github/workflows/_ascend_npu_ut.yml b/.github/workflows/_ascend_npu_ut.yml index b4b6a66..92f4b37 100644 --- a/.github/workflows/_ascend_npu_ut.yml +++ b/.github/workflows/_ascend_npu_ut.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 @@ -24,13 +20,6 @@ on: type: string description: "The distribution artifact name of torch_npu" -# 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: test: name: test torch_npu diff --git a/.github/workflows/ascend_npu_test.yml b/.github/workflows/ascend_npu_test.yml index e693d0d..0cae7ab 100644 --- a/.github/workflows/ascend_npu_test.yml +++ b/.github/workflows/ascend_npu_test.yml @@ -56,20 +56,6 @@ on: - ascendai/cann:latest default: "ascendai/cann:latest" description: "The docker image which will be loaded" - device: - required: true - type: choice - options: - - /dev/davinci1 - - /dev/davinci2 - - /dev/davinci3 - - /dev/davinci4 - - /dev/davinci5 - - /dev/davinci6 - - /dev/davinci7 - - /dev/davinci8 - default: "/dev/davinci5" - description: "The device selected to run on" # Only cancel the previous runs when triggered by a pull_request event # @@ -90,7 +76,6 @@ jobs: outputs: runner: ${{ steps.set-env.outputs.runner }} image: ${{ steps.set-env.outputs.image }} - device: ${{ steps.set-env.outputs.device }} ref: ${{ steps.list-ref.outputs.ref }} pr-number: ${{ steps.list-ref.outputs.pr_number }} steps: @@ -98,7 +83,6 @@ jobs: id: set-env run: | echo "runner=${{ github.event.inputs.runner || 'linux-arm64-npu-1' }}" >> $GITHUB_OUTPUT - echo "device=${{ github.event.inputs.device || '/dev/davinci5' }}" >> $GITHUB_OUTPUT echo "image=${{ github.event.inputs.image || 'ascendai/cann:latest' }}" >> $GITHUB_OUTPUT # TODO(shink): List ghstack PR's ref @@ -131,10 +115,9 @@ 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 }} secrets: - runner-token: ${{ secrets.ASCEND_RUNNER_TOKEN }} + runner-token: ${{ secrets.ASCEND_RUNNER_TOKEN }} test: name: Test torch_npu @@ -149,7 +132,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 }} @@ -159,7 +141,6 @@ jobs: - prepare - build-torch - build - - test if: | !cancelled() && github.event_name != 'repository_dispatch' && (success() || (needs.build-torch.result == 'skipped' && needs.build.result == 'success')) @@ -167,7 +148,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: