Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move CPU build pipelines to a new AMD Gen4 machine pool #23465

Closed
wants to merge 1 commit into from
Closed
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 @@ -36,7 +36,7 @@ parameters:

jobs:
- job: Build_QNN_EP
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
timeoutInMinutes: 30
workspace:
clean: all
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ stages:
Codeql.Enabled: false
jobs:
- job: BUILD_AND_TEST_CPU
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
workspace:
clean: all
timeoutInMinutes: 30
Expand Down Expand Up @@ -120,7 +120,7 @@ stages:
JobsTimeout: 60
jobs:
- job: BUILD_AND_TEST_NNAPI_EP
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
timeoutInMinutes: ${{ variables.JobsTimeout }}
workspace:
clean: all
Expand Down Expand Up @@ -183,7 +183,7 @@ stages:
condition: in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')
jobs:
- job: NNAPI_EP_MASTER
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
timeoutInMinutes: 180
workspace:
clean: all
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ stages:
CCACHE_DIR: $(Pipeline.Workspace)/ccache
workspace:
clean: all
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
steps:

- checkout: self
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ stages:
artifactName: 'onnxruntime-android-full-aar'
job_name_suffix: 'Full'
publish_executables: '1'
pool_name: 'onnxruntime-Ubuntu2204-AMD-CPU'
pool_name: 'onnxruntime-Ubuntu2404-AMD-CPU'
enable_code_sign: false

# build Python packages
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ stages:
parameters:
OnnxruntimeArch: 'x64'
OnnxruntimeNodejsBindingArch: 'x64'
PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU'
PoolName: 'onnxruntime-Ubuntu2404-AMD-CPU'
PackageJava: false
PackageNodeJS: false

Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ stages:
skipComponentGovernanceDetection: true
ORT_CACHE_DIR: $(Agent.TempDirectory)/ort_ccache
TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)]
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
steps:

- checkout: self
Expand Down Expand Up @@ -114,7 +114,7 @@ stages:
skipComponentGovernanceDetection: true
ORT_CACHE_DIR: $(Agent.TempDirectory)/ort_ccache
TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)]
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
steps:

- checkout: self
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
timeoutInMinutes: 120
workspace:
clean: all
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
variables:
ORT_CACHE_DIR: $(Pipeline.Workspace)/ort_ccache
TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
skipComponentGovernanceDetection: true
workspace:
clean: all
pool: Linux-CPU-2019
pool: onnxruntime-Ubuntu2404-AMD-CPU
steps:
- checkout: self
clean: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ stages:
CCACHE_DIR: $(Pipeline.Workspace)/ccache
workspace:
clean: all
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU

steps:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)]
workspace:
clean: all
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
timeoutInMinutes: 240

steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pr:
jobs:
- template: templates/linux-ci.yml
parameters:
AgentPool : 'Linux-CPU-2019'
AgentPool : 'onnxruntime-Ubuntu2404-AMD-CPU'
JobName: 'Linux_CI_Dev'
RunDockerBuildArgs: '-o ubuntu22.04 -p 3.10 -d openvino -v 2024.5.0 -x "--use_openvino CPU --build_wheel"'
TimeoutInMinutes: 120
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)]
workspace:
clean: all
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
timeoutInMinutes: 240

steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ stages:
parameters:
NpmPackagingMode: ${{ variables.NpmPackagingMode }}
BuildConfig: 'Release'
PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU'
PoolName: 'onnxruntime-Ubuntu2404-AMD-CPU'
enable_code_sign: false
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ stages:
parameters:
NpmPackagingMode: ${{ variables.NpmPackagingMode }}
IsReleasePipeline: true
PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU'
PoolName: 'onnxruntime-Ubuntu2404-AMD-CPU'
PackageName: 'onnxruntime-web'
ExtraBuildArgs: ''
UseWebPoolName: true
Expand All @@ -54,7 +54,7 @@ stages:
parameters:
NpmPackagingMode: ${{ variables.NpmPackagingMode }}
BuildConfig: 'Release'
PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU'
PoolName: 'onnxruntime-Ubuntu2404-AMD-CPU'
PackageName: 'onnxruntime-react-native'
InitialStageDependsOn: 'Precheck_and_extract_commit'
enable_code_sign: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
AgentPool: 'onnxruntime-Ubuntu2204-AMD-CPU'
AgentPool: 'onnxruntime-Ubuntu2404-AMD-CPU'
ArtifactSuffix: ''
NugetPackageName : ''
StageSuffix: 'CPU'
Expand Down
6 changes: 3 additions & 3 deletions tools/ci_build/github/azure-pipelines/post-merge-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ stages:
parameters:
NpmPackagingMode: 'dev'
IsReleasePipeline: true
PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU'
PoolName: 'onnxruntime-Ubuntu2404-AMD-CPU'
BuildStaticLib: true
ExtraBuildArgs: ''
UseWebPoolName: true
Expand Down Expand Up @@ -339,7 +339,7 @@ stages:
timeoutInMinutes: 150
variables:
skipComponentGovernanceDetection: true
pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
pool: 'onnxruntime-Ubuntu2404-AMD-CPU'
steps:
- template: templates/set-version-number-variables-step.yml

Expand Down Expand Up @@ -385,7 +385,7 @@ stages:
- job: AndroidCustomBuildScript
workspace:
clean: all
pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
pool: 'onnxruntime-Ubuntu2404-AMD-CPU'
variables:
dockerImageTag: onnxruntime-android-custom-build
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ stages:
dependsOn:
jobs:
- job: Python_Publishing_GPU
pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
pool: 'onnxruntime-Ubuntu2404-AMD-CPU'
steps:
- checkout: none
- download: build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ stages:
dependsOn:
jobs:
- job: Python_Publishing_GPU
pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
pool: 'onnxruntime-Ubuntu2404-AMD-CPU'
steps:
- checkout: none
- download: build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stages:
- template: templates/py-packaging-linux-test-cpu.yml
parameters:
arch: 'x86_64'
machine_pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
machine_pool: 'onnxruntime-Ubuntu2404-AMD-CPU'


- stage: Linux_Test_CPU_aarch64_stage
Expand All @@ -36,7 +36,7 @@ stages:
job_name: Test_LINUX_x86_64_Wheels
itemPattern: '*/*manylinux*x86_64.whl'
machine_pool:
name: 'onnxruntime-Ubuntu2204-AMD-CPU'
name: 'onnxruntime-Ubuntu2404-AMD-CPU'

# ****The following Stage depend on all previous tags. ***

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ stages:
workspace:
clean: all
timeoutInMinutes: 480
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
variables:
RocmVersion: '6.2'
RocmVersionPatchSuffix: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ stages:
jobs:
- job: Download_Java_Tools
pool:
name: 'onnxruntime-Ubuntu2204-AMD-CPU'
name: 'onnxruntime-Ubuntu2404-AMD-CPU'
steps:
- checkout: none
- task: CmdLine@2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ parameters:

jobs:
- job: ReactNative_CI_Android
pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
pool: 'onnxruntime-Ubuntu2404-AMD-CPU'
variables:
runCodesignValidationInjection: false
timeoutInMinutes: 90
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ stages:
workspace:
clean: all
timeoutInMinutes: 150
pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
pool: 'onnxruntime-Ubuntu2404-AMD-CPU'
variables:
- name: CUDA_VERSION_MAJOR
${{ if eq(parameters.CudaVersion, '11.8') }}:
Expand Down Expand Up @@ -66,7 +66,7 @@ stages:
workspace:
clean: all
timeoutInMinutes: 180
pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
pool: 'onnxruntime-Ubuntu2404-AMD-CPU'
variables:
- template: ../templates/common-variables.yml
- name: CUDA_VERSION_MAJOR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ stages:
- template: ../templates/py-linux.yml
parameters:
arch: 'x86_64'
machine_pool: 'onnxruntime-Ubuntu2204-AMD-CPU-Large'
machine_pool: 'onnxruntime-Ubuntu2404-AMD-CPU-Large'
extra_build_arg: ${{ parameters.build_py_parameters }}
cmake_build_type: ${{ parameters.cmake_build_type }}

Expand Down Expand Up @@ -369,6 +369,6 @@ stages:
jobs:
- template: ../templates/py-linux-qnn.yml
parameters:
machine_pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
machine_pool: 'onnxruntime-Ubuntu2404-AMD-CPU'
extra_build_arg: ${{ parameters.build_py_parameters }}
cmake_build_type: ${{ parameters.cmake_build_type }}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stages:
- stage: Python_Publishing_GPU
jobs:
- job: Python_Publishing_GPU
pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
pool: 'onnxruntime-Ubuntu2404-AMD-CPU'
steps:
- checkout: none
- download: build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ stages:
- template: py-linux-gpu-stage.yml
parameters:
arch: 'x86_64'
machine_pool: 'onnxruntime-Ubuntu2204-AMD-CPU-Large'
machine_pool: 'onnxruntime-Ubuntu2404-AMD-CPU-Large'
extra_build_arg: ${{ parameters.build_py_parameters }}
cmake_build_type: ${{ parameters.cmake_build_type }}
cuda_version: ${{ parameters.cuda_version }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stages:
jobs:
- job: Set_Variables
pool:
name: 'onnxruntime-Ubuntu2204-AMD-CPU'
name: 'onnxruntime-Ubuntu2404-AMD-CPU'
steps:
- checkout: none
- bash: |
Expand Down Expand Up @@ -47,7 +47,7 @@ stages:
jobs:
- job: D1
pool:
name: 'onnxruntime-Ubuntu2204-AMD-CPU'
name: 'onnxruntime-Ubuntu2404-AMD-CPU'
variables:
MyVar: $[stageDependencies.Setup.Set_Variables.outputs['Set_Release_Version_Suffix.ReleaseVersionSuffix']]
BuildDate: $[stageDependencies.Setup.Set_Variables.outputs['Set_Build_Date.BuildDate']]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stages:
timeoutInMinutes: 60
workspace:
clean: all
pool: onnxruntime-Ubuntu2204-AMD-CPU
pool: onnxruntime-Ubuntu2404-AMD-CPU
steps:
- checkout: self
clean: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ parameters:

jobs:
- job: Final_AAR_Testing_Android
pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
pool: 'onnxruntime-Ubuntu2404-AMD-CPU'
workspace:
clean: all
variables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ parameters:
- name: pool_name
displayName: Pool name
type: string
default: 'onnxruntime-Ubuntu2204-AMD-CPU'
default: 'onnxruntime-Ubuntu2404-AMD-CPU'

- name: packageName
displayName: Package Name
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ stages:

- template: ../nuget/templates/test_linux.yml
parameters:
AgentPool : onnxruntime-Ubuntu2204-AMD-CPU
AgentPool : onnxruntime-Ubuntu2404-AMD-CPU
NugetPackageName : 'Microsoft.ML.OnnxRuntime'
ArtifactSuffix: 'CPU'
SpecificArtifact: ${{ parameters.SpecificArtifact }}
Expand Down Expand Up @@ -849,7 +849,7 @@ stages:
OS: Linux
BuildId: ${{ parameters.BuildId }}
SpecificArtifact: ${{ parameters.SpecificArtifact }}
PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU'
PoolName: 'onnxruntime-Ubuntu2404-AMD-CPU'

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

- name: PoolName
type: string
default: 'onnxruntime-Ubuntu2204-AMD-CPU'
default: 'onnxruntime-Ubuntu2404-AMD-CPU'

- name: ArtifactNamePrefix
type: string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
AgentPool : 'onnxruntime-Ubuntu2204-AMD-CPU'
AgentPool : 'onnxruntime-Ubuntu2404-AMD-CPU'
StageName : 'Linux_CI_Dev'
RunDockerBuildArgs: '-o ubuntu20.04 -d cpu -x "--build_wheel"'
NuPackScript: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stages:
AdditionalBuildFlags: ${{ parameters.AdditionalBuildFlags }}
OnnxruntimeArch: 'x64'
OnnxruntimeNodejsBindingArch: 'x64'
PoolName: 'onnxruntime-Ubuntu2204-AMD-CPU'
PoolName: 'onnxruntime-Ubuntu2404-AMD-CPU'
ArtifactNamePrefix: ${{ parameters.ArtifactNamePrefix }}
PackageJava: ${{ parameters.PackageJava }}
PackageNodeJS: ${{ parameters.PackageNodeJS }}
Expand Down
Loading
Loading