From 051543da045d64ad10ae072e7290ff43b7321e0c Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Fri, 9 Jun 2023 04:46:10 +0900 Subject: [PATCH] Revert "[CI] Make Graviton3 default AArch64 job runner node (#14983)" This reverts commit 7dc1d6a99f7984855edf1a5c42b66215addeb13f. --- ci/jenkins/generated/arm_jenkinsfile.groovy | 38 +++++++++---------- .../templates/arm_jenkinsfile.groovy.j2 | 8 ++-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ci/jenkins/generated/arm_jenkinsfile.groovy b/ci/jenkins/generated/arm_jenkinsfile.groovy index 2eb6687beea8..40211e4eb99d 100644 --- a/ci/jenkins/generated/arm_jenkinsfile.groovy +++ b/ci/jenkins/generated/arm_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-02T10:54:19.255872 +// Generated at 2023-05-05T13:39:06.460410 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -577,17 +577,17 @@ def build(node_type) { } } try { - build('ARM-GRAVITON3-SPOT') + build('ARM-SMALL-SPOT') } catch (Exception ex) { - build('ARM-GRAVITON3') + build('ARM-SMALL') } -def shard_run_integration_aarch64_1_of_4(node_type='ARM-GRAVITON3-SPOT', on_demand=false) { +def shard_run_integration_aarch64_1_of_4(node_type='ARM-SMALL-SPOT', on_demand=false) { if (!skip_ci && is_docs_only_build != 1) { if (on_demand==true || node_type.contains('ARM')) { - node_type = 'ARM-GRAVITON3' + node_type = 'ARM-SMALL' } node(node_type) { ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/ut-python-arm") { @@ -633,10 +633,10 @@ def shard_run_integration_aarch64_1_of_4(node_type='ARM-GRAVITON3-SPOT', on_dema } } -def shard_run_integration_aarch64_2_of_4(node_type='ARM-GRAVITON3-SPOT', on_demand=false) { +def shard_run_integration_aarch64_2_of_4(node_type='ARM-SMALL-SPOT', on_demand=false) { if (!skip_ci && is_docs_only_build != 1) { if (on_demand==true || node_type.contains('ARM')) { - node_type = 'ARM-GRAVITON3' + node_type = 'ARM-SMALL' } node(node_type) { ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/ut-python-arm") { @@ -682,10 +682,10 @@ def shard_run_integration_aarch64_2_of_4(node_type='ARM-GRAVITON3-SPOT', on_dema } } -def shard_run_integration_aarch64_3_of_4(node_type='ARM-GRAVITON3-SPOT', on_demand=false) { +def shard_run_integration_aarch64_3_of_4(node_type='ARM-SMALL-SPOT', on_demand=false) { if (!skip_ci && is_docs_only_build != 1) { if (on_demand==true || node_type.contains('ARM')) { - node_type = 'ARM-GRAVITON3' + node_type = 'ARM-SMALL' } node(node_type) { ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/ut-python-arm") { @@ -731,10 +731,10 @@ def shard_run_integration_aarch64_3_of_4(node_type='ARM-GRAVITON3-SPOT', on_dema } } -def shard_run_integration_aarch64_4_of_4(node_type='ARM-GRAVITON3-SPOT', on_demand=false) { +def shard_run_integration_aarch64_4_of_4(node_type='ARM-SMALL-SPOT', on_demand=false) { if (!skip_ci && is_docs_only_build != 1) { if (on_demand==true || node_type.contains('ARM')) { - node_type = 'ARM-GRAVITON3' + node_type = 'ARM-SMALL' } node(node_type) { ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/ut-python-arm") { @@ -782,10 +782,10 @@ def shard_run_integration_aarch64_4_of_4(node_type='ARM-GRAVITON3-SPOT', on_dema -def shard_run_topi_aarch64_1_of_2(node_type='ARM-GRAVITON3-SPOT', on_demand=false) { +def shard_run_topi_aarch64_1_of_2(node_type='ARM-SMALL-SPOT', on_demand=false) { if (!skip_ci && is_docs_only_build != 1) { if (on_demand==true || node_type.contains('ARM')) { - node_type = 'ARM-GRAVITON3' + node_type = 'ARM-SMALL' } node(node_type) { ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/ut-python-arm") { @@ -836,10 +836,10 @@ def shard_run_topi_aarch64_1_of_2(node_type='ARM-GRAVITON3-SPOT', on_demand=fals } } -def shard_run_topi_aarch64_2_of_2(node_type='ARM-GRAVITON3-SPOT', on_demand=false) { +def shard_run_topi_aarch64_2_of_2(node_type='ARM-SMALL-SPOT', on_demand=false) { if (!skip_ci && is_docs_only_build != 1) { if (on_demand==true || node_type.contains('ARM')) { - node_type = 'ARM-GRAVITON3' + node_type = 'ARM-SMALL' } node(node_type) { ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/ut-python-arm") { @@ -890,10 +890,10 @@ def shard_run_topi_aarch64_2_of_2(node_type='ARM-GRAVITON3-SPOT', on_demand=fals -def shard_run_frontend_aarch64_1_of_2(node_type='ARM-GRAVITON3-SPOT', on_demand=false) { +def shard_run_frontend_aarch64_1_of_2(node_type='ARM-SMALL-SPOT', on_demand=false) { if (!skip_ci && is_docs_only_build != 1) { if (on_demand==true || node_type.contains('ARM')) { - node_type = 'ARM-GRAVITON3' + node_type = 'ARM-SMALL' } node(node_type) { ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/frontend-python-arm") { @@ -938,10 +938,10 @@ def shard_run_frontend_aarch64_1_of_2(node_type='ARM-GRAVITON3-SPOT', on_demand= } } -def shard_run_frontend_aarch64_2_of_2(node_type='ARM-GRAVITON3-SPOT', on_demand=false) { +def shard_run_frontend_aarch64_2_of_2(node_type='ARM-SMALL-SPOT', on_demand=false) { if (!skip_ci && is_docs_only_build != 1) { if (on_demand==true || node_type.contains('ARM')) { - node_type = 'ARM-GRAVITON3' + node_type = 'ARM-SMALL' } node(node_type) { ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/frontend-python-arm") { diff --git a/ci/jenkins/templates/arm_jenkinsfile.groovy.j2 b/ci/jenkins/templates/arm_jenkinsfile.groovy.j2 index f606f439b135..18862f8c97c7 100644 --- a/ci/jenkins/templates/arm_jenkinsfile.groovy.j2 +++ b/ci/jenkins/templates/arm_jenkinsfile.groovy.j2 @@ -19,7 +19,7 @@ {% call m.invoke_build( name='BUILD: arm', - node='ARM-GRAVITON3', + node='ARM-SMALL', condition='!skip_ci && is_docs_only_build != 1', ws='tvm/build-arm', docker_image='ci_arm', @@ -40,7 +40,7 @@ {% call(shard_index, num_shards) m.sharded_test_step( name="integration: aarch64", num_shards=4, - node="ARM-GRAVITON3", + node="ARM-SMALL", ws="tvm/ut-python-arm", platform="arm", docker_image="ci_arm", @@ -57,7 +57,7 @@ {% call(shard_index, num_shards) m.sharded_test_step( name="topi: aarch64", - node="ARM-GRAVITON3", + node="ARM-SMALL", ws="tvm/ut-python-arm", platform="arm", docker_image="ci_arm", @@ -82,7 +82,7 @@ {% call(shard_index, num_shards) m.sharded_test_step( name="frontend: aarch64", - node="ARM-GRAVITON3", + node="ARM-SMALL", ws="tvm/frontend-python-arm", platform="arm", docker_image="ci_arm",