Skip to content

Commit 6c8097a

Browse files
authored
Qnn nuget package update for arm64x (#24690) (#24694)
### Description Update the folder name from win-arm64x to win-arm64 since it is invalid RID: https://learn.microsoft.com/en-us/dotnet/core/rid-catalog#windows-rids ### Description cherry-pick from #24690
1 parent 6b0f7c9 commit 6c8097a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

csharp/src/Microsoft.ML.OnnxRuntime/targets/netstandard/props_qnn.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemDefinitionGroup Condition="'$(PlatformTarget)' == 'ARM64'">
1414
<Link>
15-
<AdditionalDependencies>$(MSBuildThisFileDirectory)../../runtimes/win-arm64x/native/onnxruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
15+
<AdditionalDependencies>$(MSBuildThisFileDirectory)../../runtimes/win-arm64/native/onnxruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
1616
</Link>
1717
</ItemDefinitionGroup>
1818

@@ -24,7 +24,7 @@
2424

2525
<ItemDefinitionGroup Condition="'$(PlatformTarget)' == 'x64' OR ('$(PlatformTarget)' == 'AnyCPU' AND '$(Prefer32Bit)' != 'true')">
2626
<Link>
27-
<AdditionalDependencies>$(MSBuildThisFileDirectory)../../runtimes/win-arm64x/native/onnxruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
27+
<AdditionalDependencies>$(MSBuildThisFileDirectory)../../runtimes/win-arm64/native/onnxruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
2828
</Link>
2929
</ItemDefinitionGroup>
3030

@@ -36,7 +36,7 @@
3636

3737
<PropertyGroup>
3838
<EnginePlatform Condition="'$(Platform)' == 'Win32'">x86</EnginePlatform>
39-
<EnginePlatform Condition="'$(Platform)' == 'ARM64'">arm64x</EnginePlatform>
39+
<EnginePlatform Condition="'$(Platform)' == 'ARM64'">arm64</EnginePlatform>
4040
<EnginePlatform Condition="'$(Platform)' == 'ARM'">arm</EnginePlatform>
4141
<EnginePlatform Condition="'$(Platform)' != 'Win32' AND '$(Platform)' != 'ARM64'">$(Platform)</EnginePlatform>
4242
</PropertyGroup>
@@ -47,31 +47,31 @@
4747

4848
<ItemGroup>
4949
<!-- x64 -->
50-
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64x\native\onnxruntime.dll"
50+
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\onnxruntime.dll"
5151
Condition="('$(PlatformTarget)' == 'x64' OR ('$(PlatformTarget)' == 'AnyCPU' AND '$(Prefer32Bit)' != 'true')) AND
52-
Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64x\native\onnxruntime.dll')">
52+
Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\onnxruntime.dll')">
5353
<Link>onnxruntime.dll</Link>
5454
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5555
<Visible>false</Visible>
5656
</None>
57-
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64x\native\onnxruntime_providers_shared.dll"
57+
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\onnxruntime_providers_shared.dll"
5858
Condition="('$(PlatformTarget)' == 'x64' OR ('$(PlatformTarget)' == 'AnyCPU' AND '$(Prefer32Bit)' != 'true')) AND
59-
Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64x\native\onnxruntime_providers_shared.dll')">
59+
Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\onnxruntime_providers_shared.dll')">
6060
<Link>onnxruntime_providers_shared.dll</Link>
6161
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6262
<Visible>false</Visible>
6363
</None>
6464

6565
<!-- arm64 -->
66-
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64x\native\onnxruntime.dll"
66+
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\onnxruntime.dll"
6767
Condition="'$(PlatformTarget)' == 'ARM64'">
6868
<Link>onnxruntime.dll</Link>
6969
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7070
<Visible>false</Visible>
7171
</None>
72-
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64x\native\onnxruntime_providers_shared.dll"
72+
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\onnxruntime_providers_shared.dll"
7373
Condition="'$(PlatformTarget)' == 'ARM64' AND
74-
Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64x\native\onnxruntime_providers_shared.dll')">
74+
Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\onnxruntime_providers_shared.dll')">
7575
<Link>onnxruntime_providers_shared.dll</Link>
7676
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7777
<Visible>false</Visible>

tools/ci_build/github/azure-pipelines/templates/qnn-ep-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ stages:
9898
solution: '$(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj'
9999
platform: 'Any CPU'
100100
configuration: ${{ parameters.build_config }}
101-
msbuildArguments: '-t:CreatePackage -p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)" -p:OrtPackageId=$(OrtPackageId) -p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} -p:TargetArchitecture=arm64x'
101+
msbuildArguments: '-t:CreatePackage -p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)" -p:OrtPackageId=$(OrtPackageId) -p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} -p:TargetArchitecture=arm64'
102102
workingDirectory: '$(Build.SourcesDirectory)\csharp'
103103

104104
- task: CopyFiles@2

0 commit comments

Comments
 (0)