areusch commented on a change in pull request #8493:
URL: https://github.com/apache/tvm/pull/8493#discussion_r676934322
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
+
+API_SERVER_DIR = pathlib.Path(os.path.dirname(__file__) or os.path.getcwd())
+BUILD_DIR = API_SERVER_DIR / "build"
+IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()
+MODEL_LIBRARY_FORMAT_PATH = "" if IS_TEMPLATE else API_SERVER_DIR /
MODEL_LIBRARY_FORMAT_RELPATH
+
+
+class InvalidPortException(Exception):
+ """Raised when the given port could not be opened"""
+
+
+class SketchUploadException(Exception):
+ """Raised when a sketch cannot be uploaded for an unknown reason."""
+
+
+class BoardAutodetectFailed(Exception):
+ """Raised when no attached hardware is found matching the requested
board"""
+
+
+PROJECT_OPTIONS = [
+ server.ProjectOption("verbose", help="Run build with verbose output"),
Review comment:
can you sort these alphabetically by option name?
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
+
+API_SERVER_DIR = pathlib.Path(os.path.dirname(__file__) or os.path.getcwd())
+BUILD_DIR = API_SERVER_DIR / "build"
+IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()
+MODEL_LIBRARY_FORMAT_PATH = "" if IS_TEMPLATE else API_SERVER_DIR /
MODEL_LIBRARY_FORMAT_RELPATH
+
+
+class InvalidPortException(Exception):
+ """Raised when the given port could not be opened"""
+
+
+class SketchUploadException(Exception):
+ """Raised when a sketch cannot be uploaded for an unknown reason."""
+
+
+class BoardAutodetectFailed(Exception):
+ """Raised when no attached hardware is found matching the requested
board"""
+
+
+PROJECT_OPTIONS = [
+ server.ProjectOption("verbose", help="Run build with verbose output"),
+ server.ProjectOption("arduino_cmd", help="Path to the arduino-cli tool."),
+ server.ProjectOption("arduino_board", help="Name of the Arduino board to
build for"),
+ server.ProjectOption("port", help="Port to use for connecting to
hardware"),
+]
+
+BOARD_PROPERTIES = {
+ "spresense": {
+ "package": "SPRESENSE",
+ "architecture": "spresense",
+ "board": "spresense",
+ },
+ "nano33ble": {
+ "package": "arduino",
+ "architecture": "mbed_nano",
+ "board": "nano33ble",
+ },
+}
+
+
+class Handler(server.ProjectAPIHandler):
+ def __init__(self):
+ super(Handler, self).__init__()
+ self._proc = None
+ self._port = None
+ self._serial = None
+
+ def server_info_query(self):
+ return server.ServerInfo(
+ platform_name="arduino",
+ is_template=IS_TEMPLATE,
+ model_library_format_path=MODEL_LIBRARY_FORMAT_PATH,
+ project_options=PROJECT_OPTIONS,
+ )
+
+ CRT_COPY_ITEMS = ("include", "src")
+
+ def _copy_standalone_crt(self, source_dir, standalone_crt_dir):
+ # Copy over the standalone_crt directory
+ output_crt_dir = source_dir / "standalone_crt"
+ for item in self.CRT_COPY_ITEMS:
+ src_path = os.path.join(standalone_crt_dir, item)
+ dst_path = output_crt_dir / item
+ if os.path.isdir(src_path):
+ shutil.copytree(src_path, dst_path)
+ else:
+ shutil.copy2(src_path, dst_path)
+
+ UNUSED_COMPONENTS = [
+ "include/dmlc",
+ "src/support",
+ "src/runtime/minrpc",
+ "src/runtime/crt/aot_executor",
+ "src/runtime/crt/microtvm_rpc_common",
+ "src/runtime/crt/microtvm_rpc_server",
+ "src/runtime/crt/tab",
+ ]
+
+ def _remove_unused_components(self, source_dir):
+ for component in self.UNUSED_COMPONENTS:
+ shutil.rmtree(source_dir / "standalone_crt" / component)
+
+ # We need to remove these duplicate copies of unit tests from the
+ # tree to avoid pytest finding two copies
+ PYTEST_FILE_REGEX = r"(?:test_.*\.py)|(?:.*_test\.py)"
+
+ def _remove_unit_tests(self, source_dir):
+ for file_path in source_dir.rglob(f"*.py"):
+ if re.match(self.PYTEST_FILE_REGEX, file_path.name):
+ file_path.unlink()
+
+ GRAPH_JSON_TEMPLATE = 'static const char* graph_json = "{}";\n'
+
+ def _compile_graph_json(self, model_dir, obj):
+ graph_json = json.dumps(obj).replace('"', '\\"')
+ output = self.GRAPH_JSON_TEMPLATE.format(graph_json)
+ graph_json_path = model_dir / "graph_json.c"
+ with open(graph_json_path, "w") as out_file:
+ out_file.write(output)
+
+ def _disassemble_mlf(self, mlf_tar_path, source_dir):
+ mlf_unpacking_dir = tempfile.TemporaryDirectory()
Review comment:
suggest using the context-manager style here:
`with tempfile.TemporaryDirectory() as mlf_unpacking_dir:`
then you don't need to call cleanup
##########
File path: apps/microtvm/arduino/template_project/test_microtvm_api_server.py
##########
@@ -0,0 +1,38 @@
+from unittest.mock import patch
+from pathlib import Path
+
+import pytest
+
+import microtvm_api_server
+
+
+class TestGenerateProject:
+ """A class with common parameters, `param1` and `param2`."""
+
+ def test_print_c_array(self):
+ handler = microtvm_api_server.Handler()
+ c_arr = handler._print_c_array([1, 32, 32, 3])
+ assert c_arr == "{1, 32, 32, 3}"
+
+ def _set_pathlib_path_exists(self, value):
+ with patch.object(Path, "exists") as mock_exists:
+ mock_exists.return_value = value
+
+ @patch("pathlib.Path")
+ def test_find_modified_include_path(self, MockPath):
+ handler = microtvm_api_server.Handler()
+
+ project_dir = MockPath("/dummy/project")
+ file_path = project_dir /
"src/standalone_crt/src/runtime/crt/graph_executor/load_json.c"
+
+ # Should return C standard libs unmodified
+ clib_output = handler._find_modified_include_path(project_dir,
file_path, "math.h")
+ assert clib_output == "math.h"
+
+ # If import already works, should return unmodified
+ valid_ardino_import = "../../../../include/tvm/runtime/crt/platform.h"
Review comment:
nit: arduino
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
+
+API_SERVER_DIR = pathlib.Path(os.path.dirname(__file__) or os.path.getcwd())
+BUILD_DIR = API_SERVER_DIR / "build"
+IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()
+MODEL_LIBRARY_FORMAT_PATH = "" if IS_TEMPLATE else API_SERVER_DIR /
MODEL_LIBRARY_FORMAT_RELPATH
Review comment:
it's probably ok to define this as a global CONSTANT as just
`API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH`, even if it doesn't exist. then
it simplifies the preceding line
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
+
+API_SERVER_DIR = pathlib.Path(os.path.dirname(__file__) or os.path.getcwd())
+BUILD_DIR = API_SERVER_DIR / "build"
+IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()
+MODEL_LIBRARY_FORMAT_PATH = "" if IS_TEMPLATE else API_SERVER_DIR /
MODEL_LIBRARY_FORMAT_RELPATH
+
+
+class InvalidPortException(Exception):
+ """Raised when the given port could not be opened"""
+
+
+class SketchUploadException(Exception):
+ """Raised when a sketch cannot be uploaded for an unknown reason."""
+
+
+class BoardAutodetectFailed(Exception):
+ """Raised when no attached hardware is found matching the requested
board"""
+
+
+PROJECT_OPTIONS = [
+ server.ProjectOption("verbose", help="Run build with verbose output"),
Review comment:
specify the polarity and what it means: True to run build with verbose
output (supply --verbose to arduino-cli)
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
Review comment:
suggest pathlib.Path("src") / "model" / "model.tar" for windows
compatibility
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
+
+API_SERVER_DIR = pathlib.Path(os.path.dirname(__file__) or os.path.getcwd())
+BUILD_DIR = API_SERVER_DIR / "build"
+IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()
+MODEL_LIBRARY_FORMAT_PATH = "" if IS_TEMPLATE else API_SERVER_DIR /
MODEL_LIBRARY_FORMAT_RELPATH
+
+
+class InvalidPortException(Exception):
+ """Raised when the given port could not be opened"""
+
+
+class SketchUploadException(Exception):
+ """Raised when a sketch cannot be uploaded for an unknown reason."""
+
+
+class BoardAutodetectFailed(Exception):
+ """Raised when no attached hardware is found matching the requested
board"""
+
+
+PROJECT_OPTIONS = [
+ server.ProjectOption("verbose", help="Run build with verbose output"),
+ server.ProjectOption("arduino_cmd", help="Path to the arduino-cli tool."),
+ server.ProjectOption("arduino_board", help="Name of the Arduino board to
build for"),
+ server.ProjectOption("port", help="Port to use for connecting to
hardware"),
+]
+
+BOARD_PROPERTIES = {
+ "spresense": {
+ "package": "SPRESENSE",
+ "architecture": "spresense",
+ "board": "spresense",
+ },
+ "nano33ble": {
+ "package": "arduino",
+ "architecture": "mbed_nano",
+ "board": "nano33ble",
+ },
+}
+
+
+class Handler(server.ProjectAPIHandler):
+ def __init__(self):
+ super(Handler, self).__init__()
+ self._proc = None
+ self._port = None
+ self._serial = None
+
+ def server_info_query(self):
+ return server.ServerInfo(
+ platform_name="arduino",
+ is_template=IS_TEMPLATE,
+ model_library_format_path=MODEL_LIBRARY_FORMAT_PATH,
+ project_options=PROJECT_OPTIONS,
+ )
+
+ CRT_COPY_ITEMS = ("include", "src")
+
+ def _copy_standalone_crt(self, source_dir, standalone_crt_dir):
+ # Copy over the standalone_crt directory
+ output_crt_dir = source_dir / "standalone_crt"
+ for item in self.CRT_COPY_ITEMS:
+ src_path = os.path.join(standalone_crt_dir, item)
+ dst_path = output_crt_dir / item
+ if os.path.isdir(src_path):
+ shutil.copytree(src_path, dst_path)
+ else:
+ shutil.copy2(src_path, dst_path)
+
+ UNUSED_COMPONENTS = [
+ "include/dmlc",
+ "src/support",
+ "src/runtime/minrpc",
+ "src/runtime/crt/aot_executor",
+ "src/runtime/crt/microtvm_rpc_common",
+ "src/runtime/crt/microtvm_rpc_server",
+ "src/runtime/crt/tab",
+ ]
+
+ def _remove_unused_components(self, source_dir):
+ for component in self.UNUSED_COMPONENTS:
+ shutil.rmtree(source_dir / "standalone_crt" / component)
+
+ # We need to remove these duplicate copies of unit tests from the
+ # tree to avoid pytest finding two copies
+ PYTEST_FILE_REGEX = r"(?:test_.*\.py)|(?:.*_test\.py)"
Review comment:
where do you see these?
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
+
+API_SERVER_DIR = pathlib.Path(os.path.dirname(__file__) or os.path.getcwd())
+BUILD_DIR = API_SERVER_DIR / "build"
+IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()
+MODEL_LIBRARY_FORMAT_PATH = "" if IS_TEMPLATE else API_SERVER_DIR /
MODEL_LIBRARY_FORMAT_RELPATH
+
+
+class InvalidPortException(Exception):
+ """Raised when the given port could not be opened"""
+
+
+class SketchUploadException(Exception):
+ """Raised when a sketch cannot be uploaded for an unknown reason."""
+
+
+class BoardAutodetectFailed(Exception):
+ """Raised when no attached hardware is found matching the requested
board"""
+
+
+PROJECT_OPTIONS = [
+ server.ProjectOption("verbose", help="Run build with verbose output"),
+ server.ProjectOption("arduino_cmd", help="Path to the arduino-cli tool."),
+ server.ProjectOption("arduino_board", help="Name of the Arduino board to
build for"),
Review comment:
if only those in BOARD_PROPERTIES can be specified, you could say
`choices=list(BOARD_PROPERTIES)` here (this is new)
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
+
+API_SERVER_DIR = pathlib.Path(os.path.dirname(__file__) or os.path.getcwd())
+BUILD_DIR = API_SERVER_DIR / "build"
+IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()
+MODEL_LIBRARY_FORMAT_PATH = "" if IS_TEMPLATE else API_SERVER_DIR /
MODEL_LIBRARY_FORMAT_RELPATH
+
+
+class InvalidPortException(Exception):
+ """Raised when the given port could not be opened"""
+
+
+class SketchUploadException(Exception):
+ """Raised when a sketch cannot be uploaded for an unknown reason."""
+
+
+class BoardAutodetectFailed(Exception):
+ """Raised when no attached hardware is found matching the requested
board"""
+
+
+PROJECT_OPTIONS = [
+ server.ProjectOption("verbose", help="Run build with verbose output"),
+ server.ProjectOption("arduino_cmd", help="Path to the arduino-cli tool."),
+ server.ProjectOption("arduino_board", help="Name of the Arduino board to
build for"),
+ server.ProjectOption("port", help="Port to use for connecting to
hardware"),
+]
+
+BOARD_PROPERTIES = {
+ "spresense": {
+ "package": "SPRESENSE",
+ "architecture": "spresense",
+ "board": "spresense",
+ },
+ "nano33ble": {
+ "package": "arduino",
+ "architecture": "mbed_nano",
+ "board": "nano33ble",
+ },
+}
+
+
+class Handler(server.ProjectAPIHandler):
+ def __init__(self):
+ super(Handler, self).__init__()
+ self._proc = None
+ self._port = None
+ self._serial = None
+
+ def server_info_query(self):
+ return server.ServerInfo(
+ platform_name="arduino",
+ is_template=IS_TEMPLATE,
+ model_library_format_path=MODEL_LIBRARY_FORMAT_PATH,
+ project_options=PROJECT_OPTIONS,
+ )
+
+ CRT_COPY_ITEMS = ("include", "src")
+
+ def _copy_standalone_crt(self, source_dir, standalone_crt_dir):
+ # Copy over the standalone_crt directory
+ output_crt_dir = source_dir / "standalone_crt"
+ for item in self.CRT_COPY_ITEMS:
+ src_path = os.path.join(standalone_crt_dir, item)
+ dst_path = output_crt_dir / item
+ if os.path.isdir(src_path):
+ shutil.copytree(src_path, dst_path)
+ else:
+ shutil.copy2(src_path, dst_path)
+
+ UNUSED_COMPONENTS = [
+ "include/dmlc",
+ "src/support",
+ "src/runtime/minrpc",
+ "src/runtime/crt/aot_executor",
+ "src/runtime/crt/microtvm_rpc_common",
+ "src/runtime/crt/microtvm_rpc_server",
+ "src/runtime/crt/tab",
+ ]
+
+ def _remove_unused_components(self, source_dir):
+ for component in self.UNUSED_COMPONENTS:
+ shutil.rmtree(source_dir / "standalone_crt" / component)
+
+ # We need to remove these duplicate copies of unit tests from the
+ # tree to avoid pytest finding two copies
+ PYTEST_FILE_REGEX = r"(?:test_.*\.py)|(?:.*_test\.py)"
+
+ def _remove_unit_tests(self, source_dir):
+ for file_path in source_dir.rglob(f"*.py"):
+ if re.match(self.PYTEST_FILE_REGEX, file_path.name):
+ file_path.unlink()
+
+ GRAPH_JSON_TEMPLATE = 'static const char* graph_json = "{}";\n'
+
+ def _compile_graph_json(self, model_dir, obj):
+ graph_json = json.dumps(obj).replace('"', '\\"')
+ output = self.GRAPH_JSON_TEMPLATE.format(graph_json)
+ graph_json_path = model_dir / "graph_json.c"
+ with open(graph_json_path, "w") as out_file:
+ out_file.write(output)
+
+ def _disassemble_mlf(self, mlf_tar_path, source_dir):
+ mlf_unpacking_dir = tempfile.TemporaryDirectory()
+ with tarfile.open(mlf_tar_path, "r:") as tar:
+ tar.extractall(mlf_unpacking_dir.name)
+
+ # Copy C files
+ # TODO are the defaultlib0.c the same?
+ model_dir = source_dir / "model"
+ model_dir.mkdir()
+ for source, dest in [
+ ("codegen/host/src/default_lib0.c", "default_lib0.c"),
+ ("codegen/host/src/default_lib1.c", "default_lib1.c"),
+ ]:
+ shutil.copy(os.path.join(mlf_unpacking_dir.name, source),
model_dir / dest)
+
+ # Load graph.json, serialize to c format, and extact parameters
+ with open(os.path.join(mlf_unpacking_dir.name,
"executor-config/graph/graph.json")) as f:
+ graph_data = json.load(f)
+ self._compile_graph_json(model_dir, graph_data)
+
+ mlf_unpacking_dir.cleanup()
+ return graph_data
+
+ def _print_c_array(self, l):
+ c_arr_str = str(l)
+ return "{" + c_arr_str[1:-1] + "}"
+
+ def _print_c_str(self, s):
+ return '"{}"'.format(s)
+
+ DL_DATA_TYPE_REFERENCE = {
+ "uint8": "{kDLUInt, 8, 0}",
+ "uint16": "{kDLUInt, 16, 0}",
+ "uint32": "{kDLUInt, 32, 0}",
+ "uint64": "{kDLUInt, 64, 0}",
+ "int8": "{kDLInt, 8, 0}",
+ "int16": "{kDLInt, 16, 0}",
+ "int32": "{kDLInt, 32, 0}",
+ "int64": "{kDLInt, 64, 0}",
+ "float16": "{kDLFloat, 16, 0}",
+ "float32": "{kDLFloat, 32, 0}",
+ "float64": "{kDLFloat, 64, 0}",
+ }
+
+ def _populate_parameters_file(self, graph, source_dir):
+ graph_types = graph["attrs"]["dltype"]
+ graph_shapes = graph["attrs"]["shape"]
+ assert graph_types[0] == "list_str"
+ assert graph_shapes[0] == "list_shape"
+
+ template_values = {
+ "input_data_dimension": len(graph_shapes[1][0]),
+ "input_data_shape": self._print_c_array(graph_shapes[1][0]),
+ "input_data_type": self.DL_DATA_TYPE_REFERENCE[graph_types[1][0]],
+ "output_data_dimension": len(graph_shapes[1][-1]),
+ "output_data_shape": self._print_c_array(graph_shapes[1][-1]),
+ "output_data_type":
self.DL_DATA_TYPE_REFERENCE[graph_types[1][-1]],
+ "input_layer_name": self._print_c_str(graph["nodes"][0]["name"]),
+ }
+
+ # Apply template values
+ with open(source_dir / "parameters.h", "r") as f:
+ template_params = Template(f.read())
+
+ parameters_h = template_params.substitute(template_values)
+
+ with open(source_dir / "parameters.h", "w") as f:
+ f.write(parameters_h)
+
+ POSSIBLE_BASE_PATHS = ["src/standalone_crt/include/",
"src/standalone_crt/crt_config/"]
+
+ def _find_modified_include_path(self, project_dir, file_path, import_path):
+
+ # If the import already works, don't modify it
+ if (file_path.parents[0] / import_path).exists():
+ return import_path
+
+ relative_path = file_path.relative_to(project_dir)
+ up_dirs_path = "../" * str(relative_path).count("/")
+
+ for base_path in self.POSSIBLE_BASE_PATHS:
+ full_potential_path = project_dir / base_path / import_path
+ if full_potential_path.exists():
+ new_include = up_dirs_path + base_path + import_path
+ return new_include
+
+ # If we can't find the file, just leave it untouched
+ # It's probably a standard C/C++ header
+ return import_path
+
+ # Arduino only supports imports relative to the top-level project,
+ # so we need to adjust each import to meet this convention
+ def _convert_imports(self, project_dir, source_dir):
+ for ext in ("c", "h"):
+ for filename in source_dir.rglob(f"*.{ext}"):
+ with filename.open() as file:
+ lines = file.readlines()
+
+ for i in range(len(lines)):
+ # Check if line has an include
+ result = re.search(r"#include\s*[<\"]([^>]*)[>\"]",
lines[i])
+ if not result:
+ continue
+ new_include = self._find_modified_include_path(
+ project_dir, filename, result.groups()[0]
+ )
+
+ lines[i] = f'#include "{new_include}"\n'
+
+ with filename.open("w") as file:
+ file.writelines(lines)
+
+ def generate_project(self, model_library_format_path, standalone_crt_dir,
project_dir, options):
+ # Copy template folder to project_dir, creating project/ and src/
+ # directories in the process. Also copies this file,
microtvm_api_server.py,
+ # in case TVM needs to call it from the new location
+ if IS_TEMPLATE:
+ shutil.copytree(API_SERVER_DIR, project_dir, dirs_exist_ok=True)
+
+ # Reference key directories with pathlib
+ project_dir = pathlib.Path(project_dir)
+ source_dir = project_dir / "src"
+
+ # Copy standalone_crt into src folder
+ self._copy_standalone_crt(source_dir, standalone_crt_dir)
+ self._remove_unused_components(source_dir)
+ self._remove_unit_tests(project_dir)
+
+ # Unpack the MLF and copy the relevant files
+ graph = self._disassemble_mlf(model_library_format_path, source_dir)
+
+ shutil.copy2(model_library_format_path, source_dir / "model")
+
+ # Populate our parameters file
+ self._populate_parameters_file(graph, source_dir)
+
+ # Recursively change imports
+ self._convert_imports(project_dir, source_dir)
+
+ def _get_fqbn(self, options):
+ o = BOARD_PROPERTIES[options["arduino_board"]]
+ return f"{o['package']}:{o['architecture']}:{o['board']}"
+
+ def build(self, options):
+ BUILD_DIR.mkdir()
+ print(BUILD_DIR)
+
+ compile_cmd = [
+ options["arduino_cmd"],
+ "compile",
+ "./project/",
+ "--fqbn",
+ self._get_fqbn(options),
+ "--build-path",
+ BUILD_DIR.resolve(),
+ ]
+
+ if options.get("verbose"):
+ compile_cmd.append("--verbose")
+
+ # Specify project to compile
+ output = subprocess.check_call(compile_cmd)
+ assert output == 0
+
+ # We run the command `arduino-cli board list`, which produces
+ # outputs of the form:
+ """
+ Port Type Board Name FQBN
Core
+ /dev/ttyS4 Serial Port Unknown
+ /dev/ttyUSB0 Serial Port (USB) Spresense SPRESENSE:spresense:spresense
SPRESENSE:spresense
+ """
+
+ def _auto_detect_port(self, options):
+ list_cmd = [options["arduino_cmd"], "board", "list"]
+ list_cmd_output = subprocess.check_output(list_cmd).decode("utf-8")
+ # Remove header and new lines at bottom
+ port_options = list_cmd_output.split("\n")[1:-2]
+
+ # Select the first compatible board
+ fqbn = self._get_fqbn(options)
+ for port_option in port_options:
+ if fqbn in port_option:
+ return port_option.split(" ")[0]
+
+ # If no compatible boards, raise an error
+ raise BoardAutodetectFailed
Review comment:
here you should instantiate the error: `raise BoardAutodetectFailed()`
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
+
+API_SERVER_DIR = pathlib.Path(os.path.dirname(__file__) or os.path.getcwd())
+BUILD_DIR = API_SERVER_DIR / "build"
+IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()
+MODEL_LIBRARY_FORMAT_PATH = "" if IS_TEMPLATE else API_SERVER_DIR /
MODEL_LIBRARY_FORMAT_RELPATH
+
+
+class InvalidPortException(Exception):
+ """Raised when the given port could not be opened"""
+
+
+class SketchUploadException(Exception):
+ """Raised when a sketch cannot be uploaded for an unknown reason."""
+
+
+class BoardAutodetectFailed(Exception):
+ """Raised when no attached hardware is found matching the requested
board"""
+
+
+PROJECT_OPTIONS = [
+ server.ProjectOption("verbose", help="Run build with verbose output"),
+ server.ProjectOption("arduino_cmd", help="Path to the arduino-cli tool."),
Review comment:
maybe be explicit here that it's the `arduino-cli` command by naming
this `arduino_cli_path`
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
+
+API_SERVER_DIR = pathlib.Path(os.path.dirname(__file__) or os.path.getcwd())
+BUILD_DIR = API_SERVER_DIR / "build"
+IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()
+MODEL_LIBRARY_FORMAT_PATH = "" if IS_TEMPLATE else API_SERVER_DIR /
MODEL_LIBRARY_FORMAT_RELPATH
+
+
+class InvalidPortException(Exception):
+ """Raised when the given port could not be opened"""
+
+
+class SketchUploadException(Exception):
+ """Raised when a sketch cannot be uploaded for an unknown reason."""
+
+
+class BoardAutodetectFailed(Exception):
+ """Raised when no attached hardware is found matching the requested
board"""
+
+
+PROJECT_OPTIONS = [
+ server.ProjectOption("verbose", help="Run build with verbose output"),
+ server.ProjectOption("arduino_cmd", help="Path to the arduino-cli tool."),
+ server.ProjectOption("arduino_board", help="Name of the Arduino board to
build for"),
+ server.ProjectOption("port", help="Port to use for connecting to
hardware"),
+]
+
+BOARD_PROPERTIES = {
+ "spresense": {
+ "package": "SPRESENSE",
+ "architecture": "spresense",
+ "board": "spresense",
+ },
+ "nano33ble": {
+ "package": "arduino",
+ "architecture": "mbed_nano",
+ "board": "nano33ble",
+ },
+}
+
+
+class Handler(server.ProjectAPIHandler):
+ def __init__(self):
+ super(Handler, self).__init__()
+ self._proc = None
+ self._port = None
+ self._serial = None
+
+ def server_info_query(self):
+ return server.ServerInfo(
+ platform_name="arduino",
+ is_template=IS_TEMPLATE,
+ model_library_format_path=MODEL_LIBRARY_FORMAT_PATH,
+ project_options=PROJECT_OPTIONS,
+ )
+
+ CRT_COPY_ITEMS = ("include", "src")
+
+ def _copy_standalone_crt(self, source_dir, standalone_crt_dir):
+ # Copy over the standalone_crt directory
+ output_crt_dir = source_dir / "standalone_crt"
+ for item in self.CRT_COPY_ITEMS:
+ src_path = os.path.join(standalone_crt_dir, item)
+ dst_path = output_crt_dir / item
+ if os.path.isdir(src_path):
+ shutil.copytree(src_path, dst_path)
+ else:
+ shutil.copy2(src_path, dst_path)
+
+ UNUSED_COMPONENTS = [
+ "include/dmlc",
+ "src/support",
+ "src/runtime/minrpc",
+ "src/runtime/crt/aot_executor",
+ "src/runtime/crt/microtvm_rpc_common",
+ "src/runtime/crt/microtvm_rpc_server",
+ "src/runtime/crt/tab",
+ ]
+
+ def _remove_unused_components(self, source_dir):
+ for component in self.UNUSED_COMPONENTS:
+ shutil.rmtree(source_dir / "standalone_crt" / component)
+
+ # We need to remove these duplicate copies of unit tests from the
+ # tree to avoid pytest finding two copies
+ PYTEST_FILE_REGEX = r"(?:test_.*\.py)|(?:.*_test\.py)"
+
+ def _remove_unit_tests(self, source_dir):
+ for file_path in source_dir.rglob(f"*.py"):
+ if re.match(self.PYTEST_FILE_REGEX, file_path.name):
+ file_path.unlink()
+
+ GRAPH_JSON_TEMPLATE = 'static const char* graph_json = "{}";\n'
+
+ def _compile_graph_json(self, model_dir, obj):
Review comment:
nit: suggest create_graph_json or otherwise avoiding "compile" since the
CLI is doing the main compiling here
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
+
+API_SERVER_DIR = pathlib.Path(os.path.dirname(__file__) or os.path.getcwd())
+BUILD_DIR = API_SERVER_DIR / "build"
+IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()
+MODEL_LIBRARY_FORMAT_PATH = "" if IS_TEMPLATE else API_SERVER_DIR /
MODEL_LIBRARY_FORMAT_RELPATH
+
+
+class InvalidPortException(Exception):
+ """Raised when the given port could not be opened"""
+
+
+class SketchUploadException(Exception):
+ """Raised when a sketch cannot be uploaded for an unknown reason."""
+
+
+class BoardAutodetectFailed(Exception):
+ """Raised when no attached hardware is found matching the requested
board"""
+
+
+PROJECT_OPTIONS = [
+ server.ProjectOption("verbose", help="Run build with verbose output"),
+ server.ProjectOption("arduino_cmd", help="Path to the arduino-cli tool."),
+ server.ProjectOption("arduino_board", help="Name of the Arduino board to
build for"),
+ server.ProjectOption("port", help="Port to use for connecting to
hardware"),
+]
+
+BOARD_PROPERTIES = {
+ "spresense": {
+ "package": "SPRESENSE",
+ "architecture": "spresense",
+ "board": "spresense",
+ },
+ "nano33ble": {
+ "package": "arduino",
+ "architecture": "mbed_nano",
+ "board": "nano33ble",
+ },
+}
+
+
+class Handler(server.ProjectAPIHandler):
+ def __init__(self):
+ super(Handler, self).__init__()
+ self._proc = None
+ self._port = None
+ self._serial = None
+
+ def server_info_query(self):
+ return server.ServerInfo(
+ platform_name="arduino",
+ is_template=IS_TEMPLATE,
+ model_library_format_path=MODEL_LIBRARY_FORMAT_PATH,
+ project_options=PROJECT_OPTIONS,
+ )
+
+ CRT_COPY_ITEMS = ("include", "src")
+
+ def _copy_standalone_crt(self, source_dir, standalone_crt_dir):
+ # Copy over the standalone_crt directory
+ output_crt_dir = source_dir / "standalone_crt"
+ for item in self.CRT_COPY_ITEMS:
+ src_path = os.path.join(standalone_crt_dir, item)
+ dst_path = output_crt_dir / item
+ if os.path.isdir(src_path):
+ shutil.copytree(src_path, dst_path)
+ else:
+ shutil.copy2(src_path, dst_path)
+
+ UNUSED_COMPONENTS = [
+ "include/dmlc",
+ "src/support",
+ "src/runtime/minrpc",
+ "src/runtime/crt/aot_executor",
+ "src/runtime/crt/microtvm_rpc_common",
+ "src/runtime/crt/microtvm_rpc_server",
+ "src/runtime/crt/tab",
+ ]
+
+ def _remove_unused_components(self, source_dir):
+ for component in self.UNUSED_COMPONENTS:
+ shutil.rmtree(source_dir / "standalone_crt" / component)
+
+ # We need to remove these duplicate copies of unit tests from the
+ # tree to avoid pytest finding two copies
+ PYTEST_FILE_REGEX = r"(?:test_.*\.py)|(?:.*_test\.py)"
+
+ def _remove_unit_tests(self, source_dir):
+ for file_path in source_dir.rglob(f"*.py"):
+ if re.match(self.PYTEST_FILE_REGEX, file_path.name):
+ file_path.unlink()
+
+ GRAPH_JSON_TEMPLATE = 'static const char* graph_json = "{}";\n'
+
+ def _compile_graph_json(self, model_dir, obj):
+ graph_json = json.dumps(obj).replace('"', '\\"')
+ output = self.GRAPH_JSON_TEMPLATE.format(graph_json)
+ graph_json_path = model_dir / "graph_json.c"
+ with open(graph_json_path, "w") as out_file:
+ out_file.write(output)
+
+ def _disassemble_mlf(self, mlf_tar_path, source_dir):
+ mlf_unpacking_dir = tempfile.TemporaryDirectory()
+ with tarfile.open(mlf_tar_path, "r:") as tar:
+ tar.extractall(mlf_unpacking_dir.name)
+
+ # Copy C files
+ # TODO are the defaultlib0.c the same?
+ model_dir = source_dir / "model"
+ model_dir.mkdir()
+ for source, dest in [
+ ("codegen/host/src/default_lib0.c", "default_lib0.c"),
+ ("codegen/host/src/default_lib1.c", "default_lib1.c"),
+ ]:
+ shutil.copy(os.path.join(mlf_unpacking_dir.name, source),
model_dir / dest)
+
+ # Load graph.json, serialize to c format, and extact parameters
+ with open(os.path.join(mlf_unpacking_dir.name,
"executor-config/graph/graph.json")) as f:
+ graph_data = json.load(f)
+ self._compile_graph_json(model_dir, graph_data)
+
+ mlf_unpacking_dir.cleanup()
+ return graph_data
+
+ def _print_c_array(self, l):
+ c_arr_str = str(l)
+ return "{" + c_arr_str[1:-1] + "}"
+
+ def _print_c_str(self, s):
+ return '"{}"'.format(s)
+
+ DL_DATA_TYPE_REFERENCE = {
+ "uint8": "{kDLUInt, 8, 0}",
+ "uint16": "{kDLUInt, 16, 0}",
+ "uint32": "{kDLUInt, 32, 0}",
+ "uint64": "{kDLUInt, 64, 0}",
+ "int8": "{kDLInt, 8, 0}",
+ "int16": "{kDLInt, 16, 0}",
+ "int32": "{kDLInt, 32, 0}",
+ "int64": "{kDLInt, 64, 0}",
+ "float16": "{kDLFloat, 16, 0}",
+ "float32": "{kDLFloat, 32, 0}",
+ "float64": "{kDLFloat, 64, 0}",
+ }
+
+ def _populate_parameters_file(self, graph, source_dir):
+ graph_types = graph["attrs"]["dltype"]
+ graph_shapes = graph["attrs"]["shape"]
+ assert graph_types[0] == "list_str"
+ assert graph_shapes[0] == "list_shape"
+
+ template_values = {
+ "input_data_dimension": len(graph_shapes[1][0]),
+ "input_data_shape": self._print_c_array(graph_shapes[1][0]),
+ "input_data_type": self.DL_DATA_TYPE_REFERENCE[graph_types[1][0]],
+ "output_data_dimension": len(graph_shapes[1][-1]),
+ "output_data_shape": self._print_c_array(graph_shapes[1][-1]),
+ "output_data_type":
self.DL_DATA_TYPE_REFERENCE[graph_types[1][-1]],
+ "input_layer_name": self._print_c_str(graph["nodes"][0]["name"]),
+ }
+
+ # Apply template values
+ with open(source_dir / "parameters.h", "r") as f:
+ template_params = Template(f.read())
+
+ parameters_h = template_params.substitute(template_values)
+
+ with open(source_dir / "parameters.h", "w") as f:
+ f.write(parameters_h)
+
+ POSSIBLE_BASE_PATHS = ["src/standalone_crt/include/",
"src/standalone_crt/crt_config/"]
+
+ def _find_modified_include_path(self, project_dir, file_path, import_path):
+
+ # If the import already works, don't modify it
+ if (file_path.parents[0] / import_path).exists():
+ return import_path
+
+ relative_path = file_path.relative_to(project_dir)
+ up_dirs_path = "../" * str(relative_path).count("/")
+
+ for base_path in self.POSSIBLE_BASE_PATHS:
+ full_potential_path = project_dir / base_path / import_path
+ if full_potential_path.exists():
+ new_include = up_dirs_path + base_path + import_path
+ return new_include
+
+ # If we can't find the file, just leave it untouched
+ # It's probably a standard C/C++ header
+ return import_path
+
+ # Arduino only supports imports relative to the top-level project,
+ # so we need to adjust each import to meet this convention
+ def _convert_imports(self, project_dir, source_dir):
+ for ext in ("c", "h"):
+ for filename in source_dir.rglob(f"*.{ext}"):
+ with filename.open() as file:
+ lines = file.readlines()
+
+ for i in range(len(lines)):
+ # Check if line has an include
+ result = re.search(r"#include\s*[<\"]([^>]*)[>\"]",
lines[i])
+ if not result:
+ continue
+ new_include = self._find_modified_include_path(
+ project_dir, filename, result.groups()[0]
+ )
+
+ lines[i] = f'#include "{new_include}"\n'
+
+ with filename.open("w") as file:
+ file.writelines(lines)
+
+ def generate_project(self, model_library_format_path, standalone_crt_dir,
project_dir, options):
+ # Copy template folder to project_dir, creating project/ and src/
+ # directories in the process. Also copies this file,
microtvm_api_server.py,
+ # in case TVM needs to call it from the new location
+ if IS_TEMPLATE:
+ shutil.copytree(API_SERVER_DIR, project_dir, dirs_exist_ok=True)
+
+ # Reference key directories with pathlib
+ project_dir = pathlib.Path(project_dir)
+ source_dir = project_dir / "src"
+
+ # Copy standalone_crt into src folder
+ self._copy_standalone_crt(source_dir, standalone_crt_dir)
+ self._remove_unused_components(source_dir)
+ self._remove_unit_tests(project_dir)
+
+ # Unpack the MLF and copy the relevant files
+ graph = self._disassemble_mlf(model_library_format_path, source_dir)
+
+ shutil.copy2(model_library_format_path, source_dir / "model")
+
+ # Populate our parameters file
+ self._populate_parameters_file(graph, source_dir)
+
+ # Recursively change imports
+ self._convert_imports(project_dir, source_dir)
+
+ def _get_fqbn(self, options):
+ o = BOARD_PROPERTIES[options["arduino_board"]]
+ return f"{o['package']}:{o['architecture']}:{o['board']}"
+
+ def build(self, options):
+ BUILD_DIR.mkdir()
+ print(BUILD_DIR)
+
+ compile_cmd = [
+ options["arduino_cmd"],
+ "compile",
+ "./project/",
+ "--fqbn",
+ self._get_fqbn(options),
+ "--build-path",
+ BUILD_DIR.resolve(),
+ ]
+
+ if options.get("verbose"):
+ compile_cmd.append("--verbose")
+
+ # Specify project to compile
+ output = subprocess.check_call(compile_cmd)
+ assert output == 0
+
+ # We run the command `arduino-cli board list`, which produces
+ # outputs of the form:
+ """
+ Port Type Board Name FQBN
Core
+ /dev/ttyS4 Serial Port Unknown
+ /dev/ttyUSB0 Serial Port (USB) Spresense SPRESENSE:spresense:spresense
SPRESENSE:spresense
+ """
+
+ def _auto_detect_port(self, options):
+ list_cmd = [options["arduino_cmd"], "board", "list"]
+ list_cmd_output = subprocess.check_output(list_cmd).decode("utf-8")
+ # Remove header and new lines at bottom
+ port_options = list_cmd_output.split("\n")[1:-2]
+
+ # Select the first compatible board
+ fqbn = self._get_fqbn(options)
+ for port_option in port_options:
+ if fqbn in port_option:
+ return port_option.split(" ")[0]
+
+ # If no compatible boards, raise an error
+ raise BoardAutodetectFailed
+
+ def _get_arduino_port(self, options):
+ if not self._port:
+ if "port" in options and options["port"]:
+ self._port = options["port"]
+ else:
+ self._port = self._auto_detect_port(options)
+
+ return self._port
+
+ def _get_baudrate(self, options):
+ return 115200
+
+ def flash(self, options):
+ port = self._get_arduino_port(options)
+
+ upload_cmd = [
+ options["arduino_cmd"],
+ "upload",
+ "./project",
+ "--fqbn",
+ self._get_fqbn(options),
+ "--input-dir",
+ BUILD_DIR.resolve(),
+ "--port",
+ port,
+ ]
+ output = subprocess.check_call(upload_cmd)
+
+ if output == 2:
+ raise InvalidPortException
Review comment:
also instantiate these errors
##########
File path: apps/microtvm/arduino/template_project/microtvm_api_server.py
##########
@@ -0,0 +1,378 @@
+import collections
+import functools
+import json
+import logging
+import os
+import os.path
+import pathlib
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import tarfile
+from string import Template
+import tempfile
+import time
+
+import serial
+import serial.tools.list_ports
+
+from tvm.micro.project_api import server
+
+MODEL_LIBRARY_FORMAT_RELPATH = "src/model/model.tar"
+
+API_SERVER_DIR = pathlib.Path(os.path.dirname(__file__) or os.path.getcwd())
+BUILD_DIR = API_SERVER_DIR / "build"
+IS_TEMPLATE = not (API_SERVER_DIR / MODEL_LIBRARY_FORMAT_RELPATH).exists()
+MODEL_LIBRARY_FORMAT_PATH = "" if IS_TEMPLATE else API_SERVER_DIR /
MODEL_LIBRARY_FORMAT_RELPATH
+
+
+class InvalidPortException(Exception):
+ """Raised when the given port could not be opened"""
+
+
+class SketchUploadException(Exception):
+ """Raised when a sketch cannot be uploaded for an unknown reason."""
+
+
+class BoardAutodetectFailed(Exception):
+ """Raised when no attached hardware is found matching the requested
board"""
+
+
+PROJECT_OPTIONS = [
+ server.ProjectOption("verbose", help="Run build with verbose output"),
+ server.ProjectOption("arduino_cmd", help="Path to the arduino-cli tool."),
+ server.ProjectOption("arduino_board", help="Name of the Arduino board to
build for"),
+ server.ProjectOption("port", help="Port to use for connecting to
hardware"),
+]
+
+BOARD_PROPERTIES = {
+ "spresense": {
+ "package": "SPRESENSE",
+ "architecture": "spresense",
+ "board": "spresense",
+ },
+ "nano33ble": {
+ "package": "arduino",
+ "architecture": "mbed_nano",
+ "board": "nano33ble",
+ },
+}
+
+
+class Handler(server.ProjectAPIHandler):
+ def __init__(self):
+ super(Handler, self).__init__()
+ self._proc = None
+ self._port = None
+ self._serial = None
+
+ def server_info_query(self):
+ return server.ServerInfo(
+ platform_name="arduino",
+ is_template=IS_TEMPLATE,
+ model_library_format_path=MODEL_LIBRARY_FORMAT_PATH,
+ project_options=PROJECT_OPTIONS,
+ )
+
+ CRT_COPY_ITEMS = ("include", "src")
+
+ def _copy_standalone_crt(self, source_dir, standalone_crt_dir):
+ # Copy over the standalone_crt directory
+ output_crt_dir = source_dir / "standalone_crt"
+ for item in self.CRT_COPY_ITEMS:
+ src_path = os.path.join(standalone_crt_dir, item)
+ dst_path = output_crt_dir / item
+ if os.path.isdir(src_path):
+ shutil.copytree(src_path, dst_path)
+ else:
+ shutil.copy2(src_path, dst_path)
+
+ UNUSED_COMPONENTS = [
+ "include/dmlc",
+ "src/support",
+ "src/runtime/minrpc",
+ "src/runtime/crt/aot_executor",
+ "src/runtime/crt/microtvm_rpc_common",
+ "src/runtime/crt/microtvm_rpc_server",
+ "src/runtime/crt/tab",
+ ]
+
+ def _remove_unused_components(self, source_dir):
+ for component in self.UNUSED_COMPONENTS:
+ shutil.rmtree(source_dir / "standalone_crt" / component)
+
+ # We need to remove these duplicate copies of unit tests from the
+ # tree to avoid pytest finding two copies
+ PYTEST_FILE_REGEX = r"(?:test_.*\.py)|(?:.*_test\.py)"
+
+ def _remove_unit_tests(self, source_dir):
+ for file_path in source_dir.rglob(f"*.py"):
+ if re.match(self.PYTEST_FILE_REGEX, file_path.name):
+ file_path.unlink()
+
+ GRAPH_JSON_TEMPLATE = 'static const char* graph_json = "{}";\n'
+
+ def _compile_graph_json(self, model_dir, obj):
+ graph_json = json.dumps(obj).replace('"', '\\"')
+ output = self.GRAPH_JSON_TEMPLATE.format(graph_json)
+ graph_json_path = model_dir / "graph_json.c"
+ with open(graph_json_path, "w") as out_file:
+ out_file.write(output)
+
+ def _disassemble_mlf(self, mlf_tar_path, source_dir):
+ mlf_unpacking_dir = tempfile.TemporaryDirectory()
+ with tarfile.open(mlf_tar_path, "r:") as tar:
+ tar.extractall(mlf_unpacking_dir.name)
+
+ # Copy C files
+ # TODO are the defaultlib0.c the same?
+ model_dir = source_dir / "model"
+ model_dir.mkdir()
+ for source, dest in [
+ ("codegen/host/src/default_lib0.c", "default_lib0.c"),
+ ("codegen/host/src/default_lib1.c", "default_lib1.c"),
+ ]:
+ shutil.copy(os.path.join(mlf_unpacking_dir.name, source),
model_dir / dest)
+
+ # Load graph.json, serialize to c format, and extact parameters
+ with open(os.path.join(mlf_unpacking_dir.name,
"executor-config/graph/graph.json")) as f:
+ graph_data = json.load(f)
+ self._compile_graph_json(model_dir, graph_data)
+
+ mlf_unpacking_dir.cleanup()
+ return graph_data
+
+ def _print_c_array(self, l):
+ c_arr_str = str(l)
+ return "{" + c_arr_str[1:-1] + "}"
+
+ def _print_c_str(self, s):
+ return '"{}"'.format(s)
+
+ DL_DATA_TYPE_REFERENCE = {
+ "uint8": "{kDLUInt, 8, 0}",
+ "uint16": "{kDLUInt, 16, 0}",
+ "uint32": "{kDLUInt, 32, 0}",
+ "uint64": "{kDLUInt, 64, 0}",
+ "int8": "{kDLInt, 8, 0}",
+ "int16": "{kDLInt, 16, 0}",
+ "int32": "{kDLInt, 32, 0}",
+ "int64": "{kDLInt, 64, 0}",
+ "float16": "{kDLFloat, 16, 0}",
+ "float32": "{kDLFloat, 32, 0}",
+ "float64": "{kDLFloat, 64, 0}",
+ }
+
+ def _populate_parameters_file(self, graph, source_dir):
+ graph_types = graph["attrs"]["dltype"]
+ graph_shapes = graph["attrs"]["shape"]
+ assert graph_types[0] == "list_str"
+ assert graph_shapes[0] == "list_shape"
+
+ template_values = {
+ "input_data_dimension": len(graph_shapes[1][0]),
+ "input_data_shape": self._print_c_array(graph_shapes[1][0]),
+ "input_data_type": self.DL_DATA_TYPE_REFERENCE[graph_types[1][0]],
+ "output_data_dimension": len(graph_shapes[1][-1]),
+ "output_data_shape": self._print_c_array(graph_shapes[1][-1]),
+ "output_data_type":
self.DL_DATA_TYPE_REFERENCE[graph_types[1][-1]],
+ "input_layer_name": self._print_c_str(graph["nodes"][0]["name"]),
+ }
+
+ # Apply template values
+ with open(source_dir / "parameters.h", "r") as f:
+ template_params = Template(f.read())
+
+ parameters_h = template_params.substitute(template_values)
+
+ with open(source_dir / "parameters.h", "w") as f:
+ f.write(parameters_h)
+
+ POSSIBLE_BASE_PATHS = ["src/standalone_crt/include/",
"src/standalone_crt/crt_config/"]
+
+ def _find_modified_include_path(self, project_dir, file_path, import_path):
+
+ # If the import already works, don't modify it
+ if (file_path.parents[0] / import_path).exists():
+ return import_path
+
+ relative_path = file_path.relative_to(project_dir)
+ up_dirs_path = "../" * str(relative_path).count("/")
+
+ for base_path in self.POSSIBLE_BASE_PATHS:
+ full_potential_path = project_dir / base_path / import_path
+ if full_potential_path.exists():
+ new_include = up_dirs_path + base_path + import_path
+ return new_include
+
+ # If we can't find the file, just leave it untouched
+ # It's probably a standard C/C++ header
+ return import_path
+
+ # Arduino only supports imports relative to the top-level project,
+ # so we need to adjust each import to meet this convention
+ def _convert_imports(self, project_dir, source_dir):
+ for ext in ("c", "h"):
+ for filename in source_dir.rglob(f"*.{ext}"):
+ with filename.open() as file:
+ lines = file.readlines()
+
+ for i in range(len(lines)):
+ # Check if line has an include
+ result = re.search(r"#include\s*[<\"]([^>]*)[>\"]",
lines[i])
+ if not result:
+ continue
+ new_include = self._find_modified_include_path(
+ project_dir, filename, result.groups()[0]
+ )
+
+ lines[i] = f'#include "{new_include}"\n'
+
+ with filename.open("w") as file:
+ file.writelines(lines)
+
+ def generate_project(self, model_library_format_path, standalone_crt_dir,
project_dir, options):
+ # Copy template folder to project_dir, creating project/ and src/
+ # directories in the process. Also copies this file,
microtvm_api_server.py,
+ # in case TVM needs to call it from the new location
+ if IS_TEMPLATE:
+ shutil.copytree(API_SERVER_DIR, project_dir, dirs_exist_ok=True)
+
+ # Reference key directories with pathlib
+ project_dir = pathlib.Path(project_dir)
+ source_dir = project_dir / "src"
+
+ # Copy standalone_crt into src folder
+ self._copy_standalone_crt(source_dir, standalone_crt_dir)
+ self._remove_unused_components(source_dir)
+ self._remove_unit_tests(project_dir)
+
+ # Unpack the MLF and copy the relevant files
+ graph = self._disassemble_mlf(model_library_format_path, source_dir)
+
+ shutil.copy2(model_library_format_path, source_dir / "model")
+
+ # Populate our parameters file
+ self._populate_parameters_file(graph, source_dir)
+
+ # Recursively change imports
+ self._convert_imports(project_dir, source_dir)
+
+ def _get_fqbn(self, options):
+ o = BOARD_PROPERTIES[options["arduino_board"]]
+ return f"{o['package']}:{o['architecture']}:{o['board']}"
+
+ def build(self, options):
+ BUILD_DIR.mkdir()
+ print(BUILD_DIR)
+
+ compile_cmd = [
+ options["arduino_cmd"],
+ "compile",
+ "./project/",
+ "--fqbn",
+ self._get_fqbn(options),
+ "--build-path",
+ BUILD_DIR.resolve(),
+ ]
+
+ if options.get("verbose"):
+ compile_cmd.append("--verbose")
+
+ # Specify project to compile
+ output = subprocess.check_call(compile_cmd)
+ assert output == 0
+
+ # We run the command `arduino-cli board list`, which produces
+ # outputs of the form:
+ """
+ Port Type Board Name FQBN
Core
+ /dev/ttyS4 Serial Port Unknown
+ /dev/ttyUSB0 Serial Port (USB) Spresense SPRESENSE:spresense:spresense
SPRESENSE:spresense
+ """
+
+ def _auto_detect_port(self, options):
+ list_cmd = [options["arduino_cmd"], "board", "list"]
+ list_cmd_output = subprocess.check_output(list_cmd).decode("utf-8")
+ # Remove header and new lines at bottom
+ port_options = list_cmd_output.split("\n")[1:-2]
+
+ # Select the first compatible board
+ fqbn = self._get_fqbn(options)
+ for port_option in port_options:
+ if fqbn in port_option:
+ return port_option.split(" ")[0]
+
+ # If no compatible boards, raise an error
+ raise BoardAutodetectFailed
+
+ def _get_arduino_port(self, options):
+ if not self._port:
+ if "port" in options and options["port"]:
+ self._port = options["port"]
+ else:
+ self._port = self._auto_detect_port(options)
+
+ return self._port
+
+ def _get_baudrate(self, options):
Review comment:
here you could probably skip the function since you're just hardcoding
it for now
##########
File path: apps/microtvm/arduino/template_project/test_microtvm_api_server.py
##########
@@ -0,0 +1,38 @@
+from unittest.mock import patch
+from pathlib import Path
+
+import pytest
+
+import microtvm_api_server
+
+
+class TestGenerateProject:
+ """A class with common parameters, `param1` and `param2`."""
Review comment:
i don't see these params, suggest getting rid of the class if they
aren't here
##########
File path: apps/microtvm/arduino/template_project/test_microtvm_api_server.py
##########
@@ -0,0 +1,38 @@
+from unittest.mock import patch
+from pathlib import Path
+
+import pytest
+
+import microtvm_api_server
+
+
+class TestGenerateProject:
+ """A class with common parameters, `param1` and `param2`."""
+
+ def test_print_c_array(self):
+ handler = microtvm_api_server.Handler()
+ c_arr = handler._print_c_array([1, 32, 32, 3])
+ assert c_arr == "{1, 32, 32, 3}"
+
+ def _set_pathlib_path_exists(self, value):
+ with patch.object(Path, "exists") as mock_exists:
+ mock_exists.return_value = value
+
+ @patch("pathlib.Path")
+ def test_find_modified_include_path(self, MockPath):
+ handler = microtvm_api_server.Handler()
+
+ project_dir = MockPath("/dummy/project")
+ file_path = project_dir /
"src/standalone_crt/src/runtime/crt/graph_executor/load_json.c"
Review comment:
nit: choose one style of path separator
##########
File path: apps/microtvm/arduino/template_project/test_microtvm_api_server.py
##########
@@ -0,0 +1,38 @@
+from unittest.mock import patch
Review comment:
i can't remember if we talked about this--I think we did...you could put
this in `tests/micro/arduino` and save the remove-test-case logic. i'd suggest
we either do that or at least put it in `apps/microtvm/arduino/tests`. however,
there's precedent for testing `apps/` (and other dirs, like `python` and `src`)
in `tests/`, so i don't think it's a big deal to put this in
`tests/micro/arduino`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
