This is an automated email from the ASF dual-hosted git repository.
tqchen 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 e41454debc [Tests][Hexagon] Lazily import pytest plugin dependencies
(#19726)
e41454debc is described below
commit e41454debc7dd9fe1ae3d8f2d5ec2d062d1d7055
Author: Shushi Hong <[email protected]>
AuthorDate: Wed Jun 10 20:14:59 2026 -0400
[Tests][Hexagon] Lazily import pytest plugin dependencies (#19726)
This pr makes the Hexagon pytest plugin avoid importing Hexagon
build/session machinery at module import time.
This keeps pytest collection lightweight and avoids collection-time
failures from Hexagon-specific runtime/session imports when running
source-tree tests against a TVM wheel or an environment that does not
need to execute Hexagon tests.
---
python/tvm/contrib/hexagon/pytest_plugin.py | 33 ++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/python/tvm/contrib/hexagon/pytest_plugin.py
b/python/tvm/contrib/hexagon/pytest_plugin.py
index 4419ed4494..809300ea2f 100644
--- a/python/tvm/contrib/hexagon/pytest_plugin.py
+++ b/python/tvm/contrib/hexagon/pytest_plugin.py
@@ -19,17 +19,22 @@
"""Hexagon testing fixtures used to deduce testing argument
values from testing parameters"""
+from __future__ import annotations
+
import os
import random
+import socket
+from typing import TYPE_CHECKING
import pytest
import tvm
import tvm.rpc
import tvm.testing
-from tvm.contrib.hexagon.build import HexagonLauncher, HexagonLauncherRPC
-from tvm.contrib.hexagon.session import Session
-from tvm.contrib.hexagon.tools import HEXAGON_SIMULATOR_NAME
+
+if TYPE_CHECKING:
+ from tvm.contrib.hexagon.build import HexagonLauncherRPC
+ from tvm.contrib.hexagon.session import Session
HEXAGON_TOOLCHAIN = "HEXAGON_TOOLCHAIN"
TVM_TRACKER_HOST = "TVM_TRACKER_HOST"
@@ -37,6 +42,7 @@ TVM_TRACKER_PORT = "TVM_TRACKER_PORT"
ANDROID_REMOTE_DIR = "ANDROID_REMOTE_DIR"
ANDROID_SERIAL_NUMBER = "ANDROID_SERIAL_NUMBER"
ADB_SERVER_SOCKET = "ADB_SERVER_SOCKET"
+HEXAGON_SIMULATOR_NAME = "simulator"
RNG_SEEDED = False
HEXAGON_AOT_LLVM_TARGET = {
@@ -106,13 +112,18 @@ def get_free_port() -> int:
if port > LISTEN_PORT_MAX:
port = LISTEN_PORT_MIN
- while tvm.contrib.hexagon.build._is_port_in_use(port):
+ while _is_port_in_use(port):
port = port + 1 if port < LISTEN_PORT_MAX else LISTEN_PORT_MIN
PREVIOUS_PORT = port
return port
+def _is_port_in_use(port: int) -> bool:
+ with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+ return sock.connect_ex(("localhost", port)) == 0
+
+
@pytest.fixture(scope="session")
def _tracker_info() -> str | int:
env_tracker_host = os.getenv(TVM_TRACKER_HOST, default="")
@@ -198,6 +209,8 @@ def hexagon_server_process(
if android_serial_num == [HEXAGON_SIMULATOR_NAME]:
yield None
else:
+ from tvm.contrib.hexagon.build import HexagonLauncher
+
# Requesting these fixtures sets up a local tracker, if one
# hasn't been provided to us. Delaying the evaluation of
# these fixtures avoids starting a tracker unless necessary.
@@ -271,6 +284,9 @@ def hexagon_launcher(
"rpc_server_port": rpc_server_port,
"adb_server_socket": adb_server_socket,
}
+ from tvm.contrib.hexagon.build import HexagonLauncher
+
+ launcher = None
try:
if android_serial_num == [HEXAGON_SIMULATOR_NAME]:
launcher = HexagonLauncher(serial_number=android_serial_num[0],
rpc_info=rpc_info)
@@ -285,10 +301,11 @@ def hexagon_launcher(
)
yield launcher
finally:
- if android_serial_num == [HEXAGON_SIMULATOR_NAME]:
- launcher.stop_server()
- elif not hexagon_debug:
- launcher.cleanup_directory()
+ if launcher is not None:
+ if android_serial_num == [HEXAGON_SIMULATOR_NAME]:
+ launcher.stop_server()
+ elif not hexagon_debug:
+ launcher.cleanup_directory()
@pytest.fixture
