Skip to content

Commit e11df4e

Browse files
authored
[Ascend NPU][CI] Remove unused device args (#19)
This change has been verified in cosdt/pytorch-integration-tests#60
1 parent 9f71431 commit e11df4e

File tree

5 files changed

+1
-61
lines changed

5 files changed

+1
-61
lines changed

.github/workflows/_ascend_npu_benchmark.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ on:
1111
required: true
1212
type: string
1313
description: "The docker image which will be loaded"
14-
device:
15-
required: true
16-
type: string
17-
description: "The device selected to run on"
1814
torch-artifact:
1915
required: false
2016
type: string
@@ -28,13 +24,6 @@ on:
2824
description: "A token used to create a pull request"
2925
required: true
3026

31-
# Bash shells do not use ~/.profile or ~/.bashrc so these shells need to be explicitly
32-
# declared as "shell: bash -el {0}" on steps that need to be properly activated.
33-
# It's used to activate ascend-toolkit environment variables.
34-
defaults:
35-
run:
36-
shell: bash -el {0}
37-
3827
jobs:
3928
benchmark:
4029
name: run benchmarks for torch_npu

.github/workflows/_ascend_npu_build_torch.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ on:
2626
description: "The distribution artifact name of torch"
2727
value: ${{ jobs.build.outputs.dist-name }}
2828

29-
# Bash shells do not use ~/.profile or ~/.bashrc so these shells need to be explicitly
30-
# declared as "shell: bash -el {0}" on steps that need to be properly activated.
31-
# It's used to activate ascend-toolkit environment variables.
32-
defaults:
33-
run:
34-
shell: bash -el {0}
35-
3629
jobs:
3730
build:
3831
name: build torch for ${{ inputs.pr-number && format('#{0}', inputs.pr-number) || inputs.ref }}

.github/workflows/_ascend_npu_build_torch_npu.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ on:
1111
required: true
1212
type: string
1313
description: "The docker image which will be used to build"
14-
device:
15-
required: true
16-
type: string
17-
description: "The device selected to run on"
1814
torch-artifact:
1915
required: false
2016
type: string
@@ -28,13 +24,6 @@ on:
2824
description: "A token used to pull private repo"
2925
required: true
3026

31-
# Bash shells do not use ~/.profile or ~/.bashrc so these shells need to be explicitly
32-
# declared as "shell: bash -el {0}" on steps that need to be properly activated.
33-
# It's used to activate ascend-toolkit environment variables.
34-
defaults:
35-
run:
36-
shell: bash -el {0}
37-
3827
jobs:
3928
build:
4029
name: build torch_npu

.github/workflows/_ascend_npu_ut.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ on:
1111
required: true
1212
type: string
1313
description: "The docker image which will be loaded"
14-
device:
15-
required: true
16-
type: string
17-
description: "The device selected to run on"
1814
torch-artifact:
1915
required: false
2016
type: string
@@ -24,13 +20,6 @@ on:
2420
type: string
2521
description: "The distribution artifact name of torch_npu"
2622

27-
# Bash shells do not use ~/.profile or ~/.bashrc so these shells need to be explicitly
28-
# declared as "shell: bash -el {0}" on steps that need to be properly activated.
29-
# It's used to activate ascend-toolkit environment variables.
30-
defaults:
31-
run:
32-
shell: bash -el {0}
33-
3423
jobs:
3524
test:
3625
name: test torch_npu

.github/workflows/ascend_npu_test.yml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,6 @@ on:
5656
- ascendai/cann:latest
5757
default: "ascendai/cann:latest"
5858
description: "The docker image which will be loaded"
59-
device:
60-
required: true
61-
type: choice
62-
options:
63-
- /dev/davinci1
64-
- /dev/davinci2
65-
- /dev/davinci3
66-
- /dev/davinci4
67-
- /dev/davinci5
68-
- /dev/davinci6
69-
- /dev/davinci7
70-
- /dev/davinci8
71-
default: "/dev/davinci5"
72-
description: "The device selected to run on"
7359

7460
# Only cancel the previous runs when triggered by a pull_request event
7561
#
@@ -90,15 +76,13 @@ jobs:
9076
outputs:
9177
runner: ${{ steps.set-env.outputs.runner }}
9278
image: ${{ steps.set-env.outputs.image }}
93-
device: ${{ steps.set-env.outputs.device }}
9479
ref: ${{ steps.list-ref.outputs.ref }}
9580
pr-number: ${{ steps.list-ref.outputs.pr_number }}
9681
steps:
9782
- name: Set environment params
9883
id: set-env
9984
run: |
10085
echo "runner=${{ github.event.inputs.runner || 'linux-arm64-npu-1' }}" >> $GITHUB_OUTPUT
101-
echo "device=${{ github.event.inputs.device || '/dev/davinci5' }}" >> $GITHUB_OUTPUT
10286
echo "image=${{ github.event.inputs.image || 'ascendai/cann:latest' }}" >> $GITHUB_OUTPUT
10387
10488
# TODO(shink): List ghstack PR's ref
@@ -131,10 +115,9 @@ jobs:
131115
with:
132116
runner: ${{ needs.prepare.outputs.runner }}
133117
image: ${{ needs.prepare.outputs.image }}
134-
device: ${{ needs.prepare.outputs.device }}
135118
torch-artifact: ${{ needs.build-torch.outputs.torch-artifact }}
136119
secrets:
137-
runner-token: ${{ secrets.ASCEND_RUNNER_TOKEN }}
120+
runner-token: ${{ secrets.ASCEND_RUNNER_TOKEN }}
138121

139122
test:
140123
name: Test torch_npu
@@ -149,7 +132,6 @@ jobs:
149132
with:
150133
runner: ${{ needs.prepare.outputs.runner }}
151134
image: ${{ needs.prepare.outputs.image }}
152-
device: ${{ needs.prepare.outputs.device }}
153135
torch-artifact: ${{ needs.build-torch.outputs.torch-artifact }}
154136
torch-npu-artifact: ${{ needs.build.outputs.torch-npu-artifact }}
155137

@@ -159,15 +141,13 @@ jobs:
159141
- prepare
160142
- build-torch
161143
- build
162-
- test
163144
if: |
164145
!cancelled() && github.event_name != 'repository_dispatch' &&
165146
(success() || (needs.build-torch.result == 'skipped' && needs.build.result == 'success'))
166147
uses: ./.github/workflows/_ascend_npu_benchmark.yml
167148
with:
168149
runner: ${{ needs.prepare.outputs.runner }}
169150
image: ${{ needs.prepare.outputs.image }}
170-
device: ${{ needs.prepare.outputs.device }}
171151
torch-artifact: ${{ needs.build-torch.outputs.torch-artifact }}
172152
torch-npu-artifact: ${{ needs.build.outputs.torch-npu-artifact }}
173153
secrets:

0 commit comments

Comments
 (0)