You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by dr...@apache.org on 2022/08/02 21:09:52 UTC
[tvm] branch micro/rename_qemu updated: Make docker image specs valid
This is an automated email from the ASF dual-hosted git repository.
driazati pushed a commit to branch micro/rename_qemu
in repository https://gitbox.apache.org/repos/asf/tvm.git
The following commit(s) were added to refs/heads/micro/rename_qemu by this push:
new a065c5b728 Make docker image specs valid
a065c5b728 is described below
commit a065c5b72857f2d4fc21bcf7a44b938398df48aa
Author: driazati <dr...@users.noreply.github.com>
AuthorDate: Tue Aug 2 14:09:44 2022 -0700
Make docker image specs valid
---
Jenkinsfile | 124 +++++++++++++++++++--------------------
ci/jenkins/DockerBuild.groovy.j2 | 2 +-
2 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 00be5095ea..98cae596d2 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -45,7 +45,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 2022-08-01T14:23:41.853298
+// Generated at 2022-08-02T14:09:08.120170
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. -->
@@ -70,7 +70,7 @@ properties([
string(name: 'ci_hexagon_param', defaultValue: ''),
string(name: 'ci_i386_param', defaultValue: ''),
string(name: 'ci_lint_param', defaultValue: ''),
- string(name: 'ci_cortexm_param', defaultValue: ''),
+ string(name: 'ci_qemu_param', defaultValue: ''),
string(name: 'ci_wasm_param', defaultValue: ''),
])
])
@@ -239,7 +239,7 @@ def prepare() {
if (env.DETERMINE_DOCKER_IMAGES == 'yes') {
sh(
- script: "./tests/scripts/determine_docker_images.py ci_arm=${ci_arm} ci_cpu=${ci_cpu} ci_gpu=${ci_gpu} ci_hexagon=${ci_hexagon} ci_i386=${ci_i386} ci_lint=${ci_lint} ci_cortexm=${ci_cortexm} ci_wasm=${ci_wasm} ",
+ script: "./tests/scripts/determine_docker_images.py ci_arm=${ci_arm} ci_cpu=${ci_cpu} ci_gpu=${ci_gpu} ci_hexagon=${ci_hexagon} ci_i386=${ci_i386} ci_lint=${ci_lint} ci_qemu=${ci_qemu} ci_wasm=${ci_wasm} ",
label: 'Decide whether to use tlcpack or tlcpackstaging for Docker images',
)
// Pull image names from the results of should_rebuild_docker.py
@@ -273,9 +273,9 @@ def prepare() {
label: "Find docker image name for ci_lint",
returnStdout: true,
).trim()
- ci_cortexm = sh(
- script: "cat .docker-image-names/ci_cortexm",
- label: "Find docker image name for ci_cortexm",
+ ci_qemu = sh(
+ script: "cat .docker-image-names/ci_qemu",
+ label: "Find docker image name for ci_qemu",
returnStdout: true,
).trim()
ci_wasm = sh(
@@ -291,7 +291,7 @@ def prepare() {
ci_hexagon = params.ci_hexagon_param ?: ci_hexagon
ci_i386 = params.ci_i386_param ?: ci_i386
ci_lint = params.ci_lint_param ?: ci_lint
- ci_cortexm = params.ci_cortexm_param ?: ci_cortexm
+ ci_qemu = params.ci_qemu_param ?: ci_qemu
ci_wasm = params.ci_wasm_param ?: ci_wasm
sh (script: """
@@ -302,7 +302,7 @@ def prepare() {
echo " ci_hexagon = ${ci_hexagon}"
echo " ci_i386 = ${ci_i386}"
echo " ci_lint = ${ci_lint}"
- echo " ci_cortexm = ${ci_cortexm}"
+ echo " ci_qemu = ${ci_qemu}"
echo " ci_wasm = ${ci_wasm}"
""", label: 'Docker image names')
@@ -414,7 +414,7 @@ def build_image(image_name) {
returnStdout: true,
script: 'git log -1 --format=\'%h\''
).trim()
- def full_name = "${image_name}:${env.BRANCH_NAME}-${hash}-${env.BUILD_NUMBER}"
+ def full_name = "${image_name}:${env.BRANCH_NAME}-${hash}-${env.BUILD_NUMBER}".replace('/', '-')
sh(
script: "${docker_build} ${image_name} --spec ${full_name}",
label: 'Build docker image'
@@ -492,14 +492,14 @@ def build_docker_images() {
}
}
},
- 'ci_cortexm': {
+ 'ci_qemu': {
node('CPU') {
timeout(time: max_time, unit: 'MINUTES') {
init_git()
// We're purposefully not setting the built image here since they
// are not yet being uploaded to tlcpack
- // ci_cortexm = build_image('ci_cortexm')
- build_image('ci_cortexm')
+ // ci_qemu = build_image('ci_qemu')
+ build_image('ci_qemu')
}
}
},
@@ -816,27 +816,27 @@ stage('Build') {
Utils.markStageSkippedForConditional('BUILD: arm')
}
},
- 'BUILD: Cortex-M': {
+ 'BUILD: QEMU': {
if (!skip_ci && is_docs_only_build != 1) {
node('CPU-SMALL') {
- ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/build-cortexm") {
- docker_init(ci_cortexm)
+ ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/build-qemu") {
+ docker_init(ci_qemu)
init_git()
sh (
- script: "${docker_run} ${ci_cortexm} ./tests/scripts/task_config_build_cortexm.sh build",
- label: 'Create Cortex-M cmake config',
+ script: "${docker_run} ${ci_qemu} ./tests/scripts/task_config_build_qemu.sh build",
+ label: 'Create QEMU cmake config',
)
- make(ci_cortexm, 'build', '-j2')
+ make(ci_qemu, 'build', '-j2')
sh(
script: """
set -eux
md5sum build/libtvm.so
- aws s3 cp --no-progress build/libtvm.so s3://${s3_prefix}/cortexm/build/libtvm.so
+ aws s3 cp --no-progress build/libtvm.so s3://${s3_prefix}/qemu/build/libtvm.so
md5sum build/libtvm_runtime.so
- aws s3 cp --no-progress build/libtvm_runtime.so s3://${s3_prefix}/cortexm/build/libtvm_runtime.so
+ aws s3 cp --no-progress build/libtvm_runtime.so s3://${s3_prefix}/qemu/build/libtvm_runtime.so
md5sum build/config.cmake
- aws s3 cp --no-progress build/config.cmake s3://${s3_prefix}/cortexm/build/config.cmake
- aws s3 cp --no-progress build/microtvm_template_projects s3://${s3_prefix}/cortexm/build/microtvm_template_projects --recursive
+ aws s3 cp --no-progress build/config.cmake s3://${s3_prefix}/qemu/build/config.cmake
+ aws s3 cp --no-progress build/microtvm_template_projects s3://${s3_prefix}/qemu/build/microtvm_template_projects --recursive
""",
label: 'Upload artifacts to S3',
)
@@ -844,7 +844,7 @@ stage('Build') {
}
}
} else {
- Utils.markStageSkippedForConditional('BUILD: Cortex-M')
+ Utils.markStageSkippedForConditional('BUILD: QEMU')
}
},
'BUILD: Hexagon': {
@@ -2998,38 +2998,38 @@ def shard_run_frontend_aarch64_2_of_2() {
def shard_run_test_Qemu_1_of_4() {
if (!skip_ci && is_docs_only_build != 1) {
node('CPU-SMALL') {
- ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-cortexm") {
+ ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-qemu") {
try {
- docker_init(ci_cortexm)
+ docker_init(ci_qemu)
init_git()
timeout(time: max_time, unit: 'MINUTES') {
withEnv([
- 'PLATFORM=cortexm',
+ 'PLATFORM=qemu',
'TVM_NUM_SHARDS=4',
'TVM_SHARD_INDEX=0'], {
sh(
script: """
set -eux
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/libtvm.so build/libtvm.so
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/libtvm.so build/libtvm.so
md5sum build/libtvm.so
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/libtvm_runtime.so build/libtvm_runtime.so
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/libtvm_runtime.so build/libtvm_runtime.so
md5sum build/libtvm_runtime.so
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/config.cmake build/config.cmake
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/config.cmake build/config.cmake
md5sum build/config.cmake
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/microtvm_template_projects build/microtvm_template_projects --recursive
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/microtvm_template_projects build/microtvm_template_projects --recursive
""",
label: 'Download artifacts from S3',
)
add_microtvm_permissions()
- ci_setup(ci_cortexm)
- cpp_unittest(ci_cortexm)
+ ci_setup(ci_qemu)
+ cpp_unittest(ci_qemu)
sh (
- script: "${docker_run} ${ci_cortexm} ./tests/scripts/task_demo_microtvm.sh",
+ script: "${docker_run} ${ci_qemu} ./tests/scripts/task_demo_microtvm.sh",
label: 'Run microTVM demos',
)
sh (
- script: "${docker_run} ${ci_cortexm} ./tests/scripts/task_python_microtvm.sh",
+ script: "${docker_run} ${ci_qemu} ./tests/scripts/task_python_microtvm.sh",
label: 'Run microTVM tests',
)
})
@@ -3055,33 +3055,33 @@ def shard_run_test_Qemu_1_of_4() {
def shard_run_test_Qemu_2_of_4() {
if (!skip_ci && is_docs_only_build != 1) {
node('CPU-SMALL') {
- ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-cortexm") {
+ ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-qemu") {
try {
- docker_init(ci_cortexm)
+ docker_init(ci_qemu)
init_git()
timeout(time: max_time, unit: 'MINUTES') {
withEnv([
- 'PLATFORM=cortexm',
+ 'PLATFORM=qemu',
'TVM_NUM_SHARDS=4',
'TVM_SHARD_INDEX=1'], {
sh(
script: """
set -eux
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/libtvm.so build/libtvm.so
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/libtvm.so build/libtvm.so
md5sum build/libtvm.so
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/libtvm_runtime.so build/libtvm_runtime.so
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/libtvm_runtime.so build/libtvm_runtime.so
md5sum build/libtvm_runtime.so
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/config.cmake build/config.cmake
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/config.cmake build/config.cmake
md5sum build/config.cmake
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/microtvm_template_projects build/microtvm_template_projects --recursive
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/microtvm_template_projects build/microtvm_template_projects --recursive
""",
label: 'Download artifacts from S3',
)
add_microtvm_permissions()
- ci_setup(ci_cortexm)
+ ci_setup(ci_qemu)
sh (
- script: "${docker_run} ${ci_cortexm} ./tests/scripts/task_python_microtvm.sh",
+ script: "${docker_run} ${ci_qemu} ./tests/scripts/task_python_microtvm.sh",
label: 'Run microTVM tests',
)
})
@@ -3107,33 +3107,33 @@ def shard_run_test_Qemu_2_of_4() {
def shard_run_test_Qemu_3_of_4() {
if (!skip_ci && is_docs_only_build != 1) {
node('CPU-SMALL') {
- ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-cortexm") {
+ ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-qemu") {
try {
- docker_init(ci_cortexm)
+ docker_init(ci_qemu)
init_git()
timeout(time: max_time, unit: 'MINUTES') {
withEnv([
- 'PLATFORM=cortexm',
+ 'PLATFORM=qemu',
'TVM_NUM_SHARDS=4',
'TVM_SHARD_INDEX=2'], {
sh(
script: """
set -eux
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/libtvm.so build/libtvm.so
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/libtvm.so build/libtvm.so
md5sum build/libtvm.so
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/libtvm_runtime.so build/libtvm_runtime.so
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/libtvm_runtime.so build/libtvm_runtime.so
md5sum build/libtvm_runtime.so
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/config.cmake build/config.cmake
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/config.cmake build/config.cmake
md5sum build/config.cmake
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/microtvm_template_projects build/microtvm_template_projects --recursive
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/microtvm_template_projects build/microtvm_template_projects --recursive
""",
label: 'Download artifacts from S3',
)
add_microtvm_permissions()
- ci_setup(ci_cortexm)
+ ci_setup(ci_qemu)
sh (
- script: "${docker_run} ${ci_cortexm} ./tests/scripts/task_python_microtvm.sh",
+ script: "${docker_run} ${ci_qemu} ./tests/scripts/task_python_microtvm.sh",
label: 'Run microTVM tests',
)
})
@@ -3159,33 +3159,33 @@ def shard_run_test_Qemu_3_of_4() {
def shard_run_test_Qemu_4_of_4() {
if (!skip_ci && is_docs_only_build != 1) {
node('CPU-SMALL') {
- ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-cortexm") {
+ ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-qemu") {
try {
- docker_init(ci_cortexm)
+ docker_init(ci_qemu)
init_git()
timeout(time: max_time, unit: 'MINUTES') {
withEnv([
- 'PLATFORM=cortexm',
+ 'PLATFORM=qemu',
'TVM_NUM_SHARDS=4',
'TVM_SHARD_INDEX=3'], {
sh(
script: """
set -eux
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/libtvm.so build/libtvm.so
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/libtvm.so build/libtvm.so
md5sum build/libtvm.so
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/libtvm_runtime.so build/libtvm_runtime.so
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/libtvm_runtime.so build/libtvm_runtime.so
md5sum build/libtvm_runtime.so
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/config.cmake build/config.cmake
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/config.cmake build/config.cmake
md5sum build/config.cmake
- aws s3 cp --no-progress s3://${s3_prefix}/cortexm/build/microtvm_template_projects build/microtvm_template_projects --recursive
+ aws s3 cp --no-progress s3://${s3_prefix}/qemu/build/microtvm_template_projects build/microtvm_template_projects --recursive
""",
label: 'Download artifacts from S3',
)
add_microtvm_permissions()
- ci_setup(ci_cortexm)
+ ci_setup(ci_qemu)
sh (
- script: "${docker_run} ${ci_cortexm} ./tests/scripts/task_python_microtvm.sh",
+ script: "${docker_run} ${ci_qemu} ./tests/scripts/task_python_microtvm.sh",
label: 'Run microTVM tests',
)
})
@@ -3616,7 +3616,7 @@ def deploy() {
update_docker(ci_hexagon, "tlcpackstaging/ci_hexagon:${tag}")
update_docker(ci_i386, "tlcpackstaging/ci_i386:${tag}")
update_docker(ci_lint, "tlcpackstaging/ci_lint:${tag}")
- update_docker(ci_cortexm, "tlcpackstaging/ci_cortexm:${tag}")
+ update_docker(ci_qemu, "tlcpackstaging/ci_qemu:${tag}")
update_docker(ci_wasm, "tlcpackstaging/ci_wasm:${tag}")
} finally {
sh(
diff --git a/ci/jenkins/DockerBuild.groovy.j2 b/ci/jenkins/DockerBuild.groovy.j2
index a0ff666773..0396efef59 100644
--- a/ci/jenkins/DockerBuild.groovy.j2
+++ b/ci/jenkins/DockerBuild.groovy.j2
@@ -86,7 +86,7 @@ def build_image(image_name) {
returnStdout: true,
script: 'git log -1 --format=\'%h\''
).trim()
- def full_name = "${image_name}:${env.BRANCH_NAME}-${hash}-${env.BUILD_NUMBER}"
+ def full_name = "${image_name}:${env.BRANCH_NAME}-${hash}-${env.BUILD_NUMBER}".replace('/', '-')
sh(
script: "${docker_build} ${image_name} --spec ${full_name}",
label: 'Build docker image'