This is an automated email from the ASF dual-hosted git repository.
driazati pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git
The following commit(s) were added to refs/heads/main by this push:
new 6314b256cd [ci] Add PLATFORM env var to builds (#14713)
6314b256cd is described below
commit 6314b256cd94775c19ad05c665cadc2965e0ba73
Author: driazati <[email protected]>
AuthorDate: Tue Apr 25 15:56:15 2023 -0700
[ci] Add PLATFORM env var to builds (#14713)
This exposes the env var `PLATFORM` during builds so we can use it to
differentiate builds at runtime.
---
ci/jenkins/generated/arm_jenkinsfile.groovy | 11 ++++++++---
ci/jenkins/generated/cortexm_jenkinsfile.groovy | 11 ++++++++---
ci/jenkins/generated/cpu_jenkinsfile.groovy | 11 ++++++++---
ci/jenkins/generated/docker_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/gpu_jenkinsfile.groovy | 11 ++++++++---
ci/jenkins/generated/hexagon_jenkinsfile.groovy | 11 ++++++++---
ci/jenkins/generated/i386_jenkinsfile.groovy | 11 ++++++++---
ci/jenkins/generated/lint_jenkinsfile.groovy | 4 ++--
ci/jenkins/generated/minimal_cross_isa_jenkinsfile.groovy | 11 ++++++++---
ci/jenkins/generated/minimal_jenkinsfile.groovy | 11 ++++++++---
ci/jenkins/generated/riscv_jenkinsfile.groovy | 15 ++++++++++-----
ci/jenkins/generated/wasm_jenkinsfile.groovy | 11 ++++++++---
ci/jenkins/templates/arm_jenkinsfile.groovy.j2 | 1 +
ci/jenkins/templates/cortexm_jenkinsfile.groovy.j2 | 1 +
ci/jenkins/templates/cpu_jenkinsfile.groovy.j2 | 1 +
ci/jenkins/templates/gpu_jenkinsfile.groovy.j2 | 1 +
ci/jenkins/templates/hexagon_jenkinsfile.groovy.j2 | 1 +
ci/jenkins/templates/i386_jenkinsfile.groovy.j2 | 1 +
.../templates/minimal_cross_isa_jenkinsfile.groovy.j2 | 1 +
ci/jenkins/templates/minimal_jenkinsfile.groovy.j2 | 1 +
ci/jenkins/templates/riscv_jenkinsfile.groovy.j2 | 5 +++--
ci/jenkins/templates/utils/base.groovy.j2 | 2 +-
ci/jenkins/templates/utils/macros.j2 | 9 +++++++--
ci/jenkins/templates/wasm_jenkinsfile.groovy.j2 | 1 +
24 files changed, 106 insertions(+), 41 deletions(-)
diff --git a/ci/jenkins/generated/arm_jenkinsfile.groovy
b/ci/jenkins/generated/arm_jenkinsfile.groovy
index e1e6c30847..487a21ef08 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-04-06T08:57:35.009545
+// Generated at 2023-04-24T11:43:39.830981
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
@@ -552,7 +552,11 @@ def build(node_type) {
init_git()
docker_init(ci_arm)
timeout(time: max_time, unit: 'MINUTES') {
- sh (
+
+ withEnv([
+ 'PLATFORM=arm',
+ ], {
+ sh (
script: "${docker_run} ${ci_arm}
./tests/scripts/task_config_build_arm.sh build",
label: 'Create ARM cmake config',
)
@@ -563,6 +567,7 @@ def build(node_type) {
script: "./${jenkins_scripts_root}/s3.py --action upload --bucket
${s3_bucket} --prefix ${s3_prefix}/arm --items build/libtvm.so
build/libvta_fsim.so build/libtvm_runtime.so build/config.cmake build/cpptest
build/build.ninja build/CMakeFiles/rules.ninja build/crttest
build/standalone_crt build/build.ninja build/microtvm_template_projects",
label: 'Upload artifacts to S3',
)
+ })
}
}
}
diff --git a/ci/jenkins/generated/cortexm_jenkinsfile.groovy
b/ci/jenkins/generated/cortexm_jenkinsfile.groovy
index 41c67dd2ed..d82b736490 100644
--- a/ci/jenkins/generated/cortexm_jenkinsfile.groovy
+++ b/ci/jenkins/generated/cortexm_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-04-06T08:57:34.777421
+// Generated at 2023-04-24T11:43:39.885039
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
@@ -552,7 +552,11 @@ def build(node_type) {
init_git()
docker_init(ci_cortexm)
timeout(time: max_time, unit: 'MINUTES') {
- sh (
+
+ withEnv([
+ 'PLATFORM=cortexm',
+ ], {
+ sh (
script: "${docker_run} ${ci_cortexm}
./tests/scripts/task_config_build_cortexm.sh build",
label: 'Create Cortex-M cmake config',
)
@@ -563,6 +567,7 @@ def build(node_type) {
script: "./${jenkins_scripts_root}/s3.py --action upload --bucket
${s3_bucket} --prefix ${s3_prefix}/cortexm --items build/libtvm.so
build/libtvm_runtime.so build/config.cmake build/libtvm_allvisible.so
build/crttest build/standalone_crt build/build.ninja build/cpptest
build/build.ninja build/CMakeFiles/rules.ninja
build/microtvm_template_projects",
label: 'Upload artifacts to S3',
)
+ })
}
}
}
diff --git a/ci/jenkins/generated/cpu_jenkinsfile.groovy
b/ci/jenkins/generated/cpu_jenkinsfile.groovy
index e17be5bf21..f6cc207f95 100644
--- a/ci/jenkins/generated/cpu_jenkinsfile.groovy
+++ b/ci/jenkins/generated/cpu_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-04-06T08:57:35.029147
+// Generated at 2023-04-24T11:43:40.011245
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
@@ -552,7 +552,11 @@ def build(node_type) {
init_git()
docker_init(ci_cpu)
timeout(time: max_time, unit: 'MINUTES') {
- sh (
+
+ withEnv([
+ 'PLATFORM=cpu',
+ ], {
+ sh (
script: "${docker_run} ${ci_cpu}
./tests/scripts/task_config_build_cpu.sh build",
label: 'Create CPU cmake config',
)
@@ -568,6 +572,7 @@ def build(node_type) {
// sh "${docker_run} ${ci_cpu} ./tests/scripts/task_golang.sh"
// TODO(@jroesch): need to resolve CI issue will turn back on in
follow up patch
sh (script: "${docker_run} ${ci_cpu} ./tests/scripts/task_rust.sh",
label: 'Rust build and test')
+ })
}
}
}
diff --git a/ci/jenkins/generated/docker_jenkinsfile.groovy
b/ci/jenkins/generated/docker_jenkinsfile.groovy
index d13b24c0f3..d2e0f55dd9 100644
--- a/ci/jenkins/generated/docker_jenkinsfile.groovy
+++ b/ci/jenkins/generated/docker_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-04-12T10:38:06.713545
+// Generated at 2023-04-24T11:43:39.960968
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
diff --git a/ci/jenkins/generated/gpu_jenkinsfile.groovy
b/ci/jenkins/generated/gpu_jenkinsfile.groovy
index 56867303ca..5bd7f3b840 100644
--- a/ci/jenkins/generated/gpu_jenkinsfile.groovy
+++ b/ci/jenkins/generated/gpu_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-04-12T10:38:06.835649
+// Generated at 2023-04-24T11:43:39.904210
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
@@ -552,7 +552,11 @@ def build(node_type) {
init_git()
docker_init(ci_gpu)
timeout(time: max_time, unit: 'MINUTES') {
- sh "${docker_run} --no-gpu ${ci_gpu}
./tests/scripts/task_config_build_gpu.sh build"
+
+ withEnv([
+ 'PLATFORM=gpu',
+ ], {
+ sh "${docker_run} --no-gpu ${ci_gpu}
./tests/scripts/task_config_build_gpu.sh build"
cmake_build("${ci_gpu} --no-gpu", 'build', '-j2')
make_standalone_crt("${ci_gpu} --no-gpu", 'build')
sh(
@@ -570,6 +574,7 @@ def build(node_type) {
script: "./${jenkins_scripts_root}/s3.py --action upload --bucket
${s3_bucket} --prefix ${s3_prefix}/gpu2 --items build/libtvm.so
build/libtvm_runtime.so build/config.cmake build/crttest build/standalone_crt
build/build.ninja",
label: 'Upload artifacts to S3',
)
+ })
}
}
}
diff --git a/ci/jenkins/generated/hexagon_jenkinsfile.groovy
b/ci/jenkins/generated/hexagon_jenkinsfile.groovy
index 53d96ba9e6..2b2b7b3d63 100644
--- a/ci/jenkins/generated/hexagon_jenkinsfile.groovy
+++ b/ci/jenkins/generated/hexagon_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-04-06T08:57:34.987227
+// Generated at 2023-04-24T11:43:39.811677
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
@@ -552,7 +552,11 @@ def build(node_type) {
init_git()
docker_init(ci_hexagon)
timeout(time: max_time, unit: 'MINUTES') {
- sh (
+
+ withEnv([
+ 'PLATFORM=hexagon',
+ ], {
+ sh (
script: "${docker_run} ${ci_hexagon}
./tests/scripts/task_config_build_hexagon.sh build",
label: 'Create Hexagon cmake config',
)
@@ -566,6 +570,7 @@ def build(node_type) {
script: "./${jenkins_scripts_root}/s3.py --action upload --bucket
${s3_bucket} --prefix ${s3_prefix}/hexagon --items build/libtvm.so
build/libtvm_runtime.so build/config.cmake build/cpptest build/build.ninja
build/CMakeFiles/rules.ninja build/hexagon_api_output",
label: 'Upload artifacts to S3',
)
+ })
}
}
}
diff --git a/ci/jenkins/generated/i386_jenkinsfile.groovy
b/ci/jenkins/generated/i386_jenkinsfile.groovy
index 982fb86658..f2ae9d9869 100644
--- a/ci/jenkins/generated/i386_jenkinsfile.groovy
+++ b/ci/jenkins/generated/i386_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-04-06T08:57:34.919055
+// Generated at 2023-04-24T11:43:39.867544
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
@@ -552,7 +552,11 @@ def build(node_type) {
init_git()
docker_init(ci_i386)
timeout(time: max_time, unit: 'MINUTES') {
- sh (
+
+ withEnv([
+ 'PLATFORM=i386',
+ ], {
+ sh (
script: "${docker_run} ${ci_i386}
./tests/scripts/task_config_build_i386.sh build",
label: 'Create i386 cmake config',
)
@@ -563,6 +567,7 @@ def build(node_type) {
script: "./${jenkins_scripts_root}/s3.py --action upload --bucket
${s3_bucket} --prefix ${s3_prefix}/i386 --items build/libvta_tsim.so
build/libtvm.so build/libvta_fsim.so build/libtvm_runtime.so build/config.cmake
build/standalone_crt build/build.ninja build/crttest build/cpptest
build/build.ninja build/CMakeFiles/rules.ninja
build/microtvm_template_projects",
label: 'Upload artifacts to S3',
)
+ })
}
}
}
diff --git a/ci/jenkins/generated/lint_jenkinsfile.groovy
b/ci/jenkins/generated/lint_jenkinsfile.groovy
index 19bd668248..0aadea6d2e 100644
--- a/ci/jenkins/generated/lint_jenkinsfile.groovy
+++ b/ci/jenkins/generated/lint_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-04-05T09:41:25.448756
+// Generated at 2023-04-24T11:43:39.927715
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
diff --git a/ci/jenkins/generated/minimal_cross_isa_jenkinsfile.groovy
b/ci/jenkins/generated/minimal_cross_isa_jenkinsfile.groovy
index 3b3a539f89..f118ac94fe 100644
--- a/ci/jenkins/generated/minimal_cross_isa_jenkinsfile.groovy
+++ b/ci/jenkins/generated/minimal_cross_isa_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-04-06T08:57:34.965999
+// Generated at 2023-04-24T11:43:39.979491
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
@@ -552,7 +552,11 @@ def build(node_type) {
init_git()
docker_init(ci_minimal)
timeout(time: max_time, unit: 'MINUTES') {
- sh (
+
+ withEnv([
+ 'PLATFORM=arm',
+ ], {
+ sh (
script: "${docker_run} ${ci_minimal}
./tests/scripts/task_config_build_minimal_cross_isa.sh build",
label: 'Create CPU minimal cmake config',
)
@@ -561,6 +565,7 @@ def build(node_type) {
script: "./${jenkins_scripts_root}/s3.py --action upload --bucket
${s3_bucket} --prefix ${s3_prefix}/cpu-minimal-cross-isa --items
build/libtvm.so build/libtvm_runtime.so build/config.cmake
build/libtvm_allvisible.so build/standalone_crt build/build.ninja
build/microtvm_template_projects",
label: 'Upload artifacts to S3',
)
+ })
}
}
}
diff --git a/ci/jenkins/generated/minimal_jenkinsfile.groovy
b/ci/jenkins/generated/minimal_jenkinsfile.groovy
index b13cd2d6f2..b88464ce03 100644
--- a/ci/jenkins/generated/minimal_jenkinsfile.groovy
+++ b/ci/jenkins/generated/minimal_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-04-06T08:57:34.850681
+// Generated at 2023-04-24T11:43:39.944208
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
@@ -552,7 +552,11 @@ def build(node_type) {
init_git()
docker_init(ci_minimal)
timeout(time: max_time, unit: 'MINUTES') {
- sh (
+
+ withEnv([
+ 'PLATFORM=minimal',
+ ], {
+ sh (
script: "${docker_run} ${ci_minimal}
./tests/scripts/task_config_build_minimal.sh build",
label: 'Create CPU minimal cmake config',
)
@@ -563,6 +567,7 @@ def build(node_type) {
script: "./${jenkins_scripts_root}/s3.py --action upload --bucket
${s3_bucket} --prefix ${s3_prefix}/cpu-minimal --items build/libtvm.so
build/libtvm_runtime.so build/config.cmake build/libtvm_allvisible.so
build/crttest build/cpptest build/build.ninja build/CMakeFiles/rules.ninja
build/standalone_crt build/build.ninja build/microtvm_template_projects",
label: 'Upload artifacts to S3',
)
+ })
}
}
}
diff --git a/ci/jenkins/generated/riscv_jenkinsfile.groovy
b/ci/jenkins/generated/riscv_jenkinsfile.groovy
index f38d58a7a7..9fa884554a 100644
--- a/ci/jenkins/generated/riscv_jenkinsfile.groovy
+++ b/ci/jenkins/generated/riscv_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-04-06T08:57:35.073423
+// Generated at 2023-04-24T13:05:44.338831
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
@@ -552,7 +552,11 @@ def build(node_type) {
init_git()
docker_init(ci_riscv)
timeout(time: max_time, unit: 'MINUTES') {
- sh (
+
+ withEnv([
+ 'PLATFORM=riscv',
+ ], {
+ sh (
script: "${docker_run} ${ci_riscv}
./tests/scripts/task_config_build_riscv.sh build",
label: 'Create RISC-V cmake config',
)
@@ -563,6 +567,7 @@ def build(node_type) {
script: "./${jenkins_scripts_root}/s3.py --action upload --bucket
${s3_bucket} --prefix ${s3_prefix}/riscv --items build/libtvm.so
build/libtvm_runtime.so build/config.cmake build/libtvm_allvisible.so
build/standalone_crt build/build.ninja build/crttest build/cpptest
build/build.ninja build/CMakeFiles/rules.ninja
build/microtvm_template_projects",
label: 'Upload artifacts to S3',
)
+ })
}
}
}
@@ -604,8 +609,8 @@ def
shard_run_test_RISC_V_1_of_1(node_type='CPU-SMALL-SPOT', on_demand=false) {
)
ci_setup(ci_riscv)
- cpp_unittest(ci_cortexm)
- micro_cpp_unittest(ci_cortexm)
+ cpp_unittest(ci_riscv)
+ micro_cpp_unittest(ci_riscv)
sh (
script: "${docker_run} ${ci_riscv}
./tests/scripts/task_riscv_microtvm.sh",
label: 'Run microTVM tests',
diff --git a/ci/jenkins/generated/wasm_jenkinsfile.groovy
b/ci/jenkins/generated/wasm_jenkinsfile.groovy
index f5108a47f3..473aac9bb4 100644
--- a/ci/jenkins/generated/wasm_jenkinsfile.groovy
+++ b/ci/jenkins/generated/wasm_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-04-06T08:57:35.054619
+// Generated at 2023-04-24T11:43:39.996286
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -112,7 +112,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
@@ -552,7 +552,11 @@ def build(node_type) {
init_git()
docker_init(ci_wasm)
timeout(time: max_time, unit: 'MINUTES') {
- sh (
+
+ withEnv([
+ 'PLATFORM=wasm',
+ ], {
+ sh (
script: "${docker_run} ${ci_wasm}
./tests/scripts/task_config_build_wasm.sh build",
label: 'Create WASM cmake config',
)
@@ -565,6 +569,7 @@ def build(node_type) {
script: "${docker_run} ${ci_wasm} ./tests/scripts/task_web_wasm.sh",
label: 'Run WASM lint and tests',
)
+ })
}
}
}
diff --git a/ci/jenkins/templates/arm_jenkinsfile.groovy.j2
b/ci/jenkins/templates/arm_jenkinsfile.groovy.j2
index b455fa0412..18862f8c97 100644
--- a/ci/jenkins/templates/arm_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/arm_jenkinsfile.groovy.j2
@@ -23,6 +23,7 @@
condition='!skip_ci && is_docs_only_build != 1',
ws='tvm/build-arm',
docker_image='ci_arm',
+ platform="arm",
) %}
sh (
script: "${docker_run} ${ci_arm} ./tests/scripts/task_config_build_arm.sh
build",
diff --git a/ci/jenkins/templates/cortexm_jenkinsfile.groovy.j2
b/ci/jenkins/templates/cortexm_jenkinsfile.groovy.j2
index acbc147f40..a6708cfb63 100644
--- a/ci/jenkins/templates/cortexm_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/cortexm_jenkinsfile.groovy.j2
@@ -23,6 +23,7 @@
condition='!skip_ci && is_docs_only_build != 1',
ws='tvm/build-cortexm',
docker_image='ci_cortexm',
+ platform="cortexm",
) %}
sh (
script: "${docker_run} ${ci_cortexm}
./tests/scripts/task_config_build_cortexm.sh build",
diff --git a/ci/jenkins/templates/cpu_jenkinsfile.groovy.j2
b/ci/jenkins/templates/cpu_jenkinsfile.groovy.j2
index a833a89d64..a7142ef4d0 100644
--- a/ci/jenkins/templates/cpu_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/cpu_jenkinsfile.groovy.j2
@@ -23,6 +23,7 @@
condition='!skip_ci && is_docs_only_build != 1',
ws='tvm/build-cpu',
docker_image='ci_cpu',
+ platform="cpu",
) %}
sh (
script: "${docker_run} ${ci_cpu} ./tests/scripts/task_config_build_cpu.sh
build",
diff --git a/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2
b/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2
index 40698131a7..fe05e60172 100644
--- a/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2
@@ -23,6 +23,7 @@
condition='!skip_ci',
ws='tvm/build-gpu',
docker_image='ci_gpu',
+ platform="gpu",
) %}
sh "${docker_run} --no-gpu ${ci_gpu}
./tests/scripts/task_config_build_gpu.sh build"
cmake_build("${ci_gpu} --no-gpu", 'build', '-j2')
diff --git a/ci/jenkins/templates/hexagon_jenkinsfile.groovy.j2
b/ci/jenkins/templates/hexagon_jenkinsfile.groovy.j2
index 140c227154..94ea7dba04 100644
--- a/ci/jenkins/templates/hexagon_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/hexagon_jenkinsfile.groovy.j2
@@ -23,6 +23,7 @@
condition='!skip_ci && is_docs_only_build != 1',
ws='tvm/build-hexagon',
docker_image='ci_hexagon',
+ platform="hexagon",
) %}
sh (
script: "${docker_run} ${ci_hexagon}
./tests/scripts/task_config_build_hexagon.sh build",
diff --git a/ci/jenkins/templates/i386_jenkinsfile.groovy.j2
b/ci/jenkins/templates/i386_jenkinsfile.groovy.j2
index da1cdeaefe..56a2d7d9f1 100644
--- a/ci/jenkins/templates/i386_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/i386_jenkinsfile.groovy.j2
@@ -23,6 +23,7 @@
condition='!skip_ci && is_docs_only_build != 1',
ws='tvm/build-i386',
docker_image='ci_i386',
+ platform="i386",
) %}
sh (
script: "${docker_run} ${ci_i386}
./tests/scripts/task_config_build_i386.sh build",
diff --git a/ci/jenkins/templates/minimal_cross_isa_jenkinsfile.groovy.j2
b/ci/jenkins/templates/minimal_cross_isa_jenkinsfile.groovy.j2
index dce5ead041..4b8a600b0e 100644
--- a/ci/jenkins/templates/minimal_cross_isa_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/minimal_cross_isa_jenkinsfile.groovy.j2
@@ -23,6 +23,7 @@
condition='!skip_ci && is_docs_only_build != 1',
ws='tvm/build-cpu-minimal-cross-isa',
docker_image='ci_minimal',
+ platform="arm",
) %}
sh (
script: "${docker_run} ${ci_minimal}
./tests/scripts/task_config_build_minimal_cross_isa.sh build",
diff --git a/ci/jenkins/templates/minimal_jenkinsfile.groovy.j2
b/ci/jenkins/templates/minimal_jenkinsfile.groovy.j2
index 6420599061..a538aa4061 100644
--- a/ci/jenkins/templates/minimal_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/minimal_jenkinsfile.groovy.j2
@@ -23,6 +23,7 @@
condition='!skip_ci && is_docs_only_build != 1',
ws='tvm/build-cpu-minimal',
docker_image='ci_minimal',
+ platform="minimal",
) %}
sh (
script: "${docker_run} ${ci_minimal}
./tests/scripts/task_config_build_minimal.sh build",
diff --git a/ci/jenkins/templates/riscv_jenkinsfile.groovy.j2
b/ci/jenkins/templates/riscv_jenkinsfile.groovy.j2
index 35bb84cdf7..8ad5a1a10d 100644
--- a/ci/jenkins/templates/riscv_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/riscv_jenkinsfile.groovy.j2
@@ -23,6 +23,7 @@
condition='!skip_ci && is_docs_only_build != 1',
ws='tvm/build-riscv',
docker_image='ci_riscv',
+ platform="riscv",
) %}
sh (
script: "${docker_run} ${ci_riscv}
./tests/scripts/task_config_build_riscv.sh build",
@@ -50,8 +51,8 @@
{{ m.download_artifacts(tag='riscv') }}
ci_setup(ci_riscv)
{% if shard_index == 1%}
- cpp_unittest(ci_cortexm)
- micro_cpp_unittest(ci_cortexm)
+ cpp_unittest(ci_riscv)
+ micro_cpp_unittest(ci_riscv)
{% endif %}
sh (
script: "${docker_run} ${ci_riscv} ./tests/scripts/task_riscv_microtvm.sh",
diff --git a/ci/jenkins/templates/utils/base.groovy.j2
b/ci/jenkins/templates/utils/base.groovy.j2
index f54dc6716a..68395d05a9 100644
--- a/ci/jenkins/templates/utils/base.groovy.j2
+++ b/ci/jenkins/templates/utils/base.groovy.j2
@@ -85,7 +85,7 @@ properties([
upstream_revision = null
// command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env
TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX
--env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS
--env TEST_STEP_NAME'
docker_build = 'docker/build.sh'
// timeout in minutes
max_time = 180
diff --git a/ci/jenkins/templates/utils/macros.j2
b/ci/jenkins/templates/utils/macros.j2
index c96331333f..18ed578549 100644
--- a/ci/jenkins/templates/utils/macros.j2
+++ b/ci/jenkins/templates/utils/macros.j2
@@ -70,7 +70,7 @@ def {{ method_name }}(node_type='{{ node }}-SPOT',
on_demand=false) {
{% endfor %}
{% endmacro %}
-{% macro invoke_build(name, condition, node, docker_image, ws) %}
+{% macro invoke_build(name, condition, node, docker_image, ws, platform) %}
def build(node_type) {
stage('Build') {
if ({{ condition }}) {
@@ -79,7 +79,12 @@ def build(node_type) {
init_git()
docker_init({{ docker_image }})
timeout(time: max_time, unit: 'MINUTES') {
- {{ caller() | trim | indent(width=6) }}
+
+ withEnv([
+ 'PLATFORM={{ platform }}',
+ ], {
+ {{ caller() | trim | indent(width=6) }}
+ })
}
}
}
diff --git a/ci/jenkins/templates/wasm_jenkinsfile.groovy.j2
b/ci/jenkins/templates/wasm_jenkinsfile.groovy.j2
index 085fc12220..5cd8a6fbcc 100644
--- a/ci/jenkins/templates/wasm_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/wasm_jenkinsfile.groovy.j2
@@ -23,6 +23,7 @@
condition='!skip_ci && is_docs_only_build != 1',
ws='tvm/build-wasm',
docker_image='ci_wasm',
+ platform='wasm',
) %}
sh (
script: "${docker_run} ${ci_wasm}
./tests/scripts/task_config_build_wasm.sh build",
