Skip to content

Commit

Permalink
[release][v0.9] Remove VTA submodule (#11992)
Browse files Browse the repository at this point in the history
  • Loading branch information
driazati authored Jul 13, 2022
1 parent 2737063 commit d361585
Show file tree
Hide file tree
Showing 14 changed files with 58 additions and 146 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion 3rdparty/vta-hw
Submodule vta-hw deleted from 36a915
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
126 changes: 13 additions & 113 deletions Jenkinsfile

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ------------------------------------------------
Expand Down Expand Up @@ -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 = [
Expand All @@ -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.
Expand Down Expand Up @@ -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"),
Expand Down
8 changes: 4 additions & 4 deletions jenkins/Build.groovy.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 4 additions & 2 deletions jenkins/Jenkinsfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
8 changes: 4 additions & 4 deletions jenkins/Prepare.groovy.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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.9.0'
)

sh(
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions jenkins/Test.groovy.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion tests/python/contrib/test_verilator/test_mobilenet.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions tests/python/contrib/test_verilator/test_verilator_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tests/scripts/git_change_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/git_change_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions tests/scripts/task_python_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
Expand Down

0 comments on commit d361585

Please sign in to comment.