This is an automated email from the ASF dual-hosted git repository. andrewzhaoluo pushed a commit to branch v0.10.0-cleanup in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 485cb8804d1a9480716530cf65a092a8c9424a15 Author: Andrew Luo <[email protected]> AuthorDate: Wed Oct 5 19:57:40 2022 -0700 remove vta references --- .gitmodules | 3 --- 3rdparty/vta-hw | 1 - CMakeLists.txt | 2 +- ci/jenkins/Build.groovy.j2 | 8 +++---- ci/jenkins/Jenkinsfile.j2 | 6 +++-- ci/jenkins/Prepare.groovy.j2 | 6 ++--- ci/jenkins/Test.groovy.j2 | 8 +++---- ci/scripts/git_change_docker.sh | 4 ++-- ci/scripts/git_change_docs.sh | 2 +- docs/conf.py | 21 ++++++++--------- .../contrib/test_verilator/test_mobilenet.py | 26 +++++++++------------- .../contrib/test_verilator/test_verilator_ops.py | 4 ++-- tests/scripts/task_python_docs.sh | 10 +++++++++ 13 files changed, 53 insertions(+), 48 deletions(-) diff --git a/.gitmodules b/.gitmodules index e03336443d..196be9abfd 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 36a91576ed..0000000000 --- a/3rdparty/vta-hw +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 36a91576edf633479c78649e050f18dd2ddc8103 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c355238b8..b24b1b6236 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -461,7 +461,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/ci/jenkins/Build.groovy.j2 b/ci/jenkins/Build.groovy.j2 index a083fe88ad..f0b3d6c5c4 100644 --- a/ci/jenkins/Build.groovy.j2 +++ b/ci/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/ci/jenkins/Jenkinsfile.j2 b/ci/jenkins/Jenkinsfile.j2 index 6ba0c2df8e..53eb78b2e9 100644 --- a/ci/jenkins/Jenkinsfile.j2 +++ b/ci/jenkins/Jenkinsfile.j2 @@ -94,8 +94,10 @@ rebuild_docker_images = false // 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/ci/jenkins/Prepare.groovy.j2 b/ci/jenkins/Prepare.groovy.j2 index cb677f437a..8b09f83752 100644 --- a/ci/jenkins/Prepare.groovy.j2 +++ b/ci/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.10.0', label: 'Fetch upstream', ) if (upstream_revision == null) { @@ -27,7 +27,7 @@ def init_git() { } sh ( script: "git -c user.name=TVM-Jenkins -c [email protected] merge ${upstream_revision}", - label: 'Merge to origin/main' + label: 'Merge to origin/v0.10.0' ) sh( @@ -90,7 +90,7 @@ 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') { + if (env.BRANCH_NAME != 'v0.10.0') { def buildNumber = env.BUILD_NUMBER as int // Milestone API allows us to cancel previous build // with the same milestone number diff --git a/ci/jenkins/Test.groovy.j2 b/ci/jenkins/Test.groovy.j2 index 52ed742d4c..d2442358ad 100644 --- a/ci/jenkins/Test.groovy.j2 +++ b/ci/jenkins/Test.groovy.j2 @@ -271,10 +271,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="frontend: CPU", diff --git a/ci/scripts/git_change_docker.sh b/ci/scripts/git_change_docker.sh index 7fc855544a..46d8cd380f 100755 --- a/ci/scripts/git_change_docker.sh +++ b/ci/scripts/git_change_docker.sh @@ -19,10 +19,10 @@ set -eux -if [ "${BRANCH_NAME}" == "main" ]; then +if [ "${BRANCH_NAME}" == "v0.10.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.10.0) fi for file in $changed_files; do diff --git a/ci/scripts/git_change_docs.sh b/ci/scripts/git_change_docs.sh index 35b1bb7ec3..293abb79de 100755 --- a/ci/scripts/git_change_docs.sh +++ b/ci/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.10.0) for file in $changed_files; do FOUND_ONE_FILE=1 diff --git a/docs/conf.py b/docs/conf.py index d645958ca6..690b770e7f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,7 +52,7 @@ else: 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 @@ examples_dirs = [ 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 @@ gallery_dirs = [ "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. @@ -401,7 +402,7 @@ header_logo_link = "https://tvm.apache.org/"; 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/tests/python/contrib/test_verilator/test_mobilenet.py b/tests/python/contrib/test_verilator/test_mobilenet.py index 5728bc8bb2..0fffbeb51e 100644 --- a/tests/python/contrib/test_verilator/test_mobilenet.py +++ b/tests/python/contrib/test_verilator/test_mobilenet.py @@ -15,24 +15,19 @@ # specific language governing permissions and limitations # under the License. -import tvm -from tvm import te, relay, transform -from tvm.contrib.download import download_testdata -from tvm.contrib import graph_executor as runtime - import os + +import numpy as np import pytest +import tvm from PIL import Image -import numpy as np +from tvm import relay, te, transform +from tvm.contrib import graph_executor as runtime +from tvm.contrib.download import download_testdata -from test_verilator.infrastructure import ( - skip_test, - compile_hardware, - compiler_opts, - offload, - clear_stats, - stats, -) +from test_verilator.infrastructure import (clear_stats, compile_hardware, + compiler_opts, offload, skip_test, + stats) def extract(path): @@ -215,7 +210,7 @@ def is_tflite_available(): return False [email protected](skip_test(), reason="Skip because Verilator codegen is not available") [email protected](reason="Skip because Verilator codegen is not available") def tmobilenet(lanes): """Mobilenet test template. Paramters @@ -239,6 +234,7 @@ def tmobilenet(lanes): print_test_info(lanes, values["cycle_counter"]) [email protected](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 29d54890b3..8052f4fa64 100644 --- a/tests/python/contrib/test_verilator/test_verilator_ops.py +++ b/tests/python/contrib/test_verilator/test_verilator_ops.py @@ -140,7 +140,7 @@ def print_test_info(test, lanes, cycles): print("test:{} vector-lanes:{} number of cycles:{}".format(test, lanes, cycles)) [email protected](skip_test(), reason="Skip because Verilator codegen is not available") [email protected](reason="Skip because Verilator codegen is not available") def tadd(lanes): """Print counter @@ -161,7 +161,7 @@ def tadd(lanes): print_test_info("add", lanes, cycles) [email protected](skip_test(), reason="Skip because Verilator codegen is not available") [email protected](reason="Skip because Verilator codegen is not available") def tbias(lanes): """Print counter diff --git a/tests/scripts/task_python_docs.sh b/tests/scripts/task_python_docs.sh index fdce77bfd9..199bdd8714 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.'
