From c027787fa9f3c34c24482d056560213be9389a3d Mon Sep 17 00:00:00 2001 From: Copilot <223556219+Copilot@users.noreply.github.com> Date: Mon, 13 Apr 2026 16:04:35 +0800 Subject: [PATCH] Use model variant selection instead of hardcoded SqueezeNet.onnx UI samples were bypassing the shared FP32/Default model selection logic. Fixes ADO #61791040 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- Samples/WindowsML/cs-winforms/MainForm.cs | 5 ++++- Samples/WindowsML/cs-winui/MainWindow.xaml.cs | 5 ++++- Samples/WindowsML/cs-wpf/MainWindow.xaml.cs | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Samples/WindowsML/cs-winforms/MainForm.cs b/Samples/WindowsML/cs-winforms/MainForm.cs index d51c35ad2..a61974866 100644 --- a/Samples/WindowsML/cs-winforms/MainForm.cs +++ b/Samples/WindowsML/cs-winforms/MainForm.cs @@ -126,7 +126,10 @@ private async Task LoadModelAndLabelsAsync() var options = new Options { - ModelPath = "SqueezeNet.onnx", + // Empty ModelPath lets ModelManager.DetermineModelVariant() pick + // FP32 (GPU) or Default/quantized (CPU/NPU) based on the selected EP. + // Hardcoding a filename would bypass that auto-selection. + ModelPath = string.Empty, EpName = epCombo.SelectedItem!.ToString(), DeviceType = deviceCombo.Enabled ? deviceCombo.SelectedItem?.ToString() : null, PerfMode = GetSelectedPerformanceMode() diff --git a/Samples/WindowsML/cs-winui/MainWindow.xaml.cs b/Samples/WindowsML/cs-winui/MainWindow.xaml.cs index d3abb598e..4e0a6aa19 100644 --- a/Samples/WindowsML/cs-winui/MainWindow.xaml.cs +++ b/Samples/WindowsML/cs-winui/MainWindow.xaml.cs @@ -118,7 +118,10 @@ private async Task LoadModelAsync() var options = new Options { - ModelPath = "SqueezeNet.onnx", + // Empty ModelPath lets ModelManager.DetermineModelVariant() pick + // FP32 (GPU) or Default/quantized (CPU/NPU) based on the selected EP. + // Hardcoding a filename would bypass that auto-selection. + ModelPath = string.Empty, EpName = selectedEp, DeviceType = selectedDeviceType, PerfMode = GetSelectedPerformanceMode() diff --git a/Samples/WindowsML/cs-wpf/MainWindow.xaml.cs b/Samples/WindowsML/cs-wpf/MainWindow.xaml.cs index dbd720ef1..dbc9be8ac 100644 --- a/Samples/WindowsML/cs-wpf/MainWindow.xaml.cs +++ b/Samples/WindowsML/cs-wpf/MainWindow.xaml.cs @@ -131,7 +131,10 @@ private async Task LoadModelAndLabelsAsync() var options = new Options { - ModelPath = "SqueezeNet.onnx", + // Empty ModelPath lets ModelManager.DetermineModelVariant() pick + // FP32 (GPU) or Default/quantized (CPU/NPU) based on the selected EP. + // Hardcoding a filename would bypass that auto-selection. + ModelPath = string.Empty, EpName = EpCombo.SelectedItem?.ToString(), DeviceType = (DeviceCombo.IsEnabled ? DeviceCombo.SelectedItem?.ToString() : null), PerfMode = GetSelectedPerformanceMode()