From 0b1618522387734f24fa2f0dc181e78337e7c665 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Tue, 14 Nov 2023 14:42:11 +0800 Subject: [PATCH] build wasm with linux (#18106) ### Description Make all build_wasm tasks (NPM packaging and post merge)run on Linux. Enable web gpu test in npm package pipeline too. ### Motivation and Context Even on Windows, build_wasm is running in cygwin. So, it could save a lot of time to run it on Linux. --- .../github/azure-pipelines/npm-packaging-pipeline.yml | 7 ++++++- tools/ci_build/github/azure-pipelines/post-merge-jobs.yml | 4 +++- tools/ci_build/github/azure-pipelines/templates/web-ci.yml | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml index 588b5d049e..b98837078b 100644 --- a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml @@ -41,9 +41,14 @@ stages: parameters: NpmPackagingMode: ${{ variables.NpmPackagingMode }} IsReleasePipeline: true - PoolName: 'Azure-Pipelines-EO-Windows2022-aiinfra' + PoolName: 'onnxruntime-Ubuntu2004-AMD-CPU' PackageName: 'onnxruntime-web' ExtraBuildArgs: '' + UseWebPoolName: true + RunWebGpuTestsForDebugBuild: false + RunWebGpuTestsForReleaseBuild: true + WebGpuPoolName: 'onnxruntime-Win2022-webgpu-A10' + WebCpuPoolName: 'Azure-Pipelines-EO-Windows2022-aiinfra' - template: templates/react-native-ci.yml parameters: diff --git a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml index 2a94499c7a..6fdb255606 100644 --- a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml +++ b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml @@ -4,9 +4,11 @@ stages: parameters: NpmPackagingMode: 'dev' IsReleasePipeline: true - PoolName: 'aiinfra-Win-CPU-2022-web-beta' + PoolName: 'onnxruntime-Ubuntu2004-AMD-CPU' BuildStaticLib: true ExtraBuildArgs: '' + UseWebPoolName: true + WebCpuPoolName: 'Azure-Pipelines-EO-Windows2022-aiinfra' # This stage is to test if the combined build works on # o Windows ARM64 diff --git a/tools/ci_build/github/azure-pipelines/templates/web-ci.yml b/tools/ci_build/github/azure-pipelines/templates/web-ci.yml index 3f6c6af753..c649883ea0 100644 --- a/tools/ci_build/github/azure-pipelines/templates/web-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/web-ci.yml @@ -26,7 +26,7 @@ parameters: - name: WASMTemplate type: string - default: win-wasm-ci.yml + default: linux-wasm-ci.yml # parameter couldn't be compared by string, so add one boolean parameter. - name: UseWebPoolName type: boolean @@ -39,10 +39,10 @@ parameters: default: false - name: WebGpuPoolName type: string - default: '' + default: 'onnxruntime-Win2022-webgpu-A10' - name: WebCpuPoolName type: string - default: '' + default: 'onnxruntime-Win-CPU-2022-web' - name: ExtraBuildArgs displayName: 'Extra build command line arguments'