Add logging to DeviceService

Author: saddam213

OnnxStack.UI/Dialogs/UpdateModelDialog.xaml

@@ -146,7 +146,7 @@
 
                                         <!--Override Defaults-->
                                         <UniformGrid Grid.Column="0" Columns="4" Visibility="{Binding IsOverrideEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,5,0,10">
-                                            <StackPanel  Margin="0,0,4,0">
+                                            <StackPanel Margin="0,0,4,0">
                                                 <TextBlock Text="Device" />
                                                 <userControls:DevicePickerControl 
                                                     UISettings="{Binding UISettings, ElementName=UI}"

OnnxStack.UI/Models/DeviceInfo.cs

@@ -1,4 +1,16 @@
 namespace OnnxStack.UI.Models
 {
-    public record DeviceInfo(string Name, int DeviceId, int VRAM);
+    public class DeviceInfo
+    {
+        public DeviceInfo(string name, int deviceId, int vram)
+        {
+            Name = name;
+            DeviceId = deviceId;
+            VRAM = vram;
+        }
+
+        public string Name { get; set; }
+        public int DeviceId { get; set; }
+        public int VRAM { get; set; }
+    }
 }

OnnxStack.UI/Services/DeviceService.cs

@@ -1,4 +1,5 @@
-using OnnxStack.UI.Models;
+using Microsoft.Extensions.Logging;
+using OnnxStack.UI.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,39 +10,64 @@ namespace OnnxStack.UI.Services
 {
     public class DeviceService : IDeviceService
     {
+        private readonly ILogger<DeviceService> _logger;
         private IReadOnlyList<DeviceInfo> _devices;
 
-        public DeviceService()
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeviceService"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        public DeviceService(ILogger<DeviceService> logger)
         {
+            _logger = logger;
             _devices = GetDevices();
         }
 
+        /// <summary>
+        /// Gets the devices.
+        /// </summary>
         public IReadOnlyList<DeviceInfo> Devices => _devices;
 
-        private static IReadOnlyList<DeviceInfo> GetDevices()
+
+        /// <summary>
+        /// Gets the devices.
+        /// </summary>
+        /// <returns></returns>
+        private IReadOnlyList<DeviceInfo> GetDevices()
         {
-            var devices = new List<DeviceInfo> { new DeviceInfo("CPU", -1, 0) };
+            _logger.LogInformation("[GetDevices] - Query Devices...");
+            var devices = new List<DeviceInfo> { new DeviceInfo("CPU", 0, 0) };
 
             try
             {
                 var adapters = new AdapterInfo[10];
                 AdapterInterop.GetAdapters(adapters);
                 devices.AddRange(adapters
-                    .Where(x => x.DeviceId > 0)
+                    .Where(x => x.DedicatedVideoMemory > 0)
                     .Select(GetDeviceInfo)
                     .ToList());
+                devices.ForEach(x => _logger.LogInformation($"[GetDevices] - Found Device: {x.Name}, DeviceId: {x.DeviceId}"));
             }
             catch (Exception ex)
             {
                 devices.Add(new DeviceInfo("GPU0", 0, 0));
                 devices.Add(new DeviceInfo("GPU1", 1, 0));
+                _logger.LogError($"[GetDevices] - Failed to query devices, {ex.Message}");
             }
+
+            _logger.LogInformation($"[GetDevices] - Query devices complete, Devices Found: {devices.Count}");
             return devices;
         }
 
+
+        /// <summary>
+        /// Gets the device information.
+        /// </summary>
+        /// <param name="adapter">The adapter.</param>
+        /// <returns></returns>
         private static DeviceInfo GetDeviceInfo(AdapterInfo adapter)
         {
-            string description = string.Empty;
+            string description;
             unsafe
             {
                 description = new string(adapter.Description);

OnnxStack.UI/UserControls/DevicePickerControl.xaml.cs

@@ -18,6 +18,9 @@ public partial class DevicePickerControl : UserControl, INotifyPropertyChanged
         private readonly IDeviceService _deviceService;
         private DeviceInfo _selectedDevice;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DevicePickerControl"/> class.
+        /// </summary>
         public DevicePickerControl()
         {
             if (!DesignerProperties.GetIsInDesignMode(this))
@@ -27,26 +30,30 @@ public DevicePickerControl()
         }
 
         public static readonly DependencyProperty UISettingsProperty =
-         DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(DevicePickerControl), new PropertyMetadata((c, e) =>
-         {
-             if (c is DevicePickerControl control)
-                 control.OnSettingsChanged();
-         }));
+             DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(DevicePickerControl), new PropertyMetadata((c, e) =>
+             {
+                 if (c is DevicePickerControl control)
+                     control.OnSettingsChanged();
+             }));
 
         public static readonly DependencyProperty ExecutionProviderProperty =
-            DependencyProperty.Register("ExecutionProvider", typeof(ExecutionProvider), typeof(DevicePickerControl), new PropertyMetadata((c, e) =>
+            DependencyProperty.Register("ExecutionProvider", typeof(ExecutionProvider?), typeof(DevicePickerControl), new PropertyMetadata((c, e) =>
             {
                 if (c is DevicePickerControl control)
                     control.OnSettingsChanged();
             }));
 
         public static readonly DependencyProperty DeviceIdProperty =
-            DependencyProperty.Register("DeviceId", typeof(int), typeof(DevicePickerControl), new PropertyMetadata((c, e) =>
+            DependencyProperty.Register("DeviceId", typeof(int?), typeof(DevicePickerControl), new PropertyMetadata((c, e) =>
             {
                 if (c is DevicePickerControl control)
                     control.OnSettingsChanged();
             }));
 
+
+        /// <summary>
+        /// Gets or sets the UI settings.
+        /// </summary>
         public OnnxStackUIConfig UISettings
         {
             get { return (OnnxStackUIConfig)GetValue(UISettingsProperty); }
@@ -56,45 +63,60 @@ public OnnxStackUIConfig UISettings
         /// <summary>
         /// Gets or sets the ExecutionProvider.
         /// </summary>
-        public ExecutionProvider ExecutionProvider
+        public ExecutionProvider? ExecutionProvider
         {
-            get { return (ExecutionProvider)GetValue(ExecutionProviderProperty); }
+            get { return (ExecutionProvider?)GetValue(ExecutionProviderProperty); }
             set { SetValue(ExecutionProviderProperty, value); }
         }
 
         /// <summary>
         /// Gets or sets the DeviceId.
         /// </summary>
-        public int DeviceId
+        public int? DeviceId
         {
-            get { return (int)GetValue(DeviceIdProperty); }
+            get { return (int?)GetValue(DeviceIdProperty); }
             set { SetValue(DeviceIdProperty, value); }
         }
 
-
+        /// <summary>
+        /// Gets the devices.
+        /// </summary>
         public IReadOnlyList<DeviceInfo> Devices => _deviceService.Devices;
 
 
-
+        /// <summary>
+        /// Gets or sets the selected device.
+        /// </summary>
         public DeviceInfo SelectedDevice
         {
             get { return _selectedDevice; }
             set { _selectedDevice = value; OnSelectedDeviceChanged(); }
         }
 
+
+        /// <summary>
+        /// Called when UISettings changed.
+        /// </summary>
         private void OnSettingsChanged()
         {
-            SelectedDevice = ExecutionProvider == ExecutionProvider.Cpu
+            SelectedDevice = ExecutionProvider == Core.Config.ExecutionProvider.Cpu
                ? Devices.FirstOrDefault()
-               : Devices.FirstOrDefault(x => x.DeviceId == DeviceId);
+               : Devices.FirstOrDefault(x => x.Name != "CPU" && x.DeviceId == DeviceId);
         }
 
+
+        /// <summary>
+        /// Called when SelectedDevice changed.
+        /// </summary>
         private void OnSelectedDeviceChanged()
         {
+            if (_selectedDevice is null)
+                return;
+
             if (_selectedDevice.Name == "CPU")
             {
                 DeviceId = 0;
-                ExecutionProvider = ExecutionProvider.Cpu;
+                ExecutionProvider = Core.Config.ExecutionProvider.Cpu;
             }
             else
             {
@@ -114,6 +136,4 @@ public void NotifyPropertyChanged([CallerMemberName] string property = "")
         }
         #endregion
     }
-
-
 }