Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@mehrdadh
mehrdadh committed Sep 17, 2021
1 parent bb1d39a commit 37c559f
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 142 deletions.
30 changes: 12 additions & 18 deletions apps/microtvm/zephyr/template_project/microtvm_api_server.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,16 @@

IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()


BOARDS = API_SERVER_DIR / "boards.json"

# Data structure to hold the information microtvm_api_server.py needs
# to communicate with each of these boards.
BOARD_PROPERTIES = None
BOARDS_FILE_NAME = "boards.json"

with open(
BOARDS_FILE_NAME,
) as board_f:
BOARD_PROPERTIES = json.load(board_f)
try:
with open(BOARDS) as boards:
BOARD_PROPERTIES = json.load(boards)
except FileNotFoundError:
raise FileNotFoundError(f"Board file {{{BOARDS}}} does not exist.")


def check_call(cmd_args, *args, **kwargs):
Expand Down Expand Up @@ -260,12 +261,7 @@ def _get_nrf_device_args(options):
help="Name of the Zephyr board to build for.",
),
server.ProjectOption(
"zephyr_model",
choices=[board["model"] for _, board in BOARD_PROPERTIES.items()],
help="Name of the model for each Zephyr board.",
),
server.ProjectOption(
"main_stack_size",
"config_main_stack_size",
help="Sets CONFIG_MAIN_STACK_SIZE for Zephyr board.",
),
]
Expand Down Expand Up @@ -326,8 +322,8 @@ def _create_prj_conf(self, project_dir, options):
f.write("# For models with floating point.\n" "CONFIG_FPU=y\n" "\n")

# Set main stack size, if needed.
if options["main_stack_size"] is not None:
f.write(f"CONFIG_MAIN_STACK_SIZE={options['main_stack_size']}\n")
if options["config_main_stack_size"] is not None:
f.write(f"CONFIG_MAIN_STACK_SIZE={options['config_main_stack_size']}\n")

f.write("# For random number generation.\n" "CONFIG_TEST_RANDOM_GENERATOR=y\n")

Expand Down Expand Up @@ -355,9 +351,7 @@ def generate_project(self, model_library_format_path, standalone_crt_dir, projec
shutil.copy2(__file__, project_dir / os.path.basename(__file__))

# Copy boards.json file to generated project.
shutil.copy2(
pathlib.Path(__file__).parent / BOARDS_FILE_NAME, project_dir / BOARDS_FILE_NAME
)
shutil.copy2(BOARDS, project_dir / BOARDS.name)

# Place Model Library Format tarball in the special location, which this script uses to decide
# whether it's being invoked in a template or generated project.
Expand Down
17 changes: 4 additions & 13 deletions python/tvm/micro/project.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,11 @@ def __init__(self, api_client):

def _check_project_options(self, options: dict):
"""Check if options are valid ProjectOptions"""
valid_project_options = [item["name"] for item in self.info()["project_options"]]
valid = True

if options is not None:
if valid_project_options is None:
valie = False
else:
if not all(element in list(valid_project_options) for element in list(options)):
valid = False

if not valid:
available_options = [option["name"] for option in self.info()["project_options"]]
if options and not set(options.keys()).issubset(available_options):
raise ValueError(
f"""options:{list(options)} include none valid ProjectOptions.
Here is a list of valid options:{list(valid_project_options)}."""
f"""options:{list(options)} include non valid ProjectOptions.
Here is a list of available options:{list(available_options)}."""
)

def generate_project_from_mlf(self, model_library_format_path, project_dir, options):
Expand Down
57 changes: 4 additions & 53 deletions tests/micro/zephyr/conftest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,68 +17,19 @@
import datetime
import os
import pathlib
import json

import pytest

from tvm.micro import project
import tvm.contrib.utils
import tvm.target.target
import test_utils

TEMPLATE_PROJECT_DIR = (
pathlib.Path(__file__).parent
/ ".."
/ ".."
/ ".."
/ "apps"
/ "microtvm"
/ "zephyr"
/ "template_project"
).resolve()

BOARD_JSON_PATH = TEMPLATE_PROJECT_DIR / "boards.json"


def zephyr_boards() -> dict:
"""Returns a dict mapping board to target model"""
template = project.TemplateProject.from_directory(TEMPLATE_PROJECT_DIR)
project_options = template.info()["project_options"]
for option in project_options:
if option["name"] == "zephyr_board":
boards = option["choices"]
if option["name"] == "zephyr_model":
models = option["choices"]

arduino_boards = {boards[i]: models[i] for i in range(len(boards))}
return arduino_boards


ZEPHYR_BOARDS = zephyr_boards()


def qemu_boards(board: str):
"""Returns True if board is QEMU."""
with open(BOARD_JSON_PATH) as f:
board_properties = json.load(f)

qemu_boards = [name for name, board in board_properties.items() if board["is_qemu"]]
return board in qemu_boards


def has_fpu(board: str):
"""Returns True if board has FPU."""
with open(BOARD_JSON_PATH) as f:
board_properties = json.load(f)

fpu_boards = [name for name, board in board_properties.items() if board["fpu"]]
return board in fpu_boards
from tvm.contrib.utils import tempdir


def pytest_addoption(parser):
parser.addoption(
"--zephyr-board",
required=True,
choices=ZEPHYR_BOARDS.keys(),
choices=test_utils.ZEPHYR_BOARDS.keys(),
help=("Zephyr board for test."),
)
parser.addoption(
Expand Down Expand Up @@ -125,4 +76,4 @@ def temp_dir(board):
if not os.path.exists(board_workspace.parent):
os.makedirs(board_workspace.parent)

return tvm.contrib.utils.tempdir(board_workspace)
return tempdir(board_workspace)
81 changes: 35 additions & 46 deletions tests/micro/zephyr/test_zephyr.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,25 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

import logging
import os
import pathlib
import subprocess
import sys
import logging
import json

import pytest
import numpy as np
import onnx
from PIL import Image

import tvm
import tvm.rpc
import tvm.micro
import tvm.testing
import tvm.relay as relay
from tvm.relay.testing import byoc

from tvm.contrib import utils
from tvm.relay.expr_functor import ExprMutator
from tvm.relay.op.annotation import compiler_begin, compiler_end

from tvm.micro.testing import check_tune_log

import conftest
import test_utils

_LOG = logging.getLogger(__name__)

Expand All @@ -58,21 +49,23 @@ def _make_sess_from_op(


def _make_session(temp_dir, zephyr_board, west_cmd, mod, build_config):
stack_size = None
if conftest.qemu_boards(zephyr_board):
stack_size = 1536
if test_utils.qemu_boards(zephyr_board):
config_main_stack_size = 1536

project_options = {
"project_type": "host_driven",
"west_cmd": west_cmd,
"verbose": bool(build_config.get("debug")),
"zephyr_board": zephyr_board,
}
if config_main_stack_size:
project_options["config_main_stack_size"] = config_main_stack_size

project = tvm.micro.generate_project(
str(conftest.TEMPLATE_PROJECT_DIR),
str(test_utils.TEMPLATE_PROJECT_DIR),
mod,
temp_dir / "project",
{
"project_type": "host_driven",
"west_cmd": west_cmd,
"verbose": bool(build_config.get("debug")),
"zephyr_board": zephyr_board,
"main_stack_size": stack_size,
},
project_options,
)
project.build()
project.flash()
Expand All @@ -94,7 +87,7 @@ def _make_add_sess(temp_dir, model, zephyr_board, west_cmd, build_config, dtype=
def test_add_uint(temp_dir, board, west_cmd, tvm_debug):
"""Test compiling the on-device runtime."""

model = conftest.ZEPHYR_BOARDS[board]
model = test_utils.ZEPHYR_BOARDS[board]
build_config = {"debug": tvm_debug}

# NOTE: run test in a nested function so cPython will delete arrays before closing the session.
Expand All @@ -118,8 +111,8 @@ def test_basic_add(sess):
@tvm.testing.requires_micro
def test_add_float(temp_dir, board, west_cmd, tvm_debug):
"""Test compiling the on-device runtime."""
model = conftest.ZEPHYR_BOARDS[board]
if not conftest.has_fpu(board):
model = test_utils.ZEPHYR_BOARDS[board]
if not test_utils.has_fpu(board):
pytest.skip(f"FPU not enabled for {board}")

build_config = {"debug": tvm_debug}
Expand All @@ -145,7 +138,7 @@ def test_basic_add(sess):
def test_platform_timer(temp_dir, board, west_cmd, tvm_debug):
"""Test compiling the on-device runtime."""

model = conftest.ZEPHYR_BOARDS[board]
model = test_utils.ZEPHYR_BOARDS[board]
build_config = {"debug": tvm_debug}

# NOTE: run test in a nested function so cPython will delete arrays before closing the session.
Expand Down Expand Up @@ -173,7 +166,7 @@ def test_basic_add(sess):
@tvm.testing.requires_micro
def test_relay(temp_dir, board, west_cmd, tvm_debug):
"""Testing a simple relay graph"""
model = conftest.ZEPHYR_BOARDS[board]
model = test_utils.ZEPHYR_BOARDS[board]
build_config = {"debug": tvm_debug}
shape = (10,)
dtype = "int8"
Expand Down Expand Up @@ -204,7 +197,7 @@ def test_relay(temp_dir, board, west_cmd, tvm_debug):
@tvm.testing.requires_micro
def test_onnx(temp_dir, board, west_cmd, tvm_debug):
"""Testing a simple ONNX model."""
model = conftest.ZEPHYR_BOARDS[board]
model = test_utils.ZEPHYR_BOARDS[board]
build_config = {"debug": tvm_debug}

this_dir = pathlib.Path(os.path.dirname(__file__))
Expand Down Expand Up @@ -281,7 +274,7 @@ def check_result(
@tvm.testing.requires_micro
def test_byoc_microtvm(temp_dir, board, west_cmd, tvm_debug):
"""This is a simple test case to check BYOC capabilities of microTVM"""
model = conftest.ZEPHYR_BOARDS[board]
model = test_utils.ZEPHYR_BOARDS[board]
build_config = {"debug": tvm_debug}
x = relay.var("x", shape=(10, 10))
w0 = relay.var("w0", shape=(10, 10))
Expand Down Expand Up @@ -361,7 +354,7 @@ def _make_add_sess_with_shape(temp_dir, model, zephyr_board, west_cmd, shape, bu
@tvm.testing.requires_micro
def test_rpc_large_array(temp_dir, board, west_cmd, tvm_debug, shape):
"""Test large RPC array transfer."""
model = conftest.ZEPHYR_BOARDS[board]
model = test_utils.ZEPHYR_BOARDS[board]
build_config = {"debug": tvm_debug}

# NOTE: run test in a nested function so cPython will delete arrays before closing the session.
Expand All @@ -380,9 +373,7 @@ def test_tensors(sess):
@tvm.testing.requires_micro
def test_autotune_conv2d(temp_dir, board, west_cmd, tvm_debug):
"""Test AutoTune for microTVM Zephyr"""
import tvm.relay as relay

model = conftest.ZEPHYR_BOARDS[board]
model = test_utils.ZEPHYR_BOARDS[board]
build_config = {"debug": tvm_debug}

# Create a Relay model
Expand Down Expand Up @@ -416,23 +407,21 @@ def test_autotune_conv2d(temp_dir, board, west_cmd, tvm_debug):
tasks = tvm.autotvm.task.extract_from_program(mod["main"], {}, target)
assert len(tasks) > 0

repo_root = pathlib.Path(
subprocess.check_output(["git", "rev-parse", "--show-toplevel"], encoding="utf-8").strip()
)
if test_utils.qemu_boards(board):
config_main_stack_size = 1536

stack_size = None
if conftest.qemu_boards(board):
stack_size = 1536
project_options = {
"zephyr_board": board,
"west_cmd": west_cmd,
"verbose": 1,
"project_type": "host_driven",
}
if config_main_stack_size:
project_options["config_main_stack_size"] = config_main_stack_size

module_loader = tvm.micro.AutoTvmModuleLoader(
template_project_dir=conftest.TEMPLATE_PROJECT_DIR,
project_options={
"zephyr_board": board,
"west_cmd": west_cmd,
"verbose": 1,
"project_type": "host_driven",
"main_stack_size": stack_size,
},
template_project_dir=test_utils.TEMPLATE_PROJECT_DIR,
project_options=project_options,
)

timeout = 200
Expand Down
Loading

0 comments on commit 37c559f

Please sign in to comment.