This is an automated email from the ASF dual-hosted git repository.
cbalint13 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git
The following commit(s) were added to refs/heads/main by this push:
new 51d7c5e47a [Hexagon] Support RPC execution of existing shared lib
(#17162)
51d7c5e47a is described below
commit 51d7c5e47a108b7d03036e6a1045aa8348f9562c
Author: Anirudh Sundar Subramaniam <[email protected]>
AuthorDate: Wed Jul 17 01:52:00 2024 +0530
[Hexagon] Support RPC execution of existing shared lib (#17162)
This patch modifies the `get_executor_from_factory` for relax to support
accepting a string that points to an already exported shared library.
This allows us to run models that were already compiled through the RPC
executor.
---
python/tvm/contrib/hexagon/session.py | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/python/tvm/contrib/hexagon/session.py
b/python/tvm/contrib/hexagon/session.py
index 9f11668234..50064e42ba 100644
--- a/python/tvm/contrib/hexagon/session.py
+++ b/python/tvm/contrib/hexagon/session.py
@@ -287,14 +287,14 @@ class Session:
)
def get_executor_from_factory(
- self, module: Union[ExecutorFactoryModule, relax.Executable],
hexagon_arch: str = "v68"
+ self, module: Union[ExecutorFactoryModule, relax.Executable, str],
hexagon_arch: str = "v68"
):
"""Create a local GraphModule which consumes a remote libmod.
Parameters
----------
- module : Union[ExecutorFactoryModule, relax.Executable]
+ module : Union[ExecutorFactoryModule, relax.Executable, str]
The module to upload to the remote
session and load.
@@ -305,7 +305,7 @@ class Session:
return self._aot_executor_from_factory(module)
if isinstance(module, GraphExecutorFactoryModule):
return self._graph_executor_from_factory(module)
- if isinstance(module, relax.Executable):
+ if isinstance(module, (relax.Executable, str)):
return self._relax_vm_executable_executor(module,
hexagon_arch=hexagon_arch)
raise TypeError(f"Unsupported executor type: {type(module)}")
@@ -358,7 +358,9 @@ class Session:
"""
return self.get_graph_executor(module.get_graph_json(),
module.get_lib())
- def _relax_vm_executable_executor(self, vm_exec: relax.Executable,
hexagon_arch: str):
+ def _relax_vm_executable_executor(
+ self, vm_exec: Union[relax.Executable, str], hexagon_arch: str
+ ):
"""Create a local TVM module which consumes a remote vm executable.
Paramters
@@ -366,7 +368,7 @@ class Session:
vm_exec : relax.Executable
The Relax VM Executable to upload to the remote and load. This
will typically be the
- output of `relax.build`.
+ output of `relax.build` or the path to an already built and
exported shared library
hexagon_arch : str
The hexagon arch to be used
Returns
@@ -376,14 +378,21 @@ class Session:
"""
assert self._rpc is not None, "Hexagon session must be started using
__enter__ prior to use"
- temp_dir = utils.tempdir()
- path_exec = temp_dir.relpath("exec.so")
+ if isinstance(vm_exec, relax.Executable):
+ temp_dir = utils.tempdir()
+ path_exec = temp_dir.relpath("exec.so")
- vm_exec.mod.export_library(
- path_exec,
- fcompile=hexagon.create_aot_shared,
- hexagon_arch=hexagon_arch,
- )
+ vm_exec.mod.export_library(
+ path_exec,
+ fcompile=hexagon.create_aot_shared,
+ hexagon_arch=hexagon_arch,
+ )
+
+ path = self.upload(path_exec, "exec.so")
+ elif isinstance(vm_exec, str):
+ path_exec = vm_exec
+ else:
+ raise TypeError(f"Unsupported executor type: {type(vm_exec)}")
path = self.upload(path_exec, "exec.so")
return self._rpc.get_function("tvm.hexagon.load_module")(str(path))
