Skip to content

[microTVM][Zephyr] Hot Fix Bad Merge #8980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
areusch merged 2 commits into from
Sep 10, 2021
Merged

[microTVM][Zephyr] Hot Fix Bad Merge #8980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01b0147
fix bad merge
mehrdadh Sep 10, 2021
29c55d6
Fix test to reflect change of simd size for ARM
mehrdadh Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/micro/zephyr/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def zephyr_boards() -> dict:
def pytest_addoption(parser):
parser.addoption(
"--zephyr-board",
required=True,
choices=ZEPHYR_BOARDS.keys(),
help=("Zephyr board for test."),
)
Expand Down
10 changes: 5 additions & 5 deletions tests/micro/zephyr/test_zephyr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,11 +380,11 @@ def test_tensors(sess):


@tvm.testing.requires_micro
def test_autotune_conv2d(temp_dir, platform, west_cmd, tvm_debug):
def test_autotune_conv2d(temp_dir, board, west_cmd, tvm_debug):
"""Test AutoTune for microTVM Zephyr"""
import tvm.relay as relay

model, zephyr_board = PLATFORMS[platform]
model = conftest.ZEPHYR_BOARDS[board]

# Create a Relay model
data_shape = (1, 3, 16, 16)
Expand Down Expand Up @@ -424,7 +424,7 @@ def test_autotune_conv2d(temp_dir, platform, west_cmd, tvm_debug):
module_loader = tvm.micro.AutoTvmModuleLoader(
template_project_dir=template_project_dir,
project_options={
"zephyr_board": zephyr_board,
"zephyr_board": board,
"west_cmd": west_cmd,
"verbose": 1,
"project_type": "host_driven",
Expand Down Expand Up @@ -467,7 +467,7 @@ def test_autotune_conv2d(temp_dir, platform, west_cmd, tvm_debug):
lowered,
temp_dir / "project",
{
"zephyr_board": zephyr_board,
"zephyr_board": board,
"west_cmd": west_cmd,
"verbose": 1,
"project_type": "host_driven",
Expand Down Expand Up @@ -496,7 +496,7 @@ def test_autotune_conv2d(temp_dir, platform, west_cmd, tvm_debug):
lowered_tuned,
temp_dir / "project",
{
"zephyr_board": zephyr_board,
"zephyr_board": board,
"west_cmd": west_cmd,
"verbose": 1,
"project_type": "host_driven",
Expand Down
6 changes: 3 additions & 3 deletions tests/python/relay/aot/test_crt_aot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,9 +562,9 @@ def test_name_sanitiser_name_clash():
@pytest.mark.parametrize(
"workspace_byte_alignment,main_workspace_size,sum_workspace_size",
[
(8, 10368, 15392),
(16, 10368, 15424),
(256, 10752, 17664),
(8, 10368, 15200),
(16, 10368, 15232),
(256, 10752, 17408),
],
)
def test_memory_planning(workspace_byte_alignment, main_workspace_size, sum_workspace_size):
Expand Down