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/12 15:34:17 UTC
[GitHub] [tvm] ekalda commented on a diff in pull request #10962: [TVMC] Allow output module name to be passed as a command line argument
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