From d361585965b95acfb35563b92a2011fe8059876c Mon Sep 17 00:00:00 2001 From: driazati <9407960+driazati@users.noreply.github.com> Date: Wed, 13 Jul 2022 12:08:58 -0700 Subject: [PATCH] [release][v0.9] Remove VTA submodule (#11992) --- .gitmodules | 3 - 3rdparty/vta-hw | 1 - CMakeLists.txt | 2 +- Jenkinsfile | 126 ++---------------- docs/conf.py | 21 +-- jenkins/Build.groovy.j2 | 8 +- jenkins/Jenkinsfile.j2 | 6 +- jenkins/Prepare.groovy.j2 | 8 +- jenkins/Test.groovy.j2 | 8 +- .../contrib/test_verilator/test_mobilenet.py | 3 +- .../test_verilator/test_verilator_ops.py | 2 + tests/scripts/git_change_docker.sh | 4 +- tests/scripts/git_change_docs.sh | 2 +- tests/scripts/task_python_docs.sh | 10 ++ 14 files changed, 58 insertions(+), 146 deletions(-) delete mode 160000 3rdparty/vta-hw diff --git a/.gitmodules b/.gitmodules index e03336443d73..196be9abfd76 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "3rdparty/rang"] path = 3rdparty/rang url = https://github.com/agauniyal/rang.git -[submodule "3rdparty/vta-hw"] - path = 3rdparty/vta-hw - url = https://github.com/apache/tvm-vta.git [submodule "3rdparty/libbacktrace"] path = 3rdparty/libbacktrace url = https://github.com/tlc-pack/libbacktrace.git diff --git a/3rdparty/vta-hw b/3rdparty/vta-hw deleted file mode 160000 index 36a91576edf6..000000000000 --- a/3rdparty/vta-hw +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 36a91576edf633479c78649e050f18dd2ddc8103 diff --git a/CMakeLists.txt b/CMakeLists.txt index 306a8be30858..30e8ff6162f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -456,7 +456,7 @@ if(USE_PIPELINE_EXECUTOR) endif(USE_PIPELINE_EXECUTOR) # Module rules -include(cmake/modules/VTA.cmake) +# include(cmake/modules/VTA.cmake) include(cmake/modules/StandaloneCrt.cmake) include(cmake/modules/Zephyr.cmake) include(cmake/modules/Arduino.cmake) diff --git a/Jenkinsfile b/Jenkinsfile index 3f82ff184013..cf703c5ef62d 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-06-22T10:07:00.173803 +// Generated at 2022-07-11T10:48:20.696436 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -118,7 +118,7 @@ def init_git() { // Determine merge commit to use for all stages sh ( - script: 'git fetch origin main', + script: 'git fetch origin v0.9.0', label: 'Fetch upstream', ) if (upstream_revision == null) { @@ -130,7 +130,7 @@ def init_git() { } sh ( script: "git -c user.name=TVM-Jenkins -c user.email=jenkins@tvm.apache.org merge ${upstream_revision}", - label: 'Merge to origin/main' + label: 'Merge to origin/v0.9.0' ) sh( @@ -201,8 +201,8 @@ def should_skip_slow_tests(pr_number) { } def cancel_previous_build() { - // cancel previous build if it is not on main. - if (env.BRANCH_NAME != 'main') { + // cancel previous build if it is not on v0.9.0. + if (env.BRANCH_NAME != 'v0.9.0') { def buildNumber = env.BUILD_NUMBER as int // Milestone API allows us to cancel previous build // with the same milestone number @@ -582,10 +582,10 @@ def python_unittest(image) { } def fsim_test(image) { - sh ( - script: "${docker_run} ${image} ./tests/scripts/task_python_vta_fsim.sh", - label: 'Run VTA tests in FSIM', - ) + // sh ( + // script: "${docker_run} ${image} ./tests/scripts/task_python_vta_fsim.sh", + // label: 'Run VTA tests in FSIM', + // ) } def cmake_build(image, path, make_flag) { @@ -659,8 +659,6 @@ stage('Build') { set -eux md5sum build/libtvm.so aws s3 cp --no-progress build/libtvm.so s3://${s3_prefix}/gpu/build/libtvm.so - md5sum build/libvta_fsim.so - aws s3 cp --no-progress build/libvta_fsim.so s3://${s3_prefix}/gpu/build/libvta_fsim.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress build/libtvm_runtime.so s3://${s3_prefix}/gpu/build/libtvm_runtime.so md5sum build/config.cmake @@ -679,8 +677,6 @@ stage('Build') { set -eux md5sum build/libtvm.so aws s3 cp --no-progress build/libtvm.so s3://${s3_prefix}/gpu2/build/libtvm.so - md5sum build/libvta_fsim.so - aws s3 cp --no-progress build/libvta_fsim.so s3://${s3_prefix}/gpu2/build/libvta_fsim.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress build/libtvm_runtime.so s3://${s3_prefix}/gpu2/build/libtvm_runtime.so md5sum build/config.cmake @@ -707,12 +703,8 @@ stage('Build') { sh( script: """ set -eux - md5sum build/libvta_tsim.so - aws s3 cp --no-progress build/libvta_tsim.so s3://${s3_prefix}/cpu/build/libvta_tsim.so md5sum build/libtvm.so aws s3 cp --no-progress build/libtvm.so s3://${s3_prefix}/cpu/build/libtvm.so - md5sum build/libvta_fsim.so - aws s3 cp --no-progress build/libvta_fsim.so s3://${s3_prefix}/cpu/build/libvta_fsim.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress build/libtvm_runtime.so s3://${s3_prefix}/cpu/build/libtvm_runtime.so md5sum build/config.cmake @@ -772,12 +764,8 @@ stage('Build') { sh( script: """ set -eux - md5sum build/libvta_tsim.so - aws s3 cp --no-progress build/libvta_tsim.so s3://${s3_prefix}/i386/build/libvta_tsim.so md5sum build/libtvm.so aws s3 cp --no-progress build/libtvm.so s3://${s3_prefix}/i386/build/libtvm.so - md5sum build/libvta_fsim.so - aws s3 cp --no-progress build/libvta_fsim.so s3://${s3_prefix}/i386/build/libvta_fsim.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress build/libtvm_runtime.so s3://${s3_prefix}/i386/build/libtvm_runtime.so md5sum build/config.cmake @@ -808,8 +796,6 @@ stage('Build') { set -eux md5sum build/libtvm.so aws s3 cp --no-progress build/libtvm.so s3://${s3_prefix}/arm/build/libtvm.so - md5sum build/libvta_fsim.so - aws s3 cp --no-progress build/libvta_fsim.so s3://${s3_prefix}/arm/build/libvta_fsim.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress build/libtvm_runtime.so s3://${s3_prefix}/arm/build/libtvm_runtime.so md5sum build/config.cmake @@ -916,8 +902,6 @@ def shard_run_unittest_GPU_1_of_3() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu2/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu2/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu2/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu2/build/config.cmake build/config.cmake @@ -933,8 +917,6 @@ def shard_run_unittest_GPU_1_of_3() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -990,8 +972,6 @@ def shard_run_unittest_GPU_2_of_3() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -1050,8 +1030,6 @@ def shard_run_unittest_GPU_3_of_3() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -1105,12 +1083,8 @@ def shard_run_integration_CPU_1_of_6() { sh( script: """ set -eux - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_tsim.so build/libvta_tsim.so - md5sum build/libvta_tsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/config.cmake build/config.cmake @@ -1159,12 +1133,8 @@ def shard_run_integration_CPU_2_of_6() { sh( script: """ set -eux - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_tsim.so build/libvta_tsim.so - md5sum build/libvta_tsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/config.cmake build/config.cmake @@ -1213,12 +1183,8 @@ def shard_run_integration_CPU_3_of_6() { sh( script: """ set -eux - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_tsim.so build/libvta_tsim.so - md5sum build/libvta_tsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/config.cmake build/config.cmake @@ -1267,12 +1233,8 @@ def shard_run_integration_CPU_4_of_6() { sh( script: """ set -eux - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_tsim.so build/libvta_tsim.so - md5sum build/libvta_tsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/config.cmake build/config.cmake @@ -1321,12 +1283,8 @@ def shard_run_integration_CPU_5_of_6() { sh( script: """ set -eux - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_tsim.so build/libvta_tsim.so - md5sum build/libvta_tsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/config.cmake build/config.cmake @@ -1375,12 +1333,8 @@ def shard_run_integration_CPU_6_of_6() { sh( script: """ set -eux - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_tsim.so build/libvta_tsim.so - md5sum build/libvta_tsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/config.cmake build/config.cmake @@ -1432,8 +1386,6 @@ def shard_run_python_i386_1_of_5() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/i386/build/config.cmake build/config.cmake @@ -1486,8 +1438,6 @@ def shard_run_python_i386_2_of_5() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/i386/build/config.cmake build/config.cmake @@ -1540,8 +1490,6 @@ def shard_run_python_i386_3_of_5() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/i386/build/config.cmake build/config.cmake @@ -1593,8 +1541,6 @@ def shard_run_python_i386_4_of_5() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/i386/build/config.cmake build/config.cmake @@ -1646,8 +1592,6 @@ def shard_run_python_i386_5_of_5() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/i386/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/i386/build/config.cmake build/config.cmake @@ -2066,8 +2010,6 @@ def shard_run_integration_aarch64_1_of_4() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/config.cmake build/config.cmake @@ -2119,8 +2061,6 @@ def shard_run_integration_aarch64_2_of_4() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/config.cmake build/config.cmake @@ -2172,8 +2112,6 @@ def shard_run_integration_aarch64_3_of_4() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/config.cmake build/config.cmake @@ -2225,8 +2163,6 @@ def shard_run_integration_aarch64_4_of_4() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/config.cmake build/config.cmake @@ -2279,8 +2215,6 @@ def shard_run_topi_GPU_1_of_4() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -2331,8 +2265,6 @@ def shard_run_topi_GPU_2_of_4() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -2383,8 +2315,6 @@ def shard_run_topi_GPU_3_of_4() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -2435,8 +2365,6 @@ def shard_run_topi_GPU_4_of_4() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -2488,8 +2416,6 @@ def shard_run_frontend_GPU_1_of_6() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -2540,8 +2466,6 @@ def shard_run_frontend_GPU_2_of_6() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -2592,8 +2516,6 @@ def shard_run_frontend_GPU_3_of_6() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -2644,8 +2566,6 @@ def shard_run_frontend_GPU_4_of_6() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -2696,8 +2616,6 @@ def shard_run_frontend_GPU_5_of_6() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -2748,8 +2666,6 @@ def shard_run_frontend_GPU_6_of_6() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake @@ -2801,8 +2717,6 @@ def shard_run_topi_aarch64_1_of_2() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/config.cmake build/config.cmake @@ -2858,8 +2772,6 @@ def shard_run_topi_aarch64_2_of_2() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/config.cmake build/config.cmake @@ -2915,8 +2827,6 @@ def shard_run_frontend_aarch64_1_of_2() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/config.cmake build/config.cmake @@ -2967,8 +2877,6 @@ def shard_run_frontend_aarch64_2_of_2() { set -eux aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/arm/build/config.cmake build/config.cmake @@ -3139,12 +3047,8 @@ stage('Test') { sh( script: """ set -eux - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_tsim.so build/libvta_tsim.so - md5sum build/libvta_tsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/config.cmake build/config.cmake @@ -3157,10 +3061,10 @@ stage('Test') { cpp_unittest(ci_cpu) python_unittest(ci_cpu) fsim_test(ci_cpu) - sh ( - script: "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_tsim.sh", - label: 'Run VTA tests in TSIM', - ) + // sh ( + // script: "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_tsim.sh", + // label: 'Run VTA tests in TSIM', + // ) }) } finally { sh( @@ -3247,8 +3151,6 @@ stage('Test') { set -eux aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/cpu/build/config.cmake build/config.cmake @@ -3292,8 +3194,6 @@ stage('Test') { set -eux aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm.so build/libtvm.so md5sum build/libtvm.so - aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libvta_fsim.so build/libvta_fsim.so - md5sum build/libvta_fsim.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/libtvm_runtime.so build/libtvm_runtime.so md5sum build/libtvm_runtime.so aws s3 cp --no-progress s3://${s3_prefix}/gpu/build/config.cmake build/config.cmake diff --git a/docs/conf.py b/docs/conf.py index 4faa20ddc0c8..14ea856dae45 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,7 +52,7 @@ tvm_path = Path(os.pardir) sys.path.insert(0, str(tvm_path.resolve() / "python")) -sys.path.insert(0, str(tvm_path.resolve() / "vta" / "python")) +# sys.path.insert(0, str(tvm_path.resolve() / "vta" / "python")) sys.path.insert(0, str(tvm_path.resolve() / "docs")) # -- General configuration ------------------------------------------------ @@ -220,7 +220,7 @@ def git_describe_version(original_version): tvm_path.joinpath("gallery", "how_to", "tune_with_autoscheduler"), tvm_path.joinpath("gallery", "how_to", "work_with_microtvm"), tvm_path.joinpath("gallery", "how_to", "extend_tvm"), - tvm_path.joinpath("vta", "tutorials"), + # tvm_path.joinpath("vta", "tutorials"), ] gallery_dirs = [ @@ -234,16 +234,17 @@ def git_describe_version(original_version): "how_to/tune_with_autoscheduler", "how_to/work_with_microtvm", "how_to/extend_tvm", - "topic/vta/tutorials", + # "topic/vta/tutorials", ] subsection_order = ExplicitOrder( - str(p) - for p in [ - tvm_path / "vta" / "tutorials" / "frontend", - tvm_path / "vta" / "tutorials" / "optimize", - tvm_path / "vta" / "tutorials" / "autotvm", - ] + # str(p) + # for p in [ + # tvm_path / "vta" / "tutorials" / "frontend", + # tvm_path / "vta" / "tutorials" / "optimize", + # tvm_path / "vta" / "tutorials" / "autotvm", + # ] + [] ) # Explicitly define the order within a subsection. @@ -399,7 +400,7 @@ def force_gc(gallery_conf, fname): header_links = [ ("Community", "https://tvm.apache.org/community"), ("Download", "https://tvm.apache.org/download"), - ("VTA", "https://tvm.apache.org/vta"), + # ("VTA", "https://tvm.apache.org/vta"), ("Blog", "https://tvm.apache.org/blog"), ("Docs", "https://tvm.apache.org/docs"), ("Conference", "https://tvmconf.org"), diff --git a/jenkins/Build.groovy.j2 b/jenkins/Build.groovy.j2 index fcde53f55939..67439f63e026 100644 --- a/jenkins/Build.groovy.j2 +++ b/jenkins/Build.groovy.j2 @@ -13,10 +13,10 @@ def python_unittest(image) { } def fsim_test(image) { - sh ( - script: "${docker_run} ${image} ./tests/scripts/task_python_vta_fsim.sh", - label: 'Run VTA tests in FSIM', - ) + // sh ( + // script: "${docker_run} ${image} ./tests/scripts/task_python_vta_fsim.sh", + // label: 'Run VTA tests in FSIM', + // ) } def cmake_build(image, path, make_flag) { diff --git a/jenkins/Jenkinsfile.j2 b/jenkins/Jenkinsfile.j2 index 0a83549da147..43148ef7fb83 100644 --- a/jenkins/Jenkinsfile.j2 +++ b/jenkins/Jenkinsfile.j2 @@ -94,8 +94,10 @@ if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) { // Filenames for stashing between build and test steps {% set tvm_runtime = ['build/libtvm_runtime.so', 'build/config.cmake'] %} {% set tvm_lib = ['build/libtvm.so'] + tvm_runtime %} -{% set tvm_multilib = ['build/libtvm.so', 'build/libvta_fsim.so'] + tvm_runtime %} -{% set tvm_multilib_tsim = ['build/libvta_tsim.so'] + tvm_multilib %} +{# comment #}{% set tvm_multilib = ['build/libtvm.so', 'build/libvta_fsim.so'] + tvm_runtime %}{# endcomment #} +{% set tvm_multilib = ['build/libtvm.so'] + tvm_runtime %} +{# comment #}{% set tvm_multilib_tsim = ['build/libvta_tsim.so'] + tvm_multilib %}{# endcomment #} +{% set tvm_multilib_tsim = [] + tvm_multilib %} {% set microtvm_template_projects = ['build/microtvm_template_projects',] %} {% set hexagon_api = ['build/hexagon_api_output',] %} s3_prefix = "tvm-jenkins-artifacts-prod/tvm/${env.BRANCH_NAME}/${env.BUILD_NUMBER}" diff --git a/jenkins/Prepare.groovy.j2 b/jenkins/Prepare.groovy.j2 index d9cfa440c7e2..5745794e7465 100644 --- a/jenkins/Prepare.groovy.j2 +++ b/jenkins/Prepare.groovy.j2 @@ -15,7 +15,7 @@ def init_git() { // Determine merge commit to use for all stages sh ( - script: 'git fetch origin main', + script: 'git fetch origin v0.9.0', label: 'Fetch upstream', ) if (upstream_revision == null) { @@ -27,7 +27,7 @@ def init_git() { } sh ( script: "git -c user.name=TVM-Jenkins -c user.email=jenkins@tvm.apache.org merge ${upstream_revision}", - label: 'Merge to origin/main' + label: 'Merge to origin/v0.9.0' ) sh( @@ -98,8 +98,8 @@ def should_skip_slow_tests(pr_number) { } def cancel_previous_build() { - // cancel previous build if it is not on main. - if (env.BRANCH_NAME != 'main') { + // cancel previous build if it is not on v0.9.0. + if (env.BRANCH_NAME != 'v0.9.0') { def buildNumber = env.BUILD_NUMBER as int // Milestone API allows us to cancel previous build // with the same milestone number diff --git a/jenkins/Test.groovy.j2 b/jenkins/Test.groovy.j2 index d219b47bc792..f202521e8199 100644 --- a/jenkins/Test.groovy.j2 +++ b/jenkins/Test.groovy.j2 @@ -211,10 +211,10 @@ stage('Test') { cpp_unittest(ci_cpu) python_unittest(ci_cpu) fsim_test(ci_cpu) - sh ( - script: "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_tsim.sh", - label: 'Run VTA tests in TSIM', - ) + // sh ( + // script: "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_tsim.sh", + // label: 'Run VTA tests in TSIM', + // ) {% endcall %} {% call m.test_step( name="test: QEMU", diff --git a/tests/python/contrib/test_verilator/test_mobilenet.py b/tests/python/contrib/test_verilator/test_mobilenet.py index 5728bc8bb25c..6d71b7f41975 100644 --- a/tests/python/contrib/test_verilator/test_mobilenet.py +++ b/tests/python/contrib/test_verilator/test_mobilenet.py @@ -215,7 +215,7 @@ def is_tflite_available(): return False -@pytest.mark.skipif(skip_test(), reason="Skip because Verilator codegen is not available") +@pytest.mark.skip(reason="Skip because Verilator codegen is not available") def tmobilenet(lanes): """Mobilenet test template. Paramters @@ -239,6 +239,7 @@ def tmobilenet(lanes): print_test_info(lanes, values["cycle_counter"]) +@pytest.mark.skip(reason="Skip because Verilator codegen is not available") def test_mobilenet(): """Mobilenet tests.""" tmobilenet(4) diff --git a/tests/python/contrib/test_verilator/test_verilator_ops.py b/tests/python/contrib/test_verilator/test_verilator_ops.py index 29d54890b367..7891c1def576 100644 --- a/tests/python/contrib/test_verilator/test_verilator_ops.py +++ b/tests/python/contrib/test_verilator/test_verilator_ops.py @@ -183,12 +183,14 @@ def tbias(lanes): print_test_info("nn.bias_add", lanes, cycles) +@pytest.mark.skip(reason="Skip because Verilator codegen is not available") def test_add(): """add tests.""" tadd(1) tadd(4) +@pytest.mark.skip(reason="Skip because Verilator codegen is not available") def test_bias_add(): """bias_add tests.""" tbias(1) diff --git a/tests/scripts/git_change_docker.sh b/tests/scripts/git_change_docker.sh index 26532756b72e..a63714e7fdde 100755 --- a/tests/scripts/git_change_docker.sh +++ b/tests/scripts/git_change_docker.sh @@ -20,10 +20,10 @@ set -eux BRANCH=$(git rev-parse --abbrev-ref HEAD) -if [ "$BRANCH" == "main" ]; then +if [ "$BRANCH" == "v0.9.0" ]; then changed_files=$(git diff --no-commit-id --name-only -r HEAD~1) else - changed_files=$(git diff --no-commit-id --name-only -r origin/main) + changed_files=$(git diff --no-commit-id --name-only -r origin/v0.9.0) fi for file in $changed_files; do diff --git a/tests/scripts/git_change_docs.sh b/tests/scripts/git_change_docs.sh index 35b1bb7ec34c..7a0f9853d315 100755 --- a/tests/scripts/git_change_docs.sh +++ b/tests/scripts/git_change_docs.sh @@ -22,7 +22,7 @@ set -eux FOUND_ONE_FILE=0 SAW_NON_DOC_CHANGES=0 -changed_files=$(git diff --no-commit-id --name-only -r origin/main) +changed_files=$(git diff --no-commit-id --name-only -r origin/v0.9.0) for file in $changed_files; do FOUND_ONE_FILE=1 diff --git a/tests/scripts/task_python_docs.sh b/tests/scripts/task_python_docs.sh index da1a2c9c5636..511f746042e4 100755 --- a/tests/scripts/task_python_docs.sh +++ b/tests/scripts/task_python_docs.sh @@ -78,6 +78,16 @@ IGNORED_WARNINGS=( 'git describe' 'scikit-learn version' 'doing serial write' + $'WARNING: autodoc: failed to import module \'vta\'; the following exception was raised:' + $'WARNING: autodoc: failed to import function \'Environment\' from module \'vta\'; the following exception was raised:' + $'WARNING: autodoc: failed to import function \'get_env\' from module \'vta\'; the following exception was raised:' + $'WARNING: autodoc: failed to import function \'reconfig_runtime\' from module \'vta\'; the following exception was raised:' + $'WARNING: autodoc: failed to import function \'program_fpga\' from module \'vta\'; the following exception was raised:' + $'WARNING: autodoc: failed to import function \'build_config\' from module \'vta\'; the following exception was raised:' + $'WARNING: autodoc: failed to import function \'build\' from module \'vta\'; the following exception was raised:' + $'WARNING: autodoc: failed to import function \'lower\' from module \'vta\'; the following exception was raised:' + $'WARNING: toctree contains reference to nonexisting document \'topic/vta/tutorials/index\'' + 'WARNING: undefined label: vta-tutorials' 'gen_gallery extension is not safe for parallel' 'strategy:conv2d NHWC layout is not optimized for x86 with autotvm.' 'strategy:depthwise_conv2d NHWC layout is not optimized for x86 with autotvm.'