Skip to content

fix: move VitisAI EP to last in ordering and fit catalog table width #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DingmaomaoBJTU merged 2 commits into from
May 27, 2026
Merged

fix: move VitisAI EP to last in ordering and fit catalog table width #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f11b74
fix: move VitisAI EP to last in ordering and fit catalog table to con…
DingmaomaoBJTU May 27, 2026
6c0e369
fix: update test_selection_matrix expected order for VitisAI move
DingmaomaoBJTU May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/winml/modelkit/commands/catalog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,14 @@ def _build_list_renderable(
header_style="bold",
padding=(0, 2),
show_edge=False,
expand=True,
expand=False,
)
table.add_column("Model", ratio=4, overflow="fold")
table.add_column("Task", ratio=2, overflow="fold")
table.add_column("Model", overflow="fold")
table.add_column("Task", overflow="fold")
table.add_column("Size", no_wrap=True, justify="right", width=5)
table.add_column("Model Type", ratio=1, overflow="fold")
table.add_column("Model Type", overflow="fold")
if ep_col_header is not None:
table.add_column(ep_col_header, ratio=2, overflow="fold")
table.add_column(ep_col_header, overflow="fold")

for m in models:
color = _type_color(m["model_type"])
Expand All @@ -302,6 +302,7 @@ def _build_list_renderable(
f"[bold cyan]{len(models)}[/bold cyan] validated model(s)",
border_style="blue",
padding=(0, 1),
expand=False,
)
return Group(panel)

Expand Down
7 changes: 4 additions & 3 deletions src/winml/modelkit/utils/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,17 +173,18 @@ def extract_ep_options(kwargs: dict) -> dict[str, str]:
#
# Iteration order also feeds ``sysinfo.device._DEVICE_EP_MAP`` (and therefore
# ``resolve_eps``): the per-device priority is **IHV-first, native-last**
# (Nvidia -> AMD -> Qualcomm -> Intel -> Microsoft -> CPU), so the keys are
# listed in that order rather than alphabetically.
# (Nvidia -> AMD -> Qualcomm -> Intel -> Microsoft -> CPU -> Vitis), so the
# keys are listed in that order rather than alphabetically.
# VitisAI is placed last because it is not yet fully supported.
EP_SUPPORTED_DEVICES: dict[EPName, tuple[str, ...]] = {
"NvTensorRTRTXExecutionProvider": ("gpu",),
"CUDAExecutionProvider": ("gpu",),
"MIGraphXExecutionProvider": ("gpu",),
"VitisAIExecutionProvider": ("npu",),
"QNNExecutionProvider": ("npu", "gpu"),
"OpenVINOExecutionProvider": ("npu", "gpu", "cpu"),
"DmlExecutionProvider": ("gpu",),
"CPUExecutionProvider": ("cpu",),
"VitisAIExecutionProvider": ("npu",),
}

# Device string to ORT device type mapping
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/analyze/test_static_analyzer_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,14 +1059,14 @@ class TestAnalyzeEPDeviceSelectionMatrix:
("NvTensorRTRTXExecutionProvider", "GPU"),
("CUDAExecutionProvider", "GPU"),
("MIGraphXExecutionProvider", "GPU"),
("VitisAIExecutionProvider", "NPU"),
("QNNExecutionProvider", "NPU"),
("QNNExecutionProvider", "GPU"),
("OpenVINOExecutionProvider", "NPU"),
("OpenVINOExecutionProvider", "GPU"),
("OpenVINOExecutionProvider", "CPU"),
("DmlExecutionProvider", "GPU"),
("CPUExecutionProvider", "CPU"),
("VitisAIExecutionProvider", "NPU"),
],
None,
),
Expand Down
Loading