Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,5 @@ extends:
QnnSdk: ${{ parameters.QnnSdk }}
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
DoEsrp: ${{ parameters.DoEsrp }}
ArtifactName: 'drop-nuget-qnn-arm64x'
StageName: 'OnnxRuntime_QNN_Nuget_Win_Arm64x'
build_config: ${{ parameters.build_config }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Runs a Windows ARM64X build in `buildDirectory`.

parameters:
buildDirectory: '$(Build.BinariesDirectory)'
additionalBuildPyArgs: ''

steps:
- task: PythonScript@0
displayName: 'Build arm64 project for arm64x - generate the def & lib file for next build'
inputs:
scriptPath: '$(Build.SourcesDirectory)\tools\ci_build\build.py'
arguments: >
${{ parameters.additionalBuildPyArgs }}
--build_shared_lib
--arm64
--buildasx
--build_dir="${{ parameters.buildDirectory }}/arm64"

- task: PythonScript@0
displayName: 'Build arm64ec project for arm64x - the real arm64x'
inputs:
scriptPath: '$(Build.SourcesDirectory)\tools\ci_build\build.py'
arguments: >
${{ parameters.additionalBuildPyArgs }}
--build_shared_lib
--arm64ec
--buildasx
--build_dir="${{ parameters.buildDirectory }}"

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ parameters:
default: 'RelWithDebInfo'

- name: artifactName
displayName: artifactNamelike 'onnxruntime-win-x64-1.6.0'
displayName: artifactName, like 'onnxruntime-win-x64-1.6.0'
type: string
default: ''

Expand All @@ -30,6 +30,11 @@ parameters:
type: boolean
default: true

- name: publishArtifactStagingDirectory
displayName: Whether to publish the artifact staging directory as an artifact named `artifactNameNoVersionString`.
type: boolean
default: false

steps:
- ${{if or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/rel-'))}}:
- template: publish-symbolrequestprod-api.yml
Expand Down Expand Up @@ -89,6 +94,7 @@ steps:
copy $(Build.BinariesDirectory)\${{parameters.buildConfig}}\${{parameters.buildConfig}}\QnnHtpV81Stub.dll $(Build.BinariesDirectory)\${{parameters.artifactName}}\lib
copy $(Build.BinariesDirectory)\${{parameters.buildConfig}}\${{parameters.buildConfig}}\QnnSaver.dll $(Build.BinariesDirectory)\${{parameters.artifactName}}\lib
copy $(Build.BinariesDirectory)\${{parameters.buildConfig}}\${{parameters.buildConfig}}\QnnSystem.dll $(Build.BinariesDirectory)\${{parameters.artifactName}}\lib
copy $(Build.BinariesDirectory)\${{parameters.buildConfig}}\${{parameters.buildConfig}}\Qualcomm_LICENSE.pdf $(Build.BinariesDirectory)\${{parameters.artifactName}}

# copy trt ep libraries only when trt ep is enabled
copy $(Build.BinariesDirectory)\${{parameters.buildConfig}}\${{parameters.buildConfig}}\onnxruntime_providers_tensorrt.dll $(Build.BinariesDirectory)\${{parameters.artifactName}}\lib
Expand Down Expand Up @@ -133,3 +139,9 @@ steps:
archiveType: 'zip' # Options: zip, 7z, tar, wim
archiveFile: '$(Build.ArtifactStagingDirectory)\${{parameters.artifactName}}.zip'
replaceExistingArchive: true

- ${{ if parameters.publishArtifactStagingDirectory }}:
- task: 1ES.PublishPipelineArtifact@1
inputs:
targetPath: '$(Build.ArtifactStagingDirectory)'
artifactName: '${{parameters.artifactNameNoVersionString}}'
14 changes: 14 additions & 0 deletions tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,20 @@ stages:
PreReleaseVersionSuffixString: ${{ parameters.PreReleaseVersionSuffixString }}
PreReleaseVersionSuffixNumber: ${{ parameters.PreReleaseVersionSuffixNumber }}

- template: win-ci.yml
parameters:
DoEsrp: true
stage_name_suffix: CPU_arm64x_${{ parameters.BuildVariant }}
buildArch: x64
msbuildPlatform: arm64x
packageName: arm64x
buildparameter: ${{ parameters.AdditionalBuildFlags }} ${{ parameters.AdditionalWinBuildFlags}}
runTests: false
buildJava: false
buildNodejs: false
PreReleaseVersionSuffixString: ${{ parameters.PreReleaseVersionSuffixString }}
PreReleaseVersionSuffixNumber: ${{ parameters.PreReleaseVersionSuffixNumber }}

- template: win-ci.yml
parameters:
DoEsrp: true
Expand Down
20 changes: 7 additions & 13 deletions tools/ci_build/github/azure-pipelines/templates/qnn-ep-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ stages:
variables:
OrtPackageId: ${{ parameters.OrtNugetPackageId }}
ReleaseVersionSuffix: $[stageDependencies.Setup.Set_Variables.outputs['Set_Release_Version_Suffix.ReleaseVersionSuffix']]
commonBuildArgs: '--skip_submodule_sync --build_shared_lib --client_package_build --cmake_generator "Visual Studio 17 2022" --config ${{ parameters.build_config }} --parallel --use_vcpkg --use_vcpkg_ms_internal_asset_cache --use_binskim_compliant_compile_flags ${{ parameters.AdditionalBuildArgs}}'
commonBuildArgs: '--skip_submodule_sync --build_shared_lib --client_package_build --cmake_generator "Visual Studio 17 2022" --config ${{ parameters.build_config }} --parallel --use_vcpkg --use_vcpkg_ms_internal_asset_cache --use_binskim_compliant_compile_flags --config ${{ parameters.build_config }} ${{ parameters.AdditionalBuildArgs}}'

steps:
- template: set-version-number-variables-step.yml
Expand All @@ -61,17 +61,10 @@ stages:
parameters:
QnnSDKVersion: ${{ parameters.QnnSdk }}

- task: PythonScript@0
displayName: 'Build arm64x project - generate the def & lib file for next build'
inputs:
scriptPath: '$(Build.SourcesDirectory)\tools\ci_build\build.py'
arguments: ' --arm64 --buildasx --build_dir $(Build.BinariesDirectory)\arm64x --use_qnn --qnn_home $(QnnSDKRootDir) $(commonBuildArgs)'

- task: PythonScript@0
displayName: 'Build arm64ecx project - the real arm64x'
inputs:
scriptPath: '$(Build.SourcesDirectory)\tools\ci_build\build.py'
arguments: ' --arm64ec --buildasx --build_dir $(Build.BinariesDirectory) --use_qnn --qnn_home $(QnnSDKRootDir) $(commonBuildArgs)'
- template: build-win-arm64x-steps.yml
parameters:
buildDirectory: '$(Build.BinariesDirectory)'
additionalBuildPyArgs: '$(commonBuildArgs) --use_qnn --qnn_home $(QnnSDKRootDir)'

- task: CmdLine@2
displayName: 'Print contents of binaries directory'
Expand All @@ -87,12 +80,13 @@ stages:
Pattern: 'onnxruntime*.dll'

- ${{ if eq(parameters.PublishArchive, true) }}:
- template: c-api-artifacts-package-and-publish-steps-windows-qnn.yml
- template: c-api-artifacts-package-and-publish-steps-windows.yml
parameters:
buildConfig: ${{ parameters.build_config }}
artifactName: 'onnxruntime-win-arm64x-qnn'
artifactNameNoVersionString: 'onnxruntime-win-arm64x-qnn'
DoEsrp: ${{ parameters.DoEsrp }}
publishArtifactStagingDirectory: true

- task: MSBuild@1
displayName: 'Restore NuGet Packages and create project.assets.json'
Expand Down
32 changes: 32 additions & 0 deletions tools/ci_build/github/azure-pipelines/templates/set-variable.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Sets an ADO pipeline variable.
# See https://learn.microsoft.com/en-us/azure/devops/pipelines/process/set-variables-scripts

parameters:
- name: name
type: string

- name: value
type: string

steps:
- task: PythonScript@0
displayName: 'Set variable - ${{ parameters.name }}'
inputs:
scriptSource: inline
script: |
import os

variable_name = os.getenv("VARIABLE_NAME")
variable_value = os.getenv("VARIABLE_VALUE")

if not variable_name.isidentifier():
raise ValueError(f"Variable name is not a valid identifier: '{variable_name}'")

if "\n" in variable_value:
raise ValueError(f"Variable value should not contain any newlines: '{variable_value}'")

print(f"Setting variable: {variable_name} = '{variable_value}'")
print(f"##vso[task.setvariable variable={variable_name}]{variable_value}")
env:
VARIABLE_NAME: ${{ parameters.name }}
VARIABLE_VALUE: ${{ parameters.value }}
Loading
Loading