Refactor device providers

Author: saddam213

TensorStack.Audio.Windows/AudioManager.cs

@@ -25,7 +25,7 @@ public static class AudioManager
         /// <param name="ffmpegPath">The ffmpeg path.</param>
         /// <param name="ffprobePath">The ffprobe path.</param>
         /// <param name="directoryTemp">The directory temporary.</param>
-        public static void Configure(string ffmpegPath, string ffprobePath, string directoryTemp)
+        public static void Initialize(string ffmpegPath, string ffprobePath, string directoryTemp)
         {
             FFMpegPath = ffmpegPath;
             FFProbePath = ffprobePath;

TensorStack.Provider/Device.cs renamed to TensorStack.Common/Device.cs

@@ -1,14 +1,15 @@
-namespace TensorStack.Providers
+// Copyright (c) TensorStack. All rights reserved.
+// Licensed under the Apache 2.0 License.
+namespace TensorStack.Common
 {
     public record Device
     {
-        public int DeviceId => PerformanceIndex; // TODO:
+        public int Id { get; init; }
+        public int DeviceId { get; init; }
         public string Name { get; init; }
         public DeviceType Type { get; init; }
         public int Memory { get; init; }
-        public int MemoryGB => Memory / 1000;
-        public int AdapterIndex { get; init; }
-        public int PerformanceIndex { get; init; }
+        public int MemoryGB => Memory / 1024;
 
         public int HardwareID { get; init; }
         public int HardwareLUID { get; init; }

TensorStack.Provider/Devices.cs renamed to TensorStack.Common/DeviceManager.cs

@@ -1,19 +1,23 @@
-using Microsoft.ML.OnnxRuntime;
+// Copyright (c) TensorStack. All rights reserved.
+// Licensed under the Apache 2.0 License.
+using Microsoft.ML.OnnxRuntime;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace TensorStack.Providers
+namespace TensorStack.Common
 {
-    public static class Devices
+    public static class DeviceManager
     {
         private static OrtEnv _environment;
         private static EnvironmentCreationOptions _environmentOptions;
+        private static IReadOnlyList<Device> _devices;
+        private static string _deviceProvider;
 
         /// <summary>
         /// Initializes this instance.
         /// </summary>
-        public static void Initialize()
+        public static void Initialize(string executionProvider, string libraryPath = default)
         {
             Initialize(new EnvironmentCreationOptions
             {
@@ -24,50 +28,52 @@ public static void Initialize()
                     GlobalInterOpNumThreads = 1,
                     GlobalIntraOpNumThreads = 1
                 }
-            });
+            }, executionProvider, libraryPath);
         }
 
 
         /// <summary>
         /// Initializes the specified environment options.
         /// </summary>
         /// <param name="environmentOptions">The environment options.</param>
-        public static void Initialize(EnvironmentCreationOptions environmentOptions)
+        public static void Initialize(EnvironmentCreationOptions environmentOptions, string executionProvider, string libraryPath = default)
         {
+            if (_environment is not null)
+                throw new Exception("Environment is already initialized.");
+
+            _deviceProvider = executionProvider;
             _environmentOptions = environmentOptions;
             _environment = OrtEnv.CreateInstanceWithOptions(ref _environmentOptions);
-        }
-
-
-        /// <summary>
-        /// Gets the devices.
-        /// </summary>
-        /// <param name="executionProvider">The execution provider.</param>
-        /// <param name="libraryPath">The library path.</param>
-        public static IReadOnlyList<Device> GetDevices(string executionProvider, string libraryPath = default)
-        {
-            if (_environment == null)
-                Initialize();
 
             var providers = _environment.GetAvailableProviders();
-            if (!providers.Contains(executionProvider, StringComparer.OrdinalIgnoreCase))
-                return [];
+            if (!providers.Contains(_deviceProvider, StringComparer.OrdinalIgnoreCase))
+                throw new Exception($"Provider {_deviceProvider} was not found in GetAvailableProviders().");
 
-            if (!string.IsNullOrEmpty(executionProvider))
-                _environment.RegisterExecutionProviderLibrary(executionProvider, libraryPath);
+            if (!string.IsNullOrEmpty(libraryPath))
+                _environment.RegisterExecutionProviderLibrary(_deviceProvider, libraryPath);
 
             var devices = new List<Device>();
             foreach (var epDevice in _environment.GetEpDevices())
             {
-                if (!epDevice.EpName.Equals(executionProvider, StringComparison.OrdinalIgnoreCase))
-                    continue;
-
-                devices.Add(CreateDevice(epDevice));
+                if (epDevice.HardwareDevice.Type == OrtHardwareDeviceType.CPU || epDevice.EpName.Equals(_deviceProvider, StringComparison.OrdinalIgnoreCase))
+                    devices.Add(CreateDevice(epDevice));
             }
-            return devices;
+            _devices = devices;
         }
 
 
+        /// <summary>
+        /// Gets the devices.
+        /// </summary>
+        public static IReadOnlyList<Device> Devices => _devices;
+
+
+        /// <summary>
+        /// The cpu provider name
+        /// </summary>
+        public const string CPUProviderName = "CPUExecutionProvider";
+
+
         /// <summary>
         /// Creates the device.
         /// </summary>
@@ -79,11 +85,11 @@ private static Device CreateDevice(OrtEpDevice epDevice)
             var metadata = device.Metadata.Entries;
             return new Device
             {
+                Id = metadata.ParseOrDefault("DxgiAdapterNumber", 0),
+                DeviceId = metadata.ParseOrDefault("DxgiHighPerformanceIndex", 0),
                 Type = Enum.Parse<DeviceType>(device.Type.ToString()),
                 Name = metadata.ParseOrDefault("Description", string.Empty),
                 Memory = metadata.ParseOrDefault("DxgiVideoMemory", 0, " MB"),
-                AdapterIndex = metadata.ParseOrDefault("DxgiAdapterNumber", 0),
-                PerformanceIndex = metadata.ParseOrDefault("DxgiHighPerformanceIndex", 0),
                 HardwareLUID = metadata.ParseOrDefault("LUID", 0),
                 HardwareID = (int)device.DeviceId,
                 HardwareVendor = device.Vendor,

TensorStack.Common/DeviceType.cs

@@ -0,0 +1,11 @@
+// Copyright (c) TensorStack. All rights reserved.
+// Licensed under the Apache 2.0 License.
+namespace TensorStack.Common
+{
+    public enum DeviceType
+    {
+        CPU = 0,
+        GPU = 1,
+        NPU = 2
+    }
+}

TensorStack.Common/ExecutionProvider.cs

@@ -1,15 +1,14 @@
 // Copyright (c) TensorStack. All rights reserved.
 // Licensed under the Apache 2.0 License.
-using System;
 using Microsoft.ML.OnnxRuntime;
+using System;
 
 namespace TensorStack.Common
 {
     public class ExecutionProvider
     {
         private readonly string _name;
         private readonly OrtMemoryInfo _memoryInfo;
-     
         private readonly Func<ModelConfig, SessionOptions> _sessionOptionsFactory;
 
         public ExecutionProvider(string name, OrtMemoryInfo memoryInfo, Func<ModelConfig, SessionOptions> sessionOptionsFactory)
@@ -26,25 +25,5 @@ public SessionOptions CreateSession(ModelConfig modelConfig)
         {
             return _sessionOptionsFactory(modelConfig);
         }
-
-        /// <summary>
-        /// Gets default CPU provider.
-        /// </summary>
-        /// <param name="optimizationLevel">The optimization level.</param>
-        /// <returns>ExecutionProvider.</returns>
-        public static ExecutionProvider GetDefault(GraphOptimizationLevel optimizationLevel = GraphOptimizationLevel.ORT_DISABLE_ALL)
-        {
-            return new ExecutionProvider("CPU Provider", OrtMemoryInfo.DefaultInstance, configuration =>
-            {
-                var sessionOptions = new SessionOptions
-                {
-                    EnableCpuMemArena = true,
-                    EnableMemoryPattern = true,
-                    GraphOptimizationLevel = optimizationLevel
-                };
-                sessionOptions.AppendExecutionProvider_CPU();
-                return sessionOptions;
-            });
-        }
     }
 }