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 e9e8c4b263 fix GPU other build (#13235)
e9e8c4b263 is described below
commit e9e8c4b263aa33bfd6bd54151a4bc7eb89da8deb
Author: alter-xp <[email protected]>
AuthorDate: Wed Nov 2 00:54:19 2022 +0800
fix GPU other build (#13235)
fixes #12777
Co-authored-by: thead_iot_autotest <[email protected]>
Co-authored-by: driazati <[email protected]>
---
Jenkinsfile | 24 +++++-------------------
ci/jenkins/Build.groovy.j2 | 8 ++++----
2 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 135f64dc1d..496887479c 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-10-19T13:44:32.119961
+// Generated at 2022-11-01T15:54:54.217190
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// NOTE: these lines are scanned by docker/dev_common.sh. Please update the
regex as needed. -->
@@ -677,7 +677,7 @@ def fsim_test(image) {
def cmake_build(image, path, make_flag) {
sh (
- script: "${docker_run} --env CI_NUM_EXECUTORS ${image}
./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod",
+ script: "${docker_run} --env CI_NUM_EXECUTORS ${image}
./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir
${path}",
label: 'Run cmake build',
)
}
@@ -761,23 +761,9 @@ stage('Build') {
// compiler test
- sh "${docker_run} --no-gpu ${ci_gpu}
./tests/scripts/task_config_build_gpu_other.sh build2"
- make("${ci_gpu} --no-gpu", 'build2', '-j2')
- sh(
- script: """
- set -eux
- . ci/scripts/retry.sh
- md5sum build/libtvm.so
- retry 3 aws s3 cp --no-progress build/libtvm.so
s3://${s3_prefix}/gpu2/build/libtvm.so
- md5sum build/libvta_fsim.so
- retry 3 aws s3 cp --no-progress build/libvta_fsim.so
s3://${s3_prefix}/gpu2/build/libvta_fsim.so
- md5sum build/libtvm_runtime.so
- retry 3 aws s3 cp --no-progress build/libtvm_runtime.so
s3://${s3_prefix}/gpu2/build/libtvm_runtime.so
- md5sum build/config.cmake
- retry 3 aws s3 cp --no-progress build/config.cmake
s3://${s3_prefix}/gpu2/build/config.cmake
- """,
- label: 'Upload artifacts to S3',
- )
+ sh "${docker_run} --no-gpu ${ci_gpu} ./tests/scripts/task_clean.sh
build",
+ sh "${docker_run} --no-gpu ${ci_gpu}
./tests/scripts/task_config_build_gpu_other.sh build"
+ make("${ci_gpu} --no-gpu", 'build', '-j2')
}
}
}
diff --git a/ci/jenkins/Build.groovy.j2 b/ci/jenkins/Build.groovy.j2
index 49cffacdc1..315057c5d5 100644
--- a/ci/jenkins/Build.groovy.j2
+++ b/ci/jenkins/Build.groovy.j2
@@ -21,7 +21,7 @@ def fsim_test(image) {
def cmake_build(image, path, make_flag) {
sh (
- script: "${docker_run} --env CI_NUM_EXECUTORS ${image}
./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod",
+ script: "${docker_run} --env CI_NUM_EXECUTORS ${image}
./tests/scripts/task_build.py --sccache-bucket tvm-sccache-prod --build-dir
${path}",
label: 'Run cmake build',
)
}
@@ -93,9 +93,9 @@ stage('Build') {
{{ m.upload_artifacts(tag='gpu', filenames=tvm_multilib,
folders=microtvm_template_projects) }}
// compiler test
- sh "${docker_run} --no-gpu ${ci_gpu}
./tests/scripts/task_config_build_gpu_other.sh build2"
- make("${ci_gpu} --no-gpu", 'build2', '-j2')
- {{ m.upload_artifacts(tag='gpu2', filenames=tvm_multilib) }}
+ sh "${docker_run} --no-gpu ${ci_gpu} ./tests/scripts/task_clean.sh build",
+ sh "${docker_run} --no-gpu ${ci_gpu}
./tests/scripts/task_config_build_gpu_other.sh build"
+ make("${ci_gpu} --no-gpu", 'build', '-j2')
{% endcall %}
{% call m.build_step(