You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by tq...@apache.org on 2026/10/15 14:14:15 UTC
(tvm) 10/33: [FIX][Tests] Keep mixed printer coverage with parent dialect registration
This is an automated email from the ASF dual-hosted git repository.
tqchen pushed a commit to branch tirx/standalone-package-cleanup
in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 6c977552d07772d3c1bbd02f1198222182fd1d43
Author: Tianqi Chen <tq...@users.noreply.github.com>
AuthorDate: Thu Oct 15 01:48:50 2026 +0000
[FIX][Tests] Keep mixed printer coverage with parent dialect registration
---
.../python/relax/script/test_relax_script_printer.py | 20 +++++++++++---------
.../s_tir/script/test_s_tir_script_namespace.py | 16 ++++++++++------
.../python/script/test_script_printer_entry.py | 1 +
3 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/tests/python/relax/script/test_relax_script_printer.py b/tests/python/relax/script/test_relax_script_printer.py
index d6abc532ed..b86bdfed89 100644
--- a/tests/python/relax/script/test_relax_script_printer.py
+++ b/tests/python/relax/script/test_relax_script_printer.py
@@ -22,18 +22,19 @@ from __future__ import annotations
import pytest
from tvm_ffi.access_path import AccessPath
-import tvm, tvm_tirx
-import tvm_tirx.testing, tvm
-from tvm_tirx import IRModule, tirx
+import tvm
+import tvm_tirx
+import tvm_tirx.testing
from tvm import relax
-from tvm_tirx.ir import Range
-from tvm_tirx.ir import TupleType as _TupleType
from tvm.relax import ExternFunc as _ExternFunc
from tvm.relax import TensorType
-from tvm.relax.distributed import DeviceMesh, DTensorType, Placement
-from tvm_tirx.script import ir as I
from tvm.relax import script as R
+from tvm.relax.distributed import DeviceMesh, DTensorType, Placement
from tvm.s_tir import script as Ts
+from tvm_tirx import IRModule, tirx
+from tvm_tirx.ir import Range
+from tvm_tirx.ir import TupleType as _TupleType
+from tvm_tirx.script import ir as I
from tvm_tirx.script import tirx as T
from tvm_tirx.script.printer.scriptable import PrinterConfig, _script
@@ -434,11 +435,12 @@ class Module:
z: R.Tensor((), dtype="int32") = T.Call(nested, [x], ty=R.Tensor((), dtype="int32"))
return z
""".replace("R.", f"{relax_prefix}.")
- .replace("relax as R", f"relax as {relax_prefix}")
+ .replace("script as R", f"script as {relax_prefix}")
.replace("# from", "# from" if comment_imports else "from"),
)
tvm_tirx.ir.assert_structural_equal(
- NestedFunction, tvm_tirx.script.from_source(script, extra_vars={"I": I, "T": T, relax_prefix: R})
+ NestedFunction,
+ tvm_tirx.script.from_source(script, extra_vars={"I": I, "T": T, relax_prefix: R}),
)
diff --git a/tests/python/s_tir/script/test_s_tir_script_namespace.py b/tests/python/s_tir/script/test_s_tir_script_namespace.py
index 4dbd103c38..0321738ee2 100644
--- a/tests/python/s_tir/script/test_s_tir_script_namespace.py
+++ b/tests/python/s_tir/script/test_s_tir_script_namespace.py
@@ -23,10 +23,11 @@ import sys
import numpy as np
import pytest
-import tvm, tvm_tirx
-import tvm_tirx.testing, tvm
-from tvm_tirx.script import ir as I
+import tvm
+import tvm_tirx
+import tvm_tirx.testing
from tvm.s_tir import script as Ts
+from tvm_tirx.script import ir as I
from tvm_tirx.script import tirx as T
@@ -82,7 +83,8 @@ def test_mixed_module_roundtrip():
tvm_tirx.ir.assert_structural_equal(
Mixed,
tvm_tirx.script.from_source(
- script, extra_vars={"I": tvm_tirx.script.ir, "T": tvm_tirx.script.tirx, "Ts": tvm.s_tir.script}
+ script,
+ extra_vars={"I": tvm_tirx.script.ir, "T": tvm_tirx.script.tirx, "Ts": tvm.s_tir.script},
),
)
direct_script = Mixed["direct"].script()
@@ -223,15 +225,17 @@ def test_s_tir_options_and_helpers():
"tvm_tirx.tirx.script",
"tvm_tirx.script.parser",
"tvm.s_tir.script.ir_builder.frame",
- "tvm.s_tir.script.ir_builder",
+ "tvm_tirx.script.ir_builder.s_tir.frame",
],
)
def test_import_order(first):
+ # Parent initialization registers its deep builder alias with the shared core.
+ setup = "import tvm\n" if first == "tvm_tirx.script.ir_builder.s_tir.frame" else ""
subprocess.run(
[
sys.executable,
"-c",
- f"import {first}\n"
+ setup + f"import {first}\n"
"import tvm.s_tir.script as direct\n"
"from tvm.s_tir import script as Ts\nfrom tvm_tirx.script import tirx as T\n"
"from tvm_tirx.script.parser import s_tir as parser\n"
diff --git a/tirx/tests/python/script/test_script_printer_entry.py b/tests/python/script/test_script_printer_entry.py
similarity index 98%
rename from tirx/tests/python/script/test_script_printer_entry.py
rename to tests/python/script/test_script_printer_entry.py
index 81dc89d288..6d33e91767 100644
--- a/tirx/tests/python/script/test_script_printer_entry.py
+++ b/tests/python/script/test_script_printer_entry.py
@@ -22,6 +22,7 @@ import pytest
import tvm_ffi
from tvm_ffi.access_path import AccessPath
+import tvm # noqa: F401 # Register the parent Relax printer.
import tvm_tirx
from tvm_tirx.script.printer.scriptable import PrinterConfig, _script