Skip to content

Commit bd99d44

Browse files
committed
Code review comments
1 parent d5df1b6 commit bd99d44

File tree

2 files changed

+13
-25
lines changed

2 files changed

+13
-25
lines changed

tools/ci_build/github/azure-pipelines/stages/py-cpu-packaging-stage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ stages:
6868
jobs:
6969
- template: ../templates/py-win-cpu.yml
7070
parameters:
71-
ARCHITECTURE: 'x64'
71+
architecture: 'x64'
7272
build_py_parameters: ${{ parameters.build_py_parameters }}
7373
cmake_build_type: ${{ parameters.cmake_build_type }}
7474

7575
- template: ../templates/py-win-cpu.yml
7676
parameters:
77-
ARCHITECTURE: 'arm64'
77+
architecture: 'arm64'
7878
build_py_parameters: ${{ parameters.build_py_parameters }}
7979
cmake_build_type: ${{ parameters.cmake_build_type }}
8080

tools/ci_build/github/azure-pipelines/templates/py-win-cpu.yml

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
parameters:
2-
- name: ARCHITECTURE
2+
- name: architecture
33
type: string
44
default: 'x64'
55
values:
@@ -22,8 +22,8 @@ parameters:
2222
- MinSizeRel
2323

2424
jobs:
25-
- job: Windows_py_Wheels_${{parameters.ARCHITECTURE}}
26-
${{ if eq(parameters.ARCHITECTURE, 'arm64') }}:
25+
- job: Windows_py_Wheels_${{parameters.architecture}}
26+
${{ if eq(parameters.architecture, 'arm64') }}:
2727
pool:
2828
name: 'onnxruntime-qnn-windows-vs-2022-arm64'
2929
os: windows
@@ -46,7 +46,7 @@ jobs:
4646
binskim:
4747
enabled: true
4848
scanOutputDirectoryOnly: true
49-
${{ if eq(parameters.ARCHITECTURE, 'arm64') }}:
49+
${{ if eq(parameters.architecture, 'arm64') }}:
5050
outputs:
5151
- output: pipelineArtifact
5252
targetPath: $(Build.ArtifactStagingDirectory)
@@ -58,13 +58,13 @@ jobs:
5858
artifactName: onnxruntime-win-$(PythonVersion)
5959
strategy:
6060
matrix:
61-
Python311_${{parameters.ARCHITECTURE}}:
61+
Python311_${{parameters.architecture}}:
6262
PythonVersion: '3.11'
63-
Python312_${{parameters.ARCHITECTURE}}:
63+
Python312_${{parameters.architecture}}:
6464
PythonVersion: '3.12'
65-
Python313_${{parameters.ARCHITECTURE}}:
65+
Python313_${{parameters.architecture}}:
6666
PythonVersion: '3.13'
67-
Python314_${{parameters.ARCHITECTURE}}:
67+
Python314_${{parameters.architecture}}:
6868
PythonVersion: '3.14'
6969
variables:
7070
OnnxRuntimeBuildDirectory: '$(Build.BinariesDirectory)'
@@ -80,7 +80,7 @@ jobs:
8080

8181
- template: setup-build-tools.yml
8282
parameters:
83-
host_cpu_arch: ${{parameters.ARCHITECTURE}}
83+
host_cpu_arch: ${{parameters.architecture}}
8484
python_version: $(PythonVersion)
8585

8686
- template: set-nightly-build-option-variable-step.yml
@@ -105,25 +105,13 @@ jobs:
105105
--parallel --use_binskim_compliant_compile_flags --update
106106
$(TelemetryOption)
107107
108-
# - task: VSBuild@1
109-
# displayName: 'Build'
110-
# inputs:
111-
# solution: '$(Build.SourcesDirectory)\${{ parameters.cmake_build_type }}\onnxruntime.sln'
112-
# platform: '${{parameters.ARCHITECTURE}}'
113-
# configuration: ${{ parameters.cmake_build_type }}
114-
# msbuildArchitecture: '${{parameters.ARCHITECTURE}}'
115-
# maximumCpuCount: true
116-
# logProjectEvents: true
117-
# workingFolder: '$(Build.SourcesDirectory)\${{ parameters.cmake_build_type }}'
118-
# createLogFile: true
119-
120108
- ${{if or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/rel-'))}}:
121109
- template: publish-symbolrequestprod-api.yml
122110
parameters:
123111
${{if eq(variables['Build.SourceBranch'], 'refs/heads/main')}}:
124112
symbolExpiryTime: 60
125113
includePublicSymbolServer: true
126-
symbolsArtifactName: onnxruntime_cpu_win_${{ parameters.ARCHITECTURE }}_$(PythonVersion)
114+
symbolsArtifactName: onnxruntime_cpu_win_${{ parameters.architecture }}_$(PythonVersion)
127115
symbolsVersion: $(Build.BuildId)
128116
symbolProject: 'ONNX Runtime'
129117
subscription: 'OnnxrunTimeCodeSign_20240611'
@@ -167,7 +155,7 @@ jobs:
167155
Remove-Item -Recurse -Force onnxruntime
168156
if ("$(ExtraParam)".Split() -contains "--use_azure") {
169157
170-
if( "${{parameters.ARCHITECTURE}}" -eq 'arm64') {
158+
if( "${{parameters.architecture}}" -eq 'arm64') {
171159
$env:path="$(Build.SourcesDirectory)\build\${{ parameters.cmake_build_type }}\_deps\vcpkg-src\installed\arm64-windows\bin;$env:path"
172160
} else {
173161
$env:path="$(Build.SourcesDirectory)\build\${{ parameters.cmake_build_type }}\_deps\vcpkg-src\installed\x64-windows\bin;$(Build.SourcesDirectory)\build\${{ parameters.cmake_build_type }}\_deps\vcpkg-src\installed\x86-windows\bin;$env:path"

0 commit comments

Comments
 (0)