Skip to content

Commit d7b3ada

Browse files
snnnjavier-intel
snnn
authored and
javier-intel
committed
Split DML nuget packaging jobs to a dedicated pipeline (microsoft#25014)
### Description Split DML nuget packaging jobs to a dedicated pipeline Remove Windows 32-bit packages from nuget pipelines. ### Motivation and Context To make the "Zip-Nuget-Java-Nodejs Packaging Pipeline" lighter.
1 parent ca06f19 commit d7b3ada

13 files changed

+118
-153
lines changed

‎tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml‎

Lines changed: 4 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ extends:
103103
spotBugs:
104104
enabled: false
105105
justificationForDisabling: "Getting ##[error]1. SpotBugs Error gdn.unknownFormatResult - File: spotbugs.xml, which indicates that SpotBugs found one or more errors, which are not handled by the Guardian right now."
106-
106+
codeql:
107+
compiled:
108+
enabled: false
109+
justificationForDisabling: 'CodeQL is taking nearly 6 hours resulting in timeouts in our production pipelines'
107110
stages:
108111
- template: stages/set_packaging_variables_stage.yml
109112
parameters:
@@ -173,71 +176,3 @@ extends:
173176
sln_platform: 'arm64'
174177
DoEsrp: ${{ parameters.DoEsrp }}
175178
DependsOnStageName: Windows_Nodejs_Packaging_x64
176-
177-
- template: nuget/templates/dml-vs-2022.yml
178-
parameters:
179-
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
180-
ArtifactName: 'drop-nuget-dml'
181-
StageName: 'Windows_CI_GPU_DML_Dev'
182-
BuildCommand: --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --enable_generic_interface --build_nodejs --cmake_generator "Visual Studio 17 2022" --use_vcpkg --use_vcpkg_ms_internal_asset_cache
183-
BuildArch: 'x64'
184-
msbuildArchitecture: 'amd64'
185-
EnvSetupScript: 'setup_env.bat'
186-
sln_platform: 'x64'
187-
DoDebugBuild: 'false'
188-
DoNugetPack: 'true'
189-
DoEsrp: ${{ parameters.DoEsrp }}
190-
NuPackScript: |
191-
msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} /p:CurrentData=$(BuildDate) /p:CurrentTime=$(BuildTime)
192-
copy $(Build.SourcesDirectory)\csharp\src\Microsoft.ML.OnnxRuntime\bin\RelWithDebInfo\*.nupkg $(Build.ArtifactStagingDirectory)
193-
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\*.nupkg $(Build.ArtifactStagingDirectory)
194-
mkdir $(Build.ArtifactStagingDirectory)\testdata
195-
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
196-
197-
- template: nuget/templates/dml-vs-2022.yml
198-
parameters:
199-
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
200-
ArtifactName: 'drop-win-dml-x86-zip'
201-
StageName: 'Windows_CI_GPU_DML_Dev_x86'
202-
BuildCommand: --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --enable_generic_interface --cmake_generator "Visual Studio 17 2022" --use_vcpkg --use_vcpkg_ms_internal_asset_cache
203-
BuildArch: 'x86'
204-
EnvSetupScript: 'setup_env_x86.bat'
205-
sln_platform: 'Win32'
206-
DoDebugBuild: 'false'
207-
DoNugetPack: 'true'
208-
DoEsrp: ${{ parameters.DoEsrp }}
209-
RunTests: 'false'
210-
NuPackScript: |
211-
msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /p:TargetArchitecture=x86 /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }}
212-
cd $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\
213-
ren Microsoft.ML.OnnxRuntime.DirectML.* win-dml-x86.zip
214-
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\win-dml-x86.zip $(Build.ArtifactStagingDirectory)
215-
mkdir $(Build.ArtifactStagingDirectory)\testdata
216-
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
217-
218-
- template: nuget/templates/dml-vs-2022.yml
219-
parameters:
220-
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
221-
ArtifactName: 'drop-win-dml-arm64-zip'
222-
StageName: 'Windows_CI_GPU_DML_Dev_arm64'
223-
BuildCommand: --build_dir $(Build.BinariesDirectory) --arm64 --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --enable_generic_interface --build_nodejs --cmake_generator "Visual Studio 17 2022" --use_vcpkg --use_vcpkg_ms_internal_asset_cache
224-
BuildArch: 'x64'
225-
EnvSetupScript: 'setup_env.bat'
226-
sln_platform: 'arm64'
227-
DoDebugBuild: 'false'
228-
DoNugetPack: 'true'
229-
DoEsrp: ${{ parameters.DoEsrp }}
230-
RunTests: 'false'
231-
NuPackScript: |
232-
msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /p:TargetArchitecture=arm64 /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }}
233-
cd $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\
234-
ren Microsoft.ML.OnnxRuntime.DirectML.* win-dml-arm64.zip
235-
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\win-dml-arm64.zip $(Build.ArtifactStagingDirectory)
236-
mkdir $(Build.ArtifactStagingDirectory)\testdata
237-
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
238-
239-
240-
241-
- template: stages/nuget_dml_packaging_stage.yml
242-
parameters:
243-
DoEsrp: ${{ parameters.DoEsrp }}

‎tools/ci_build/github/azure-pipelines/dml-nuget-packaging.yml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
resources:
2+
repositories:
3+
- repository: 1esPipelines
4+
type: git
5+
name: 1ESPipelineTemplates/1ESPipelineTemplates
6+
ref: refs/tags/release
7+
8+
parameters:
9+
- name: DoEsrp
10+
displayName: Run code sign tasks? Must be true if you are doing an ONNX Runtime release
11+
type: boolean
12+
default: true
13+
14+
- name: IsReleaseBuild
15+
displayName: Is a release build? Set it to true if you are doing an ONNX Runtime release.
16+
type: boolean
17+
default: false
18+
19+
- name: PreReleaseVersionSuffixString
20+
displayName: Suffix added to pre-release package version. Only used if IsReleaseBuild is true. Denotes the type of pre-release package.
21+
type: string
22+
values:
23+
- alpha
24+
- beta
25+
- rc
26+
- none
27+
default: none
28+
29+
- name: PreReleaseVersionSuffixNumber
30+
displayName: Number added to pre-release package version. Only used if IsReleaseBuild is true. Denotes the sequence of a pre-release package.
31+
type: number
32+
default: 0
33+
34+
extends:
35+
# The pipeline extends the 1ES PT which will inject different SDL and compliance tasks.
36+
# For non-production pipelines, use "Unofficial" as defined below.
37+
# For productions pipelines, use "Official".
38+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
39+
parameters:
40+
sdl:
41+
binskim:
42+
enabled: true
43+
analyzeTargetGlob: $(Build.ArtifactStagingDirectory)/**.dll
44+
sourceAnalysisPool: "Onnxruntime-Win-CPU-2022"
45+
componentgovernance:
46+
ignoreDirectories: $(Build.SourcesDirectory)/onnxruntime-inference-examples
47+
sourceRepositoriesToScan:
48+
exclude:
49+
- repository: onnxruntime-inference-examples
50+
spotBugs:
51+
enabled: false
52+
justificationForDisabling: "Getting ##[error]1. SpotBugs Error gdn.unknownFormatResult - File: spotbugs.xml, which indicates that SpotBugs found one or more errors, which are not handled by the Guardian right now."
53+
codeql:
54+
compiled:
55+
enabled: false
56+
justificationForDisabling: 'CodeQL is taking nearly 6 hours resulting in timeouts in our production pipelines'
57+
stages:
58+
- template: stages/set_packaging_variables_stage.yml
59+
parameters:
60+
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
61+
PreReleaseVersionSuffixString: ${{ parameters.PreReleaseVersionSuffixString }}
62+
PreReleaseVersionSuffixNumber: ${{ parameters.PreReleaseVersionSuffixNumber }}
63+
- template: nuget/templates/dml-vs-2022.yml
64+
parameters:
65+
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
66+
ArtifactName: 'drop-nuget-dml'
67+
StageName: 'Windows_CI_GPU_DML_Dev'
68+
BuildCommand: --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --enable_generic_interface --build_nodejs --cmake_generator "Visual Studio 17 2022" --use_vcpkg --use_vcpkg_ms_internal_asset_cache
69+
BuildArch: 'x64'
70+
msbuildArchitecture: 'amd64'
71+
EnvSetupScript: 'setup_env.bat'
72+
sln_platform: 'x64'
73+
DoDebugBuild: 'false'
74+
DoNugetPack: 'true'
75+
DoEsrp: ${{ parameters.DoEsrp }}
76+
NuPackScript: |
77+
msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} /p:CurrentData=$(BuildDate) /p:CurrentTime=$(BuildTime)
78+
copy $(Build.SourcesDirectory)\csharp\src\Microsoft.ML.OnnxRuntime\bin\RelWithDebInfo\*.nupkg $(Build.ArtifactStagingDirectory)
79+
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\*.nupkg $(Build.ArtifactStagingDirectory)
80+
mkdir $(Build.ArtifactStagingDirectory)\testdata
81+
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
82+
83+
- template: nuget/templates/dml-vs-2022.yml
84+
parameters:
85+
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
86+
ArtifactName: 'drop-win-dml-arm64-zip'
87+
StageName: 'Windows_CI_GPU_DML_Dev_arm64'
88+
BuildCommand: --build_dir $(Build.BinariesDirectory) --arm64 --skip_submodule_sync --build_shared_lib --enable_onnx_tests --enable_wcos --use_telemetry --use_dml --enable_generic_interface --build_nodejs --cmake_generator "Visual Studio 17 2022" --use_vcpkg --use_vcpkg_ms_internal_asset_cache
89+
BuildArch: 'x64'
90+
EnvSetupScript: 'setup_env.bat'
91+
sln_platform: 'arm64'
92+
DoDebugBuild: 'false'
93+
DoNugetPack: 'true'
94+
DoEsrp: ${{ parameters.DoEsrp }}
95+
RunTests: 'false'
96+
NuPackScript: |
97+
msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /p:TargetArchitecture=arm64 /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }}
98+
cd $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\
99+
ren Microsoft.ML.OnnxRuntime.DirectML.* win-dml-arm64.zip
100+
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\win-dml-arm64.zip $(Build.ArtifactStagingDirectory)
101+
mkdir $(Build.ArtifactStagingDirectory)\testdata
102+
copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
103+
104+
- template: stages/nuget_dml_packaging_stage.yml
105+
parameters:
106+
DoEsrp: ${{ parameters.DoEsrp }}

‎tools/ci_build/github/azure-pipelines/nuget/templates/dml-vs-2022.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ stages:
156156
${{if eq(variables['Build.SourceBranch'], 'refs/heads/main')}}:
157157
symbolExpiryTime: 60
158158
includePublicSymbolServer: true
159-
symbolsArtifactName: ${{parameters.artifactNameNoVersionString}}
159+
symbolsArtifactName: onnxruntime-dml-nuget-${{ parameters.BuildArch }}
160160
symbolsVersion: $(Build.BuildId)
161161
symbolProject: 'ONNX Runtime'
162162
subscription: 'OnnxrunTimeCodeSign_20240611'

‎tools/ci_build/github/azure-pipelines/nuget/templates/test_win.yml‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ parameters:
99
# For training packages, to differentiate the artifact name we add '-training' suffix. This needs to be passed from
1010
# the parent pipeline.
1111
TestDataArtifactSuffix: ''
12-
Skipx86Tests: 'false'
1312
CudaVersion: ''
1413
SpecificArtifact: false
1514
BuildId: ''
@@ -89,15 +88,6 @@ stages:
8988
env:
9089
PACKAGENAME: ${{ parameters.NugetPackageName }}
9190
92-
- ${{ if ne(parameters['Skipx86Tests'], 'true') }}:
93-
- script: |
94-
@echo "Running Runtest.bat"
95-
test\Microsoft.ML.OnnxRuntime.EndToEndTests\runtest.bat $(Build.BinariesDirectory)\nuget-artifact net8.0 x86 $(NuGetPackageVersionNumber)
96-
workingDirectory: '$(Build.SourcesDirectory)\csharp'
97-
displayName: 'Run End to End Test (C#) .Net Core x86'
98-
env:
99-
PACKAGENAME: ${{ parameters.NugetPackageName }}
100-
10191
# TODO: Add .Net Framework AnyCPU test task
10292

10393
- script: |
@@ -106,16 +96,4 @@ stages:
10696
workingDirectory: '$(Build.SourcesDirectory)\csharp'
10797
displayName: 'Run End to End Test (C#) .NetFramework x64'
10898
env:
109-
PACKAGENAME: ${{ parameters.NugetPackageName }}
110-
111-
- ${{ if ne(parameters['Skipx86Tests'], 'true') }}:
112-
- script: |
113-
@echo "Running Runtest.bat"
114-
test\Microsoft.ML.OnnxRuntime.EndToEndTests\runtest.bat $(Build.BinariesDirectory)\nuget-artifact net462 x86 $(NuGetPackageVersionNumber)
115-
workingDirectory: '$(Build.SourcesDirectory)\csharp'
116-
displayName: 'Run End to End Test (C#) .NetFramework x86'
117-
enabled: false
118-
env:
119-
PACKAGENAME: ${{ parameters.NugetPackageName }}
120-
121-
- template: ../../templates/clean-agent-build-directory-step.yml
99+
PACKAGENAME: ${{ parameters.NugetPackageName }}

‎tools/ci_build/github/azure-pipelines/py-cuda-packaging-pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ extends:
4949
codeql:
5050
compiled:
5151
enabled: false
52-
justificationForDisabling: 'CodeQL is taking nearly 4 hours resulting in timeouts in our production pipelines'
52+
justificationForDisabling: 'CodeQL is taking nearly 6 hours resulting in timeouts in our production pipelines'
5353
pool:
5454
name: 'onnxruntime-Win-CPU-2022' # Name of your hosted pool
5555
os: windows # OS of the image. This value cannot be a variable. Allowed values: windows, linux, macOS

‎tools/ci_build/github/azure-pipelines/stages/nuget-combine-cuda-stage.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ stages:
6666
NugetPackageName: 'Microsoft.ML.OnnxRuntime.Gpu'
6767
ArtifactSuffix: 'GPU'
6868
StageSuffix: 'GPU'
69-
Skipx86Tests: 'true'
7069
CudaVersion: ${{ parameters.CudaVersion }}
7170
SpecificArtifact: ${{ parameters.SpecificArtifact }}
7271
BuildId: ${{ parameters.BuildId }}
@@ -78,7 +77,6 @@ stages:
7877
ArtifactSuffix: 'GPU'
7978
StageSuffix: 'GPU'
8079
MoreSuffix: '_Windows'
81-
Skipx86Tests: 'true'
8280
CudaVersion: ${{ parameters.CudaVersion }}
8381
SpecificArtifact: ${{ parameters.SpecificArtifact }}
8482
BuildId: ${{ parameters.BuildId }}

‎tools/ci_build/github/azure-pipelines/stages/nuget_dml_packaging_stage.yml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ stages:
77
- stage: NuGet_Packaging_DML
88
dependsOn:
99
- Windows_CI_GPU_DML_Dev
10-
- Windows_CI_GPU_DML_Dev_x86
1110
- Windows_CI_GPU_DML_Dev_arm64
1211
condition: succeeded()
1312
jobs:
@@ -48,15 +47,6 @@ stages:
4847
unzip %%~ni.zip -d %%~ni
4948
del /Q %%~ni.zip
5049
51-
unzip win-dml-x86.zip -d win-x86
52-
mkdir %%~ni\runtimes\win-x86
53-
mkdir %%~ni\runtimes\win-x86\native
54-
55-
move win-x86\runtimes\win-x86\native\onnxruntime.dll %%~ni\runtimes\win-x86\native\onnxruntime.dll
56-
move win-x86\runtimes\win-x86\native\onnxruntime.lib %%~ni\runtimes\win-x86\native\onnxruntime.lib
57-
move win-x86\runtimes\win-x86\native\onnxruntime.pdb %%~ni\runtimes\win-x86\native\onnxruntime.pdb
58-
move win-x86\runtimes\win-x86\native\onnxruntime_providers_shared.dll %%~ni\runtimes\win-x86\native\onnxruntime_providers_shared.dll
59-
6050
unzip win-dml-arm64.zip -d win-arm64
6151
mkdir %%~ni\runtimes\win-arm64
6252
mkdir %%~ni\runtimes\win-arm64\native
@@ -88,7 +78,7 @@ stages:
8878
PackageType: 'nuget'
8979
PackagePath: '$(Build.ArtifactStagingDirectory)'
9080
PackageName: 'Microsoft.ML.OnnxRuntime.DirectML*nupkg'
91-
PlatformsSupported: 'win-x64,win-x86,win-arm64'
81+
PlatformsSupported: 'win-x64,win-arm64'
9282
VerifyNugetSigning: ${{ parameters.DoEsrp }}
9383

9484
- task: 1ES.PublishPipelineArtifact@1

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ stages:
6767
dependsOn: []
6868
jobs:
6969
- job: Windows_py_Wheels
70-
pool: 'onnxruntime-Win-CPU-2022'
70+
pool:
71+
name: 'onnxruntime-Win-CPU-2022'
72+
os: windows
7173
strategy:
7274
matrix:
7375
Python310_x64:

‎tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -163,20 +163,6 @@ stages:
163163
targetPath: '$(Build.BinariesDirectory)/artifacts'
164164
artifactName: 'onnxruntime-ios-full-xcframework'
165165

166-
167-
168-
- template: win-ci.yml
169-
parameters:
170-
DoEsrp: ${{ parameters.DoEsrp }}
171-
stage_name_suffix: CPU_x86_${{ parameters.BuildVariant }}
172-
buildArch: x86
173-
msbuildPlatform: Win32
174-
packageName: x86
175-
buildparameter: ${{ parameters.AdditionalBuildFlags }} ${{ parameters.AdditionalWinBuildFlags}}
176-
runTests: ${{ parameters.RunOnnxRuntimeTests }}
177-
buildJava: false
178-
buildNodejs: false
179-
180166
- template: win-ci.yml
181167
parameters:
182168
DoEsrp: ${{ parameters.DoEsrp }}
@@ -296,7 +282,6 @@ stages:
296282
- Setup
297283
- Linux_C_API_Packaging_CPU
298284
- MacOS_C_API_Package_Publish
299-
- Windows_Packaging_CPU_x86_${{ parameters.BuildVariant }}
300285
- Windows_Packaging_CPU_x64_${{ parameters.BuildVariant }}
301286
- Windows_Packaging_CPU_arm64_${{ parameters.BuildVariant }}
302287
- Android_Java_API_AAR_Packaging_Full
@@ -326,14 +311,6 @@ stages:
326311
SpecificArtifact: ${{ parameters.specificArtifact }}
327312
BuildId: ${{ parameters.BuildId }}
328313

329-
- template: flex-downloadPipelineArtifact.yml
330-
parameters:
331-
StepName: 'Download win-x86 Pipeline Artifact'
332-
ArtifactName: 'onnxruntime-win-x86'
333-
TargetPath: '$(Build.BinariesDirectory)/nuget-artifact'
334-
SpecificArtifact: ${{ parameters.specificArtifact }}
335-
BuildId: ${{ parameters.BuildId }}
336-
337314
- template: flex-downloadPipelineArtifact.yml
338315
parameters:
339316
StepName: 'Download win-arm64 Pipeline Artifact'
@@ -484,7 +461,7 @@ stages:
484461
PackageType: 'nuget'
485462
PackagePath: '$(Build.ArtifactStagingDirectory)'
486463
PackageName: 'Microsoft.ML.OnnxRuntime.*nupkg'
487-
PlatformsSupported: 'win-x64,win-x86,linux-x64,linux-arm64,osx-x64'
464+
PlatformsSupported: 'win-x64,linux-x64,linux-arm64,osx-x64'
488465
VerifyNugetSigning: false
489466

490467
- task: 1ES.PublishPipelineArtifact@1
@@ -806,7 +783,6 @@ stages:
806783
- template: ../nuget/templates/test_win.yml
807784
parameters:
808785
AgentPool: 'onnxruntime-Win-CPU-2022'
809-
Skipx86Tests: false
810786
NugetPackageName: 'Microsoft.ML.OnnxRuntime'
811787
ArtifactSuffix: 'CPU'
812788
SpecificArtifact: ${{ parameters.SpecificArtifact }}

‎tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-prebuild-steps.yml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,6 @@ steps:
4848
@echo ##vso[task.setvariable variable=vcvarsall]%vcvarsall%
4949
displayName: 'locate vcvarsall via vswhere'
5050
51-
- ${{ if eq(parameters.BuildArch, 'x86') }}:
52-
- script: |
53-
@echo off
54-
set vswherepath="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
55-
for /f "usebackq delims=" %%i in (`%vswherepath% -latest -property installationPath`) do (
56-
if exist "%%i\VC\Auxiliary\Build\vcvars32.bat" (
57-
set vcvarsall="%%i\VC\Auxiliary\Build\vcvars32.bat"
58-
)
59-
)
60-
61-
@echo %vcvarsall% will be used as the VC compiler
62-
@echo ##vso[task.setvariable variable=vcvarsall]%vcvarsall%
63-
displayName: 'locate vcvarsall via vswhere'
64-
6551
- task: BatchScript@1
6652
displayName: 'Setup VC env'
6753
inputs:

0 commit comments

Comments
 (0)