Skip to content

Commit

Permalink
change pool
Browse files Browse the repository at this point in the history
  • Loading branch information
snnn committed Jul 11, 2024
1 parent 0c2efb5 commit 23868e1
Show file tree
Hide file tree
Showing 16 changed files with 45 additions and 45 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ parameters:
BuildArch: 'x64' # Optional. Options: x86, x64
sln_platform: 'x64' # Options: Win32, x64, arm, arm64
EnvSetupScript: 'setup_env.bat'
AgentPool: 'onnxruntime-Win-CPU-2022'
AgentPool: 'onnxruntime-Win-CPU-2022-beta'
AgentDemands: []
OrtPackageId: Microsoft.ML.OnnxRuntime.DirectML
BuildConfigurations: ['RelWithDebInfo'] # Options: Debug, RelWithDebInfo
Expand Down
34 changes: 17 additions & 17 deletions tools/ci_build/github/azure-pipelines/post-merge-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ stages:
runTests: true
buildJava: false
buildNodejs: false
ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

- template: templates/win-ci.yml
parameters:
Expand All @@ -46,7 +46,7 @@ stages:
runTests: false
buildJava: false
buildNodejs: true
ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

- template: templates/win-ci.yml
parameters:
Expand All @@ -60,7 +60,7 @@ stages:
runTests: false
buildJava: false
buildNodejs: false
ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

- template: templates/win-ci.yml
parameters:
Expand All @@ -74,7 +74,7 @@ stages:
runTests: true
buildJava: true
buildNodejs: true
ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

- template: templates/win-ci.yml
parameters:
Expand All @@ -89,7 +89,7 @@ stages:
runTests: true
buildJava: false
buildNodejs: false
ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

- template: templates/win-ci.yml
parameters:
Expand All @@ -104,7 +104,7 @@ stages:
runTests: false
buildJava: false
buildNodejs: true
ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

- template: templates/win-ci.yml
parameters:
Expand All @@ -119,7 +119,7 @@ stages:
runTests: false
buildJava: false
buildNodejs: false
ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

- template: templates/win-ci.yml
parameters:
Expand All @@ -134,7 +134,7 @@ stages:
runTests: true
buildJava: true
buildNodejs: true
ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

- template: templates/win-ci.yml
parameters:
Expand All @@ -149,7 +149,7 @@ stages:
runTests: true
buildJava: false
buildNodejs: false
ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

- template: templates/win-ci.yml
parameters:
Expand All @@ -164,7 +164,7 @@ stages:
runTests: false
buildJava: false
buildNodejs: true
ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

#- template: templates/win-ci.yml
# parameters:
Expand All @@ -179,7 +179,7 @@ stages:
# runTests: false
# buildJava: false
# buildNodejs: false
# ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
# ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

- template: templates/win-ci.yml
parameters:
Expand All @@ -194,7 +194,7 @@ stages:
runTests: true
buildJava: true
buildNodejs: true
ort_build_pool_name: 'onnxruntime-Win-CPU-2022'
ort_build_pool_name: 'onnxruntime-Win-CPU-2022-beta'

- ${{ if or(startsWith(variables['System.CollectionUri'], 'https://dev.azure.com/aiinfra/'),startsWith(variables['System.CollectionUri'], 'https://aiinfra.visualstudio.com/')) }}:
# The settings below is the same as Windows GPU CI pipeline's CUDA job except here we set OnnxruntimeTestGpuDeviceId to 1
Expand Down Expand Up @@ -253,7 +253,7 @@ stages:
ORT_EP_NAME: CPU
GenerateDocumentation: false
EnablePython: false
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'

- stage: MemoryProfiling
dependsOn: [ ]
Expand All @@ -272,7 +272,7 @@ stages:
ORT_EP_NAME: CPU
GenerateDocumentation: false
EnablePython: false
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'

- stage: MinimalBuildWithNoExceptions
dependsOn: [ ]
Expand All @@ -291,7 +291,7 @@ stages:
ORT_EP_NAME: CPU
GenerateDocumentation: false
EnablePython: false
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'

- stage: DebugNodeInputsOutputs
dependsOn: [ ]
Expand All @@ -310,7 +310,7 @@ stages:
ORT_EP_NAME: CPU
GenerateDocumentation: false
EnablePython: false
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'

- stage: NeuralSpeed
dependsOn: [ ]
Expand All @@ -329,7 +329,7 @@ stages:
ORT_EP_NAME: CPU
GenerateDocumentation: false
EnablePython: false
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'

#Generate test coverage report and publish the data to a Cloud database. Only runs daily.
- stage: CodeCoverage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ stages:
- job: Jar_Packaging_GPU
workspace:
clean: all
pool: 'onnxruntime-Win-CPU-2022'
pool: 'onnxruntime-Win-CPU-2022-beta'
dependsOn: []
condition: succeeded()
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stages:
condition: ${{ eq(parameters.artifact_feed, 'onnxruntime-cuda-12') }}
workspace:
clean: all
pool: 'onnxruntime-Win-CPU-2022'
pool: 'onnxruntime-Win-CPU-2022-beta'
variables:
- name: SYSTEM_ACCESSTOKEN
value: $(System.AccessToken)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ stages:
variables:
- name: GDN_CODESIGN_TARGETDIRECTORY
value: '$(Build.BinariesDirectory)/nuget-artifact/final-package'
pool: 'onnxruntime-Win-CPU-2022'
pool: 'onnxruntime-Win-CPU-2022-beta'
steps:
- checkout: none

Expand Down
12 changes: 6 additions & 6 deletions tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ stages:
- job: Jar_Packaging
workspace:
clean: all
pool: 'onnxruntime-Win-CPU-2022'
pool: 'onnxruntime-Win-CPU-2022-beta'

steps:
- checkout: self
Expand Down Expand Up @@ -275,7 +275,7 @@ stages:
- job: NuGet_Packaging_CPU
workspace:
clean: all
pool: 'onnxruntime-Win-CPU-2022'
pool: 'onnxruntime-Win-CPU-2022-beta'
variables:
OrtPackageId: ${{ parameters.OrtNugetPackageId }}
breakCodesignValidationInjection: ${{ parameters.DoEsrp }}
Expand Down Expand Up @@ -498,7 +498,7 @@ stages:
- job: Nodejs_Packaging
workspace:
clean: all
pool: 'onnxruntime-Win-CPU-2022'
pool: 'onnxruntime-Win-CPU-2022-beta'
variables:
${{ if eq(parameters.IsReleaseBuild, true) }}:
NpmPackagingMode: 'release'
Expand Down Expand Up @@ -763,7 +763,7 @@ stages:

- template: ../nuget/templates/test_win.yml
parameters:
AgentPool : 'onnxruntime-Win-CPU-2022'
AgentPool : 'onnxruntime-Win-CPU-2022-beta'
Skipx86Tests : false
NugetPackageName : 'Microsoft.ML.OnnxRuntime'
ArtifactSuffix: 'CPU'
Expand All @@ -785,7 +785,7 @@ stages:

- template: ../nodejs/templates/test_win.yml
parameters:
AgentPool : 'onnxruntime-Win-CPU-2022'
AgentPool : 'onnxruntime-Win-CPU-2022-beta'
StageSuffix : 'Win_CPU_x64'

- template: ../nodejs/templates/test_linux.yml
Expand All @@ -802,7 +802,7 @@ stages:
OS: Windows
BuildId: ${{ parameters.BuildId }}
SpecificArtifact: ${{ parameters.SpecificArtifact }}
PoolName: 'onnxruntime-Win-CPU-2022'
PoolName: 'onnxruntime-Win-CPU-2022-beta'

- template: final-jar-testing.yml
parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ stages:

- template: ../nuget/templates/test_win.yml
parameters:
AgentPool : 'onnxruntime-Win-CPU-2022'
AgentPool : 'onnxruntime-Win-CPU-2022-beta'
Skipx86Tests : false
NugetPackageName : 'Microsoft.ML.OnnxRuntime.Training'
ArtifactSuffix: 'Training-CPU'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ stages:
variables:
- name: GDN_CODESIGN_TARGETDIRECTORY
value: '$(Agent.TempDirectory)\binfiles'
pool: 'onnxruntime-Win-CPU-2022'
pool: 'onnxruntime-Win-CPU-2022-beta'

steps:
- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ stages:
dependsOn: []
jobs:
- job: Windows_py_Wheels
pool: 'onnxruntime-Win-CPU-2022'
pool: 'onnxruntime-Win-CPU-2022-beta'
strategy:
matrix:
Python38_x64:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jobs:
- job: Upload
workspace:
clean: all
pool: 'onnxruntime-Win-CPU-2022'
pool: 'onnxruntime-Win-CPU-2022-beta'
variables:
- name: runCodesignValidationInjection
value: false
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/web-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ parameters:
- name: PoolName
displayName: 'Agent pool name'
type: string
default: 'onnxruntime-Win-CPU-2022'
default: 'onnxruntime-Win-CPU-2022-beta'
- name: PackageName
displayName: 'Package name'
type: string
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/templates/win-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ parameters:

- name: ort_build_pool_name
type: string
default: 'onnxruntime-Win-CPU-2022'
default: 'onnxruntime-Win-CPU-2022-beta'

#'onnxruntime' or 'onnxruntime_gpu'
- name: java_artifact_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ parameters:

- name: PoolName
type: string
default: 'onnxruntime-Win-CPU-2022'
default: 'onnxruntime-Win-CPU-2022-beta'

- name: SkipPublish
type: boolean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ parameters:

- name: PoolName
type: string
default: 'onnxruntime-Win-CPU-2022'
default: 'onnxruntime-Win-CPU-2022-beta'

- name: PackageName
displayName: 'Package name'
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/win-ci-fuzz-testing.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
jobs:
- job: 'build'
pool: 'onnxruntime-Win-CPU-2022'
pool: 'onnxruntime-Win-CPU-2022-beta'
strategy:
maxParallel: 2
matrix:
Expand Down Expand Up @@ -30,7 +30,7 @@ jobs:
DownloadCUDA: false
BuildArch: x64
BuildConfig: $(BuildConfig)
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'
WithCache: true
Today: $(Today)

Expand Down
16 changes: 8 additions & 8 deletions tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ stages:
ORT_EP_NAME: CPU
GenerateDocumentation: false
WITH_CACHE: false
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'

- job: build_x64_asan
pool: 'onnxruntime-Win-CPU-2022'
pool: 'onnxruntime-Win-CPU-2022-beta'
timeoutInMinutes: 300
steps:
- checkout: self
Expand All @@ -66,7 +66,7 @@ stages:
DownloadCUDA: false
BuildArch: x64
BuildConfig: Debug
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'
WithCache: false
InstallONNX: false
Today: $(TODAY)
Expand Down Expand Up @@ -97,7 +97,7 @@ stages:
ORT_EP_NAME: CPU
GenerateDocumentation: false
WITH_CACHE: false
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'

- stage: x64_release_dnnl
dependsOn: []
Expand Down Expand Up @@ -135,7 +135,7 @@ stages:
ORT_EP_NAME: XNNPACK
GenerateDocumentation: false
WITH_CACHE: false
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'

- stage: x64_release_winml
dependsOn: []
Expand All @@ -155,7 +155,7 @@ stages:
ORT_EP_NAME: CPU
GenerateDocumentation: false
WITH_CACHE: false
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'

- stage: x86_release
dependsOn: []
Expand All @@ -174,7 +174,7 @@ stages:
ORT_EP_NAME: CPU
GenerateDocumentation: false
WITH_CACHE: false
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'

- stage: training_x64_debug
dependsOn: []
Expand Down Expand Up @@ -256,4 +256,4 @@ stages:
ORT_EP_NAME: CPU
GenerateDocumentation: false
WITH_CACHE: false
MachinePool: 'onnxruntime-Win-CPU-2022'
MachinePool: 'onnxruntime-Win-CPU-2022-beta'

0 comments on commit 23868e1

Please sign in to comment.