Skip to content

[TVMC] Allow output module name to be passed as a command line argument - #10962

Merged
masahi merged 1 commit into
apache:mainfrom
grant-arm:tvmc_module_name_arg
Apr 13, 2022
Merged

[TVMC] Allow output module name to be passed as a command line argument#10962
masahi merged 1 commit into
apache:mainfrom
grant-arm:tvmc_module_name_arg

Conversation

@grant-arm

@grant-armgrant-arm commented Apr 11, 2022•
edited by github-actions Bot
Loading

Copy link
Copy Markdown
Contributor

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 named 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

cc @gromero

areusch
areusch reviewed Apr 11, 2022
View reviewed changes

@areuschareusch left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@grant-arm thanks for this PR, looks great! a few minor comments, could be swayed either way on them (don't take my review as blocking)

Comment threadpython/tvm/driver/tvmc/compiler.py
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",

@areuschareuschApr 11, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps "default" should be a constant somewhere?

@grant-armgrant-armApr 12, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @areusch , I agree it would be good to have "default" as a constant.
It feels like this should be a separate PR though.

Comment threadtests/python/driver/tvmc/test_compiler.py Outdated
gromero
gromero approved these changes Apr 11, 2022
View reviewed changes

@gromerogromero left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@grant-arm LGTM! Thanks for cc:ing me, I just learned about the different ACCEL_TYPES :)

NicolaLancellotti
NicolaLancellotti approved these changes Apr 12, 2022
View reviewed changes

@NicolaLancellottiNicolaLancellotti left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

leandron
leandron reviewed Apr 12, 2022
View reviewed changes
Comment threadpython/tvm/driver/tvmc/compiler.py Outdated
@grant-arm
grant-armforce-pushed the tvmc_module_name_arg branch from 681770c to b6435f1CompareApril 12, 2022 13:47
ekalda
ekalda reviewed Apr 12, 2022
View reviewed changes

@ekaldaekalda left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! :) Got a question about a test...

Comment threadpython/tvm/relay/op/contrib/ethosu.py Outdated
Comment threadtests/python/driver/tvmc/test_compiler.py Outdated
@grant-arm
[TVMC] Allow output module name to be passed as a command line argument
061f1ea
 * Allows module-name as a command line argument to tvmc
* Updates microNPU graph partitioner to pass module name to PartitionGraph()
* Updates CMSIS-NN graph partitioner to pass module name to PartitionGraph()
Change-Id: I12a4a2eef2ddc7e3c4a6c0dd8fdcab009c975bac
@grant-arm
grant-armforce-pushed the tvmc_module_name_arg branch from b6435f1 to 061f1eaCompareApril 12, 2022 15:53
@masahi
masahi merged commit 5cfb4bc into apache:mainApr 13, 2022
AndrewZhaoLuo added a commit to AndrewZhaoLuo/tvm that referenced this pull request Apr 15, 2022
@AndrewZhaoLuo
Merge branch 'main' into aluo/fix-qlinearconv-grouped
ce8bec3
* main: (527 commits)
[hexagon] 'add_hvx' test to explore HVX usage. (apache#10604)
[COMMUNITY] @yzh119 -> Reviewer (apache#10993)
[Metaschedule] Make custom schedule_rule registration optional (apache#10975)
[ONNX] Add imports for BERT contrib operators (apache#10949)
sort axes (apache#10985)
[Hexagon] Remove HexagonBuffer external constructor and support (apache#10978)
[CI] Update GPU image (apache#10992)
[Runtime][Vulkan] Add RGP support to TVM for vulkan device (apache#10953)
[FIX] resolve int64/32 for AttrStmtNode (apache#10983)
[TVMC] Allow output module name to be passed as a command line argument (apache#10962)
[ONNX] Add MatMulInteger importer (apache#10450)
[COMMUNITY] @guberti -> Reviewer (apache#10976)
Support `qnn.conv2d` in FoldExplicitPading (apache#10982)
change Hexagon docker version (apache#10981)
remove exception handling of autotvm xgboost extract functions (apache#10948)
[CUDNN] Add partitioning support for conv2d and log_softmax (apache#10961)
[Hexagon][LLVM] Enable/test tensorized Hexagon DMA on 2d transformed layout (apache#10905)
[Hexagon] Move aot/graph_executor interactions into launcher (apache#10907)
[HEXAGON] Split huge 1D DMA Transfers into smaller transfers with legal sizes. (apache#10971)
[CI][DOCKER] Add pytest-lazy-fixture to images (apache#10970)
...
altanh pushed a commit to altanh/tvm that referenced this pull request Apr 28, 2022
@grant-arm@altanh
[TVMC] Allow output module name to be passed as a command line argume…
9d3db9a
…nt (apache#10962)
* Allows module-name as a command line argument to tvmc
* Updates microNPU graph partitioner to pass module name to PartitionGraph()
* Updates CMSIS-NN graph partitioner to pass module name to PartitionGraph()
Change-Id: I12a4a2eef2ddc7e3c4a6c0dd8fdcab009c975bac
@driazatidriazati mentioned this pull request Jul 14, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leandronleandronleandron left review comments
@areuschareuschareusch left review comments
@ekaldaekaldaekalda left review comments
@gromerogromerogromero approved these changes
@NicolaLancellottiNicolaLancellottiNicolaLancellotti approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@grant-arm@leandron@areusch@gromero@NicolaLancellotti@ekalda@masahi