You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by GitBox <gi...@apache.org> on 2022/04/11 16:28:01 UTC
[GitHub] [tvm] grant-arm opened a new pull request, #10962: [TVMC] Allow output module name to be passed as a command line argument
grant-arm opened a new pull request, #10962:
URL: https://github.com/apache/tvm/pull/10962
Currently there is no way to pass an output module name to tvmc on the command line when compiling a model.
This means that (for the use cases we are interested in) generated C code is always placed in files named `default_lib*.c` and that functions are named `tvmgen_default*()`.
If we want to compile multiple models for use with a single application, the C source file names and function names are not unique, resulting in failure when building the generated C code.
This PR allows module-name to be passed to tvmc on the command line, for example:
```
tvmc compile --target=cmsis-nn,c \
--target-cmsis-nn-mcpu=cortex-m55 \
--runtime=crt \
--executor=aot \
--executor-aot-interface-api=c \
--executor-aot-unpacked-api=1 \
--pass-config tir.usmp.enable=1 \
--pass-config tir.usmp.algorithm=hill_climb \
--pass-config tir.disable_storage_rewrite=1 \
--pass-config tir.disable_vectorize=1 ./mobilenet_v2_1.0_224_INT8.tflite \
--output-format=mlf \
--module-name=classify
```
In this case, the generated C code is placed in files name `classify_lib*.c` and functions are named `tvmgen_classify*()`.
Additionally, this PR updates the microNPU and CMSIS-NN graph partitioners to pass the module name to PartitionGraph().
This is necessary to ensure that the C code function names generated for microNPU and CMSIS-NN include the module name and not `default`.
@leandron @Mousius @manupa-arm @areusch
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] areusch commented on a diff in pull request #10962: [TVMC] Allow output module name to be passed as a command line argument
Posted by GitBox <gi...@apache.org>.
areusch commented on code in PR #10962:
URL: https://github.com/apache/tvm/pull/10962#discussion_r847597063
##########
python/tvm/driver/tvmc/compiler.py:
##########
@@ -202,6 +208,7 @@ def compile_model(
pass_context_configs: Optional[List[str]] = None,
additional_target_options: Optional[Dict[str, Dict[str, Any]]] = None,
use_vm: bool = False,
+ mod_name: Optional[str] = "default",
Review Comment:
perhaps "default" should be a constant somewhere?
##########
tests/python/driver/tvmc/test_compiler.py:
##########
@@ -552,6 +552,157 @@ def test_compile_check_configs_composite_target(mock_pkg, mock_pc, mock_fe, mock
)
+def test_compile_tflite_module_with_mod_name(tmpdir_factory, tflite_cnn_s_quantized):
+ pytest.importorskip("tflite")
+
+ output_dir = tmpdir_factory.mktemp("mlf")
+ tvmc_model = tvmc.load(tflite_cnn_s_quantized)
+
+ output_file_name = f"{output_dir}/file.tar"
+
+ tvmc.compiler.compile_model(
+ tvmc_model,
+ target=f"c -mcpu=cortex-m55",
+ runtime=Runtime("crt", {"system-lib": True}),
+ executor=Executor("aot"),
+ output_format="mlf",
+ package_path=output_file_name,
+ pass_context_configs=["tir.disable_vectorize=true"],
+ mod_name="classify",
+ )
+
+ # check that an MLF package was created
+ assert os.path.exists(output_file_name)
+
+ with tarfile.open(output_file_name) as mlf_package:
+ # check that the C source files have been named classify_lib*.c
+ c_source_files = [
+ name
+ for name in mlf_package.getnames()
+ if re.match(r"\./codegen/host/src/classify_lib\d+\.c", name)
+ ]
+ assert len(c_source_files) == 2
Review Comment:
maybe should just assert there is at least 1 of these--or, that all `.c` files in codegen/host/src start with `classify_`, since the number of output modules could change
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] grant-arm commented on a diff in pull request #10962: [TVMC] Allow output module name to be passed as a command line argument
Posted by GitBox <gi...@apache.org>.
grant-arm commented on code in PR #10962:
URL: https://github.com/apache/tvm/pull/10962#discussion_r848460504
##########
tests/python/driver/tvmc/test_compiler.py:
##########
@@ -552,6 +552,157 @@ def test_compile_check_configs_composite_target(mock_pkg, mock_pc, mock_fe, mock
)
+def test_compile_tflite_module_with_mod_name(tmpdir_factory, tflite_cnn_s_quantized):
+ pytest.importorskip("tflite")
+
+ output_dir = tmpdir_factory.mktemp("mlf")
+ tvmc_model = tvmc.load(tflite_cnn_s_quantized)
+
+ output_file_name = f"{output_dir}/file.tar"
+
+ tvmc.compiler.compile_model(
+ tvmc_model,
+ target=f"c -mcpu=cortex-m55",
+ runtime=Runtime("crt", {"system-lib": True}),
+ executor=Executor("aot"),
+ output_format="mlf",
+ package_path=output_file_name,
+ pass_context_configs=["tir.disable_vectorize=true"],
+ mod_name="classify",
+ )
+
+ # check that an MLF package was created
+ assert os.path.exists(output_file_name)
+
+ with tarfile.open(output_file_name) as mlf_package:
+ # check that the C source files have been named classify_lib*.c
+ c_source_files = [
+ name
+ for name in mlf_package.getnames()
+ if re.match(r"\./codegen/host/src/classify_lib\d+\.c", name)
+ ]
+ assert len(c_source_files) == 2
Review Comment:
Thanks @areusch , I agree it's probably a bit brittle this way.
I've changed it now as you suggested.
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] grant-arm commented on a diff in pull request #10962: [TVMC] Allow output module name to be passed as a command line argument
Posted by GitBox <gi...@apache.org>.
grant-arm commented on code in PR #10962:
URL: https://github.com/apache/tvm/pull/10962#discussion_r848603861
##########
python/tvm/relay/op/contrib/ethosu.py:
##########
@@ -1767,7 +1767,10 @@ def pattern_table() -> List[Tuple[str, tvm.relay.dataflow_pattern.DFPattern, Cal
# pylint: disable=unused-argument
@requires_vela
def partition_for_ethosu(
- mod: tvm.ir.IRModule, params: Optional[Dict[str, tvm.runtime.NDArray]] = None, **opts
+ mod: tvm.ir.IRModule,
+ params: Optional[Dict[str, tvm.runtime.NDArray]] = None,
+ mod_name="default",
Review Comment:
Thanks for spotting that @ekalda.
Fixed now.
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] grant-arm commented on a diff in pull request #10962: [TVMC] Allow output module name to be passed as a command line argument
Posted by GitBox <gi...@apache.org>.
grant-arm commented on code in PR #10962:
URL: https://github.com/apache/tvm/pull/10962#discussion_r848461144
##########
python/tvm/driver/tvmc/compiler.py:
##########
@@ -137,6 +137,11 @@ def add_compile_parser(subparsers, _):
type=parse_pass_list_str,
default="",
)
+ parser.add_argument(
+ "--module-name",
+ default="default",
+ help="The output module name.",
Review Comment:
Thanks @leandron . That makes sense. I've changed it now.
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] masahi merged pull request #10962: [TVMC] Allow output module name to be passed as a command line argument
Posted by GitBox <gi...@apache.org>.
masahi merged PR #10962:
URL: https://github.com/apache/tvm/pull/10962
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] leandron commented on a diff in pull request #10962: [TVMC] Allow output module name to be passed as a command line argument
Posted by GitBox <gi...@apache.org>.
leandron commented on code in PR #10962:
URL: https://github.com/apache/tvm/pull/10962#discussion_r848251815
##########
python/tvm/driver/tvmc/compiler.py:
##########
@@ -137,6 +137,11 @@ def add_compile_parser(subparsers, _):
type=parse_pass_list_str,
default="",
)
+ parser.add_argument(
+ "--module-name",
+ default="default",
+ help="The output module name.",
Review Comment:
```suggestion
help="The output module name. Defaults to 'default'.",
```
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] grant-arm commented on a diff in pull request #10962: [TVMC] Allow output module name to be passed as a command line argument
Posted by GitBox <gi...@apache.org>.
grant-arm commented on code in PR #10962:
URL: https://github.com/apache/tvm/pull/10962#discussion_r848603145
##########
tests/python/driver/tvmc/test_compiler.py:
##########
@@ -552,6 +552,158 @@ def test_compile_check_configs_composite_target(mock_pkg, mock_pc, mock_fe, mock
)
+def test_compile_tflite_module_with_mod_name(tmpdir_factory, tflite_cnn_s_quantized):
+ pytest.importorskip("tflite")
+
+ output_dir = tmpdir_factory.mktemp("mlf")
+ tvmc_model = tvmc.load(tflite_cnn_s_quantized)
+
+ output_file_name = f"{output_dir}/file.tar"
+
+ tvmc.compiler.compile_model(
+ tvmc_model,
+ target=f"c -mcpu=cortex-m55",
+ runtime=Runtime("crt", {"system-lib": True}),
+ executor=Executor("aot"),
+ output_format="mlf",
+ package_path=output_file_name,
+ pass_context_configs=["tir.disable_vectorize=true"],
+ mod_name="classify",
+ )
+
+ # check that an MLF package was created
+ assert os.path.exists(output_file_name)
+
+ with tarfile.open(output_file_name) as mlf_package:
+ # check that the C source files have been named classify_lib*.c
+ c_source_files = [
+ name
+ for name in mlf_package.getnames()
+ if re.match(r"\./codegen/host/src/classify_lib\d+\.c", name)
+ ]
+ assert len(c_source_files) > 0
+
+ # check that "default" doesn't occur in any of the C source files
+ # check that function names are of the form "tvmgen_classify_*"
+ for file_name in c_source_files:
+ with mlf_package.extractfile(file_name) as f:
+ content = f.read()
+ assert b"default" not in content
+ assert b"tvmgen_classify_" in content
+
+ # check that tvmgen_classify_run() function exists
+ with mlf_package.extractfile("./codegen/host/src/classify_lib0.c") as f:
+ content = f.read()
+ assert b"tvmgen_classify_run(" in content
+
+
+@tvm.testing.requires_cmsisnn
+def test_compile_tflite_module_with_mod_name_and_cmsisnn(tmpdir_factory, tflite_cnn_s_quantized):
+ pytest.importorskip("tflite")
+
+ output_dir = tmpdir_factory.mktemp("mlf")
+ tvmc_model = tvmc.load(tflite_cnn_s_quantized)
+
+ output_file_name = f"{output_dir}/file.tar"
+
+ tvmc.compiler.compile_model(
+ tvmc_model,
+ target=f"cmsis-nn, c -mcpu=cortex-m55",
+ runtime=Runtime("crt", {"system-lib": True}),
+ executor=Executor("aot"),
+ output_format="mlf",
+ package_path=output_file_name,
+ pass_context_configs=["tir.disable_vectorize=true"],
+ mod_name="classify",
+ )
+
+ # check that an MLF package was created
+ assert os.path.exists(output_file_name)
+
+ with tarfile.open(output_file_name) as mlf_package:
+ # check that the C source files have been named classify_lib*.c
+ c_source_files = [
+ name
+ for name in mlf_package.getnames()
+ if re.match(r"\./codegen/host/src/classify_lib\d+\.c", name)
+ ]
+ assert len(c_source_files) > 0
+
+ # check that "default" doesn't occur in any of the C source files
+ # check that function names are of the form "tvmgen_classify_*"
+ for file_name in c_source_files:
+ with mlf_package.extractfile(file_name) as f:
+ content = f.read()
+ assert b"default" not in content
+ assert b"tvmgen_classify_" in content
+
+ # check that tvmgen_classify_run() function exists
+ with mlf_package.extractfile("./codegen/host/src/classify_lib0.c") as f:
+ content = f.read()
+ assert b"tvmgen_classify_run(" in content
+
+ # check that CMSIS-NN function names are of the form "tvmgen_classify_cmsis_nn_main_*"
+ with mlf_package.extractfile("./codegen/host/src/classify_lib2.c") as f:
+ content = f.read()
+ assert b"tvmgen_classify_cmsis_nn_main_" in content
+
+
+def test_compile_tflite_module_with_mod_name_and_ethosu(
+ tmpdir_factory, tflite_mobilenet_v1_1_quant
+):
+ pytest.importorskip("tflite")
+ pytest.importorskip("ethosu.vela")
+ ACCEL_TYPES = ["ethos-u55-256", "ethos-u55-128", "ethos-u55-64", "ethos-u55-32"]
+
+ output_dir = tmpdir_factory.mktemp("mlf")
+
+ tvmc_model = tvmc.load(tflite_mobilenet_v1_1_quant)
+
+ for accel_type in ACCEL_TYPES:
+ output_file_name = f"{output_dir}/file_{accel_type}.tar"
+
+ tvmc.compiler.compile_model(
+ tvmc_model,
+ target=f"ethos-u -accelerator_config={accel_type}, c -mcpu=cortex-m55",
+ runtime=Runtime("crt"),
+ executor=Executor("aot", {"unpacked-api": True}),
+ output_format="mlf",
+ package_path=output_file_name,
+ pass_context_configs=["tir.disable_vectorize=true"],
+ mod_name="classify",
+ )
+
+ # check that an MLF package was created
+ assert os.path.exists(output_file_name)
+
+ with tarfile.open(output_file_name) as mlf_package:
Review Comment:
Good catch @ekalda! That's exactly what it was doing.
I've actually removed that loop now. It seems unnecessary to test it for each accelerator type.
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] grant-arm commented on a diff in pull request #10962: [TVMC] Allow output module name to be passed as a command line argument
Posted by GitBox <gi...@apache.org>.
grant-arm commented on code in PR #10962:
URL: https://github.com/apache/tvm/pull/10962#discussion_r848462959
##########
python/tvm/driver/tvmc/compiler.py:
##########
@@ -202,6 +208,7 @@ def compile_model(
pass_context_configs: Optional[List[str]] = None,
additional_target_options: Optional[Dict[str, Dict[str, Any]]] = None,
use_vm: bool = False,
+ mod_name: Optional[str] = "default",
Review Comment:
Thanks @areusch , I agree it would be good to have "default" as a constant.
It feels like this should be a separate PR though.
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] ekalda commented on a diff in pull request #10962: [TVMC] Allow output module name to be passed as a command line argument
Posted by GitBox <gi...@apache.org>.
ekalda commented on code in PR #10962:
URL: https://github.com/apache/tvm/pull/10962#discussion_r848573003
##########
python/tvm/relay/op/contrib/ethosu.py:
##########
@@ -1767,7 +1767,10 @@ def pattern_table() -> List[Tuple[str, tvm.relay.dataflow_pattern.DFPattern, Cal
# pylint: disable=unused-argument
@requires_vela
def partition_for_ethosu(
- mod: tvm.ir.IRModule, params: Optional[Dict[str, tvm.runtime.NDArray]] = None, **opts
+ mod: tvm.ir.IRModule,
+ params: Optional[Dict[str, tvm.runtime.NDArray]] = None,
+ mod_name="default",
Review Comment:
Nit: add the Python type hint
##########
tests/python/driver/tvmc/test_compiler.py:
##########
@@ -552,6 +552,158 @@ def test_compile_check_configs_composite_target(mock_pkg, mock_pc, mock_fe, mock
)
+def test_compile_tflite_module_with_mod_name(tmpdir_factory, tflite_cnn_s_quantized):
+ pytest.importorskip("tflite")
+
+ output_dir = tmpdir_factory.mktemp("mlf")
+ tvmc_model = tvmc.load(tflite_cnn_s_quantized)
+
+ output_file_name = f"{output_dir}/file.tar"
+
+ tvmc.compiler.compile_model(
+ tvmc_model,
+ target=f"c -mcpu=cortex-m55",
+ runtime=Runtime("crt", {"system-lib": True}),
+ executor=Executor("aot"),
+ output_format="mlf",
+ package_path=output_file_name,
+ pass_context_configs=["tir.disable_vectorize=true"],
+ mod_name="classify",
+ )
+
+ # check that an MLF package was created
+ assert os.path.exists(output_file_name)
+
+ with tarfile.open(output_file_name) as mlf_package:
+ # check that the C source files have been named classify_lib*.c
+ c_source_files = [
+ name
+ for name in mlf_package.getnames()
+ if re.match(r"\./codegen/host/src/classify_lib\d+\.c", name)
+ ]
+ assert len(c_source_files) > 0
+
+ # check that "default" doesn't occur in any of the C source files
+ # check that function names are of the form "tvmgen_classify_*"
+ for file_name in c_source_files:
+ with mlf_package.extractfile(file_name) as f:
+ content = f.read()
+ assert b"default" not in content
+ assert b"tvmgen_classify_" in content
+
+ # check that tvmgen_classify_run() function exists
+ with mlf_package.extractfile("./codegen/host/src/classify_lib0.c") as f:
+ content = f.read()
+ assert b"tvmgen_classify_run(" in content
+
+
+@tvm.testing.requires_cmsisnn
+def test_compile_tflite_module_with_mod_name_and_cmsisnn(tmpdir_factory, tflite_cnn_s_quantized):
+ pytest.importorskip("tflite")
+
+ output_dir = tmpdir_factory.mktemp("mlf")
+ tvmc_model = tvmc.load(tflite_cnn_s_quantized)
+
+ output_file_name = f"{output_dir}/file.tar"
+
+ tvmc.compiler.compile_model(
+ tvmc_model,
+ target=f"cmsis-nn, c -mcpu=cortex-m55",
+ runtime=Runtime("crt", {"system-lib": True}),
+ executor=Executor("aot"),
+ output_format="mlf",
+ package_path=output_file_name,
+ pass_context_configs=["tir.disable_vectorize=true"],
+ mod_name="classify",
+ )
+
+ # check that an MLF package was created
+ assert os.path.exists(output_file_name)
+
+ with tarfile.open(output_file_name) as mlf_package:
+ # check that the C source files have been named classify_lib*.c
+ c_source_files = [
+ name
+ for name in mlf_package.getnames()
+ if re.match(r"\./codegen/host/src/classify_lib\d+\.c", name)
+ ]
+ assert len(c_source_files) > 0
+
+ # check that "default" doesn't occur in any of the C source files
+ # check that function names are of the form "tvmgen_classify_*"
+ for file_name in c_source_files:
+ with mlf_package.extractfile(file_name) as f:
+ content = f.read()
+ assert b"default" not in content
+ assert b"tvmgen_classify_" in content
+
+ # check that tvmgen_classify_run() function exists
+ with mlf_package.extractfile("./codegen/host/src/classify_lib0.c") as f:
+ content = f.read()
+ assert b"tvmgen_classify_run(" in content
+
+ # check that CMSIS-NN function names are of the form "tvmgen_classify_cmsis_nn_main_*"
+ with mlf_package.extractfile("./codegen/host/src/classify_lib2.c") as f:
+ content = f.read()
+ assert b"tvmgen_classify_cmsis_nn_main_" in content
+
+
+def test_compile_tflite_module_with_mod_name_and_ethosu(
+ tmpdir_factory, tflite_mobilenet_v1_1_quant
+):
+ pytest.importorskip("tflite")
+ pytest.importorskip("ethosu.vela")
+ ACCEL_TYPES = ["ethos-u55-256", "ethos-u55-128", "ethos-u55-64", "ethos-u55-32"]
+
+ output_dir = tmpdir_factory.mktemp("mlf")
+
+ tvmc_model = tvmc.load(tflite_mobilenet_v1_1_quant)
+
+ for accel_type in ACCEL_TYPES:
+ output_file_name = f"{output_dir}/file_{accel_type}.tar"
+
+ tvmc.compiler.compile_model(
+ tvmc_model,
+ target=f"ethos-u -accelerator_config={accel_type}, c -mcpu=cortex-m55",
+ runtime=Runtime("crt"),
+ executor=Executor("aot", {"unpacked-api": True}),
+ output_format="mlf",
+ package_path=output_file_name,
+ pass_context_configs=["tir.disable_vectorize=true"],
+ mod_name="classify",
+ )
+
+ # check that an MLF package was created
+ assert os.path.exists(output_file_name)
+
+ with tarfile.open(output_file_name) as mlf_package:
Review Comment:
It looks like it is creating an mlf for each accelerator, but then doesn't do anything with the first three of them?
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] ekalda commented on a diff in pull request #10962: [TVMC] Allow output module name to be passed as a command line argument
Posted by GitBox <gi...@apache.org>.
ekalda commented on code in PR #10962:
URL: https://github.com/apache/tvm/pull/10962#discussion_r848625844
##########
tests/python/driver/tvmc/test_compiler.py:
##########
@@ -552,6 +552,158 @@ def test_compile_check_configs_composite_target(mock_pkg, mock_pc, mock_fe, mock
)
+def test_compile_tflite_module_with_mod_name(tmpdir_factory, tflite_cnn_s_quantized):
+ pytest.importorskip("tflite")
+
+ output_dir = tmpdir_factory.mktemp("mlf")
+ tvmc_model = tvmc.load(tflite_cnn_s_quantized)
+
+ output_file_name = f"{output_dir}/file.tar"
+
+ tvmc.compiler.compile_model(
+ tvmc_model,
+ target=f"c -mcpu=cortex-m55",
+ runtime=Runtime("crt", {"system-lib": True}),
+ executor=Executor("aot"),
+ output_format="mlf",
+ package_path=output_file_name,
+ pass_context_configs=["tir.disable_vectorize=true"],
+ mod_name="classify",
+ )
+
+ # check that an MLF package was created
+ assert os.path.exists(output_file_name)
+
+ with tarfile.open(output_file_name) as mlf_package:
+ # check that the C source files have been named classify_lib*.c
+ c_source_files = [
+ name
+ for name in mlf_package.getnames()
+ if re.match(r"\./codegen/host/src/classify_lib\d+\.c", name)
+ ]
+ assert len(c_source_files) > 0
+
+ # check that "default" doesn't occur in any of the C source files
+ # check that function names are of the form "tvmgen_classify_*"
+ for file_name in c_source_files:
+ with mlf_package.extractfile(file_name) as f:
+ content = f.read()
+ assert b"default" not in content
+ assert b"tvmgen_classify_" in content
+
+ # check that tvmgen_classify_run() function exists
+ with mlf_package.extractfile("./codegen/host/src/classify_lib0.c") as f:
+ content = f.read()
+ assert b"tvmgen_classify_run(" in content
+
+
+@tvm.testing.requires_cmsisnn
+def test_compile_tflite_module_with_mod_name_and_cmsisnn(tmpdir_factory, tflite_cnn_s_quantized):
+ pytest.importorskip("tflite")
+
+ output_dir = tmpdir_factory.mktemp("mlf")
+ tvmc_model = tvmc.load(tflite_cnn_s_quantized)
+
+ output_file_name = f"{output_dir}/file.tar"
+
+ tvmc.compiler.compile_model(
+ tvmc_model,
+ target=f"cmsis-nn, c -mcpu=cortex-m55",
+ runtime=Runtime("crt", {"system-lib": True}),
+ executor=Executor("aot"),
+ output_format="mlf",
+ package_path=output_file_name,
+ pass_context_configs=["tir.disable_vectorize=true"],
+ mod_name="classify",
+ )
+
+ # check that an MLF package was created
+ assert os.path.exists(output_file_name)
+
+ with tarfile.open(output_file_name) as mlf_package:
+ # check that the C source files have been named classify_lib*.c
+ c_source_files = [
+ name
+ for name in mlf_package.getnames()
+ if re.match(r"\./codegen/host/src/classify_lib\d+\.c", name)
+ ]
+ assert len(c_source_files) > 0
+
+ # check that "default" doesn't occur in any of the C source files
+ # check that function names are of the form "tvmgen_classify_*"
+ for file_name in c_source_files:
+ with mlf_package.extractfile(file_name) as f:
+ content = f.read()
+ assert b"default" not in content
+ assert b"tvmgen_classify_" in content
+
+ # check that tvmgen_classify_run() function exists
+ with mlf_package.extractfile("./codegen/host/src/classify_lib0.c") as f:
+ content = f.read()
+ assert b"tvmgen_classify_run(" in content
+
+ # check that CMSIS-NN function names are of the form "tvmgen_classify_cmsis_nn_main_*"
+ with mlf_package.extractfile("./codegen/host/src/classify_lib2.c") as f:
+ content = f.read()
+ assert b"tvmgen_classify_cmsis_nn_main_" in content
+
+
+def test_compile_tflite_module_with_mod_name_and_ethosu(
+ tmpdir_factory, tflite_mobilenet_v1_1_quant
+):
+ pytest.importorskip("tflite")
+ pytest.importorskip("ethosu.vela")
+ ACCEL_TYPES = ["ethos-u55-256", "ethos-u55-128", "ethos-u55-64", "ethos-u55-32"]
+
+ output_dir = tmpdir_factory.mktemp("mlf")
+
+ tvmc_model = tvmc.load(tflite_mobilenet_v1_1_quant)
+
+ for accel_type in ACCEL_TYPES:
+ output_file_name = f"{output_dir}/file_{accel_type}.tar"
+
+ tvmc.compiler.compile_model(
+ tvmc_model,
+ target=f"ethos-u -accelerator_config={accel_type}, c -mcpu=cortex-m55",
+ runtime=Runtime("crt"),
+ executor=Executor("aot", {"unpacked-api": True}),
+ output_format="mlf",
+ package_path=output_file_name,
+ pass_context_configs=["tir.disable_vectorize=true"],
+ mod_name="classify",
+ )
+
+ # check that an MLF package was created
+ assert os.path.exists(output_file_name)
+
+ with tarfile.open(output_file_name) as mlf_package:
Review Comment:
Yeah I agree, the accelerator is just a name string in the compilation infra, so there's not much to gain from testing each one of them...
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org