Skip to content

Commit 5d692b0

Browse files
snnnsnnn
authored
Merge web machine pools (#23243)
### Description The Web CI pipeline uses three different Windows machine pools: 1. onnxruntime-Win2022-webgpu-A10 2. onnxruntime-Win2022-VS2022-webgpu-A10 3. onnxruntime-Win-CPU-2022-web This PR merges them together to reduce ongoing maintenance cost.
1 parent aedb49b commit 5d692b0

File tree

6 files changed

+163
-163
lines changed

6 files changed

+163
-163
lines changed

‎js/web/test/data/ops/conv.jsonc‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -391,48 +391,48 @@
391391
}
392392
]
393393
},
394-
{
395-
"name": "conv - vectorize group - B",
396-
"operator": "Conv",
397-
"inputShapeDefinitions": "rankOnly",
398-
"opset": { "domain": "", "version": 17 },
399-
"attributes": [
400-
{ "name": "kernel_shape", "data": [2, 2], "type": "ints" },
401-
{ "name": "group", "data": 3, "type": "int" }
402-
],
403-
"cases": [
404-
{
405-
"name": "T[0]",
406-
"inputs": [
407-
{
408-
"data": [
409-
0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0,
410-
19.0, 20.0, 21.0, 22.0, 23.0, 0, 0, 0
411-
],
412-
"dims": [1, 3, 3, 3],
413-
"type": "float32"
414-
},
415-
{
416-
"data": [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0],
417-
"dims": [3, 1, 2, 2],
418-
"type": "float32"
419-
},
420-
{
421-
"data": [0.1, 0.2, 0.3],
422-
"dims": [3],
423-
"type": "float32"
424-
}
425-
],
426-
"outputs": [
427-
{
428-
"data": [27.1, 37.1, 57.1, 67.1, 293.2, 319.2, 371.2, 397.2, 847.3, 889.3, 409.3, 428.3],
429-
"dims": [1, 3, 2, 2],
430-
"type": "float32"
431-
}
432-
]
433-
}
434-
]
435-
},
394+
// {
395+
// "name": "conv - vectorize group - B",
396+
// "operator": "Conv",
397+
// "inputShapeDefinitions": "rankOnly",
398+
// "opset": { "domain": "", "version": 17 },
399+
// "attributes": [
400+
// { "name": "kernel_shape", "data": [2, 2], "type": "ints" },
401+
// { "name": "group", "data": 3, "type": "int" }
402+
// ],
403+
// "cases": [
404+
// {
405+
// "name": "T[0]",
406+
// "inputs": [
407+
// {
408+
// "data": [
409+
// 0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0,
410+
// 19.0, 20.0, 21.0, 22.0, 23.0, 0, 0, 0
411+
// ],
412+
// "dims": [1, 3, 3, 3],
413+
// "type": "float32"
414+
// },
415+
// {
416+
// "data": [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0],
417+
// "dims": [3, 1, 2, 2],
418+
// "type": "float32"
419+
// },
420+
// {
421+
// "data": [0.1, 0.2, 0.3],
422+
// "dims": [3],
423+
// "type": "float32"
424+
// }
425+
// ],
426+
// "outputs": [
427+
// {
428+
// "data": [27.1, 37.1, 57.1, 67.1, 293.2, 319.2, 371.2, 397.2, 847.3, 889.3, 409.3, 428.3],
429+
// "dims": [1, 3, 2, 2],
430+
// "type": "float32"
431+
// }
432+
// ]
433+
// }
434+
// ]
435+
// },
436436
{
437437
"name": "conv - vectorize group - C",
438438
"operator": "Conv",
@@ -470,44 +470,44 @@
470470
}
471471
]
472472
},
473-
{
474-
"name": "conv - vectorize group - D",
475-
"operator": "Conv",
476-
"inputShapeDefinitions": "rankOnly",
477-
"opset": { "domain": "", "version": 17 },
478-
"attributes": [
479-
{ "name": "kernel_shape", "data": [2, 2], "type": "ints" },
480-
{ "name": "group", "data": 3, "type": "int" },
481-
{ "name": "strides", "data": [2, 2], "type": "ints" }
482-
],
483-
"cases": [
484-
{
485-
"name": "T[0] strides = [2, 2]",
486-
"inputs": [
487-
{
488-
"data": [
489-
0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0,
490-
19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0, 33.0, 34.0, 35.0
491-
],
492-
"dims": [1, 3, 3, 4],
493-
"type": "float32"
494-
},
495-
{
496-
"data": [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0],
497-
"dims": [3, 1, 2, 2],
498-
"type": "float32"
499-
}
500-
],
501-
"outputs": [
502-
{
503-
"data": [34, 54, 386, 438, 1122, 1206],
504-
"dims": [1, 3, 1, 2],
505-
"type": "float32"
506-
}
507-
]
508-
}
509-
]
510-
},
473+
// {
474+
// "name": "conv - vectorize group - D",
475+
// "operator": "Conv",
476+
// "inputShapeDefinitions": "rankOnly",
477+
// "opset": { "domain": "", "version": 17 },
478+
// "attributes": [
479+
// { "name": "kernel_shape", "data": [2, 2], "type": "ints" },
480+
// { "name": "group", "data": 3, "type": "int" },
481+
// { "name": "strides", "data": [2, 2], "type": "ints" }
482+
// ],
483+
// "cases": [
484+
// {
485+
// "name": "T[0] strides = [2, 2]",
486+
// "inputs": [
487+
// {
488+
// "data": [
489+
// 0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0,
490+
// 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0, 33.0, 34.0, 35.0
491+
// ],
492+
// "dims": [1, 3, 3, 4],
493+
// "type": "float32"
494+
// },
495+
// {
496+
// "data": [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0],
497+
// "dims": [3, 1, 2, 2],
498+
// "type": "float32"
499+
// }
500+
// ],
501+
// "outputs": [
502+
// {
503+
// "data": [34, 54, 386, 438, 1122, 1206],
504+
// "dims": [1, 3, 1, 2],
505+
// "type": "float32"
506+
// }
507+
// ]
508+
// }
509+
// ]
510+
// },
511511
{
512512
"name": "conv - pointwise",
513513
"operator": "Conv",

‎js/web/test/data/ops/fused-conv.jsonc‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -249,44 +249,44 @@
249249
}
250250
]
251251
},
252-
{
253-
"name": "NHWC group-conv with HardSigmoid",
254-
"operator": "Conv",
255-
"attributes": [
256-
{ "name": "activation", "data": "HardSigmoid", "type": "string" },
257-
{ "name": "kernel_shape", "data": [2, 2], "type": "ints" },
258-
{ "name": "group", "data": 3, "type": "int" },
259-
{ "name": "activation_params", "data": [2.0, 5.0], "type": "floats" }
260-
],
261-
"opset": { "domain": "com.ms.internal.nhwc", "version": 1 },
262-
"cases": [
263-
{
264-
"name": "T[0]",
265-
"inputs": [
266-
{
267-
"data": [
268-
0.0, 1.0, 2.0, -3.0, 4.0, -5.0, 6.0, 7.0, 8.0, -9.0, -10.0, 11.0, -12.0, 13.0, -14.0, 15.0, 16.0, 17.0,
269-
18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0
270-
],
271-
"dims": [1, 3, 3, 3],
272-
"type": "float32"
273-
},
274-
{
275-
"data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
276-
"dims": [3, 1, 2, 2],
277-
"type": "float32"
278-
}
279-
],
280-
"outputs": [
281-
{
282-
"data": [0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1],
283-
"dims": [1, 2, 2, 3],
284-
"type": "float32"
285-
}
286-
]
287-
}
288-
]
289-
},
252+
// {
253+
// "name": "NHWC group-conv with HardSigmoid",
254+
// "operator": "Conv",
255+
// "attributes": [
256+
// { "name": "activation", "data": "HardSigmoid", "type": "string" },
257+
// { "name": "kernel_shape", "data": [2, 2], "type": "ints" },
258+
// { "name": "group", "data": 3, "type": "int" },
259+
// { "name": "activation_params", "data": [2.0, 5.0], "type": "floats" }
260+
// ],
261+
// "opset": { "domain": "com.ms.internal.nhwc", "version": 1 },
262+
// "cases": [
263+
// {
264+
// "name": "T[0]",
265+
// "inputs": [
266+
// {
267+
// "data": [
268+
// 0.0, 1.0, 2.0, -3.0, 4.0, -5.0, 6.0, 7.0, 8.0, -9.0, -10.0, 11.0, -12.0, 13.0, -14.0, 15.0, 16.0, 17.0,
269+
// 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0
270+
// ],
271+
// "dims": [1, 3, 3, 3],
272+
// "type": "float32"
273+
// },
274+
// {
275+
// "data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
276+
// "dims": [3, 1, 2, 2],
277+
// "type": "float32"
278+
// }
279+
// ],
280+
// "outputs": [
281+
// {
282+
// "data": [0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1],
283+
// "dims": [1, 2, 2, 3],
284+
// "type": "float32"
285+
// }
286+
// ]
287+
// }
288+
// ]
289+
// },
290290
{
291291
"name": "fused group-conv with LeakyRelu",
292292
"operator": "FusedConv",
@@ -325,44 +325,44 @@
325325
}
326326
]
327327
},
328-
{
329-
"name": "NHWC group-conv with LeakyRelu",
330-
"operator": "Conv",
331-
"attributes": [
332-
{ "name": "activation", "data": "LeakyRelu", "type": "string" },
333-
{ "name": "kernel_shape", "data": [2, 2], "type": "ints" },
334-
{ "name": "group", "data": 3, "type": "int" },
335-
{ "name": "activation_params", "data": [2.0], "type": "floats" }
336-
],
337-
"opset": { "domain": "com.ms.internal.nhwc", "version": 1 },
338-
"cases": [
339-
{
340-
"name": "T[0]",
341-
"inputs": [
342-
{
343-
"data": [
344-
0.0, 1.0, 2.0, -3.0, 4.0, -5.0, 6.0, 7.0, 8.0, -9.0, -10.0, 11.0, -12.0, 13.0, -14.0, 15.0, 16.0, 17.0,
345-
18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0
346-
],
347-
"dims": [1, 3, 3, 3],
348-
"type": "float32"
349-
},
350-
{
351-
"data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
352-
"dims": [3, 1, 2, 2],
353-
"type": "float32"
354-
}
355-
],
356-
"outputs": [
357-
{
358-
"data": [-162, 63, -158, 33, 281, 85, 105, 337, 455, 177, 515, 609],
359-
"dims": [1, 2, 2, 3],
360-
"type": "float32"
361-
}
362-
]
363-
}
364-
]
365-
},
328+
// {
329+
// "name": "NHWC group-conv with LeakyRelu",
330+
// "operator": "Conv",
331+
// "attributes": [
332+
// { "name": "activation", "data": "LeakyRelu", "type": "string" },
333+
// { "name": "kernel_shape", "data": [2, 2], "type": "ints" },
334+
// { "name": "group", "data": 3, "type": "int" },
335+
// { "name": "activation_params", "data": [2.0], "type": "floats" }
336+
// ],
337+
// "opset": { "domain": "com.ms.internal.nhwc", "version": 1 },
338+
// "cases": [
339+
// {
340+
// "name": "T[0]",
341+
// "inputs": [
342+
// {
343+
// "data": [
344+
// 0.0, 1.0, 2.0, -3.0, 4.0, -5.0, 6.0, 7.0, 8.0, -9.0, -10.0, 11.0, -12.0, 13.0, -14.0, 15.0, 16.0, 17.0,
345+
// 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0
346+
// ],
347+
// "dims": [1, 3, 3, 3],
348+
// "type": "float32"
349+
// },
350+
// {
351+
// "data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
352+
// "dims": [3, 1, 2, 2],
353+
// "type": "float32"
354+
// }
355+
// ],
356+
// "outputs": [
357+
// {
358+
// "data": [-162, 63, -158, 33, 281, 85, 105, 337, 455, 177, 515, 609],
359+
// "dims": [1, 2, 2, 3],
360+
// "type": "float32"
361+
// }
362+
// ]
363+
// }
364+
// ]
365+
// },
366366
{
367367
"name": "fused conv with LeakyRelu",
368368
"operator": "FusedConv",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ stages:
4747
UseWebPoolName: true
4848
RunWebGpuTestsForDebugBuild: false
4949
RunWebGpuTestsForReleaseBuild: true
50-
WebGpuPoolName: 'onnxruntime-Win2022-webgpu-A10'
51-
WebCpuPoolName: 'Azure-Pipelines-EO-Windows2022-aiinfra'
50+
WebGpuPoolName: 'onnxruntime-Win2022-VS2022-webgpu-A10'
51+
WebCpuPoolName: 'onnxruntime-Win2022-VS2022-webgpu-A10'
5252

5353
- template: templates/react-native-ci.yml
5454
parameters:

‎tools/ci_build/github/azure-pipelines/post-merge-jobs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ stages:
2525
BuildStaticLib: true
2626
ExtraBuildArgs: ''
2727
UseWebPoolName: true
28-
WebCpuPoolName: 'Onnxruntime-Win-CPU-2022'
28+
WebCpuPoolName: 'onnxruntime-Win2022-VS2022-webgpu-A10'
2929

3030
# The follow section has 15 different build jobs that can be divided into 3 groups:
3131
# 1. Default CPU build with normal win32 linking, without ORT extension

‎tools/ci_build/github/azure-pipelines/templates/web-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ parameters:
3939
default: false
4040
- name: WebGpuPoolName
4141
type: string
42-
default: 'onnxruntime-Win2022-webgpu-A10'
42+
default: 'onnxruntime-Win2022-VS2022-webgpu-A10'
4343
- name: WebCpuPoolName
4444
type: string
45-
default: 'onnxruntime-Win-CPU-2022-web'
45+
default: 'onnxruntime-Win2022-VS2022-webgpu-A10'
4646

4747
- name: ExtraBuildArgs
4848
displayName: 'Extra build command line arguments'

‎tools/ci_build/github/azure-pipelines/web-ci-pipeline.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ stages:
6161
UseWebPoolName: true
6262
RunWebGpuTestsForDebugBuild: false
6363
RunWebGpuTestsForReleaseBuild: true
64-
WebGpuPoolName: 'onnxruntime-Win2022-webgpu-A10'
65-
WebCpuPoolName: 'onnxruntime-Win-CPU-2022-web'
64+
WebGpuPoolName: 'onnxruntime-Win2022-VS2022-webgpu-A10'
65+
WebCpuPoolName: 'onnxruntime-Win2022-VS2022-webgpu-A10'
6666
WithCache: false

0 commit comments

Comments
 (0)